Merge pull request #1 from vmware/master

Sync from original

Author: BaoyinQiao

Modules/ContentLibrary/ContentLibrary.psm1

@@ -199,7 +199,7 @@ Function Get-ContentLibraryItemFiles {
 
                 foreach($file in $files) {
                     if($contentLibraryItemStorageService.get($itemId, $($file.name)).storage_backing.type -eq "DATASTORE"){
-                        $filepath = $contentLibraryItemStorageService.get($itemId, $($file.name)).storage_uris.AbsolutePath.split("/")[5..7] -join "/"
+                        $filepath = $contentLibraryItemStorageService.get($itemId, $($file.name)).storage_uris.segments -notmatch '(^/$|^vmfs$*|^volumes$*|vsan:.*)' -join ''
                         $fullfilepath = "[$($datastore.name)] $filepath"
                     }
                     else{

Modules/VCSA/VCSA.psm1

@@ -0,0 +1,68 @@
+Function Get-VCSAPasswordPolicy {
+<#
+    .DESCRIPTION Retrieves vCenter Server Appliance SSO and Local OS Password Policy Configuration
+    .NOTES  Author:  William Lam
+    .PARAMETER VCSAName
+        Inventory name of the VCSA VM
+    .PARAMETER VCSARootPassword
+        Root password for VCSA VM
+    .PARAMETER SSODomain
+        SSO Domain of the VCSA VM
+    .PARAMETER SSOPassword
+        Administrator password for the SSO Domain of the VCSA VM
+    .EXAMPLE
+        Get-VCSAPasswordPolicy -VCSAName "MGMT-VCSA-01" -VCSARootPassword "VMware1!" -SSODomain "vsphere.local" -SSOPassword "VMware1!"
+#>
+    Param (
+        [Parameter(Mandatory=$true)][String]$VCSAName,
+        [Parameter(Mandatory=$true)][String]$VCSARootPassword,
+        [Parameter(Mandatory=$true)][String]$SSODomain,
+        [Parameter(Mandatory=$true)][String]$SSOPassword
+    )
+
+    $vm = Get-Vm -Name $VCSAName
+
+    if($vm) {
+        $a,$b = $SSODomain.split(".")
+
+        $ssoPasswordPolicy = Invoke-VMScript -ScriptText "/opt/likewise/bin/ldapsearch -h localhost -w $SSOPassword -x -D `"cn=Administrator,cn=Users,dc=$a,dc=$b`" -b `"cn=password and lockout policy,dc=$a,dc=$b`" | grep vmwPassword" -vm $vm -GuestUser "root" -GuestPassword $VCSARootPassword
+        $localOSPasswordPolicy = Invoke-VMScript -ScriptText "cat /etc/login.defs | grep -v '#' | grep PASS" -vm $vm -GuestUser "root" -GuestPassword $VCSARootPassword
+
+        Write-Host -ForegroundColor green "`nSSO Password Policy: "
+        $ssoPasswordPolicy
+
+        Write-Host -ForegroundColor green "`nLocalOS Password Policy: "
+        $localOSPasswordPolicy
+    } else {
+        Write-Host "`nUnable to find VCSA named $VCSAName"
+    }
+}
+
+Function Get-VCSAIdentitySource {
+<#
+    .DESCRIPTION Retrieves vCenter Server Appliance Identity Source Configuration
+    .NOTES  Author:  William Lam
+    .PARAMETER VCSAName
+        Inventory name of the VCSA VM
+    .PARAMETER VCSARootPassword
+        Root password for VCSA VM
+    .EXAMPLE
+        Get-VCSAIdentitySource -VCSAName "MGMT-VCSA-01" -VCSARootPassword "VMware1!"
+#>
+    Param (
+        [Parameter(Mandatory=$true)][String]$VCSAName,
+        [Parameter(Mandatory=$true)][String]$VCSARootPassword
+    )
+
+    $vm = Get-Vm -Name $VCSAName
+
+    if($vm) {
+        $identitySources = Invoke-VMScript -ScriptText "/opt/vmware/bin/sso-config.sh -get_identity_sources 2> /dev/null | sed -ne '/^*/,$ p'" -vm $vm -GuestUser "root" -GuestPassword $VCSARootPassword
+
+        Write-Host -ForegroundColor green "`nIdentity Sources: "
+        $identitySources
+
+    } else {
+        Write-Host "`nUnable to find VCSA named $VCSAName"
+    }
+}

Modules/VMware.CSP/VMware.CSP.psm1

@@ -21,8 +21,7 @@
         [Parameter(Mandatory=$true)][String]$RefreshToken
     )
 
-    $body = "refresh_token=$RefreshToken"
-    $results = Invoke-WebRequest -Uri "https://console.cloud.vmware.com/csp/gateway/am/api/auth/api-tokens/authorize" -Method POST -ContentType "application/x-www-form-urlencoded" -UseBasicParsing -Body $body
+    $results = Invoke-WebRequest -Uri "https://console.cloud.vmware.com/csp/gateway/am/api/auth/api-tokens/authorize" -Method POST -Headers @{accept='application/json'} -Body "refresh_token=$RefreshToken"
     if($results.StatusCode -ne 200) {
         Write-Host -ForegroundColor Red "Failed to retrieve Access Token, please ensure your VMC Refresh Token is valid and try again"
         break

Modules/VMware.DRaaS/VMware.DRaaS.psm1

@@ -32,7 +32,7 @@ Function Connect-DRaas {
 
     }
 
-    $results = Invoke-WebRequest -Uri "https://console.cloud.vmware.com/csp/gateway/am/api/auth/api-tokens/authorize?refresh_token=$RefreshToken" -Method POST -ContentType "application/json" -UseBasicParsing -Headers @{"csp-auth-token"="$RefreshToken"}
+    $results = Invoke-WebRequest -Uri "https://console.cloud.vmware.com/csp/gateway/am/api/auth/api-tokens/authorize" -Method POST -Headers @{accept='application/json'} -Body "refresh_token=$RefreshToken"
     if($results.StatusCode -ne 200) {
         Write-Host -ForegroundColor Red "Failed to retrieve Access Token, please ensure your VMC Refresh Token is valid and try again"
         break

Modules/VMware.HCX/VMware.HCX.psm1

@@ -1382,7 +1382,7 @@ Function Connect-HcxCloudServer {
         [Switch]$Troubleshoot
     )
 
-    $results = Invoke-WebRequest -Uri "https://console.cloud.vmware.com/csp/gateway/am/api/auth/api-tokens/authorize?refresh_token=$RefreshToken" -Method POST -ContentType "application/json" -UseBasicParsing -Headers @{"csp-auth-token"="$RefreshToken"}
+    $results = Invoke-WebRequest -Uri "https://console.cloud.vmware.com/csp/gateway/am/api/auth/api-tokens/authorize" -Method POST -Headers @{accept='application/json'} -Body "refresh_token=$RefreshToken"
     if($results.StatusCode -ne 200) {
         Write-Host -ForegroundColor Red "Failed to retrieve Access Token, please ensure your VMC Refresh Token is valid and try again"
         break

Modules/VMware.Hv.Helper/README.md

@@ -1,20 +1,29 @@
-Prerequisites/Steps to use this module:
+# Prerequisites/Steps to use this module
 
 1. This module only works for Horizon product E.g. Horizon 7.0.2 and later.
 2. Install the latest version of Powershell, PowerCLI(6.5) or (later version via psgallery).
 3. Import HorizonView module by running: Import-Module VMware.VimAutomation.HorizonView.
 4. Import "VMware.Hv.Helper" module by running: Import-Module -Name "location of this module" or Get-Module -ListAvailable 'VMware.Hv.Helper' | Import-Module.
 5. Get-Command -Module "This module Name" to list all available functions or Get-Command -Module 'VMware.Hv.Helper'.
 
-# Example script to connect view API service of Connection Server:
+# Example script to connect ViewAPI service
 
+```
 Import-Module VMware.VimAutomation.HorizonView
+
 # Connection to view API service
 $hvServer = Connect-HVServer -server <connection server IP/FQDN>
 $hvServices = $hvserver.ExtensionData
+
+# List Connection Servers
 $csList = $hvServices.ConnectionServer.ConnectionServer_List()
+```
 # Load this module
+```
 Get-Module -ListAvailable 'VMware.Hv.Helper' | Import-Module
 Get-Command -Module 'VMware.Hv.Helper'
+```
 # Use advanced functions of this module
+```
 New-HVPool -spec 'path to InstantClone.json file'
+```

Modules/VMware.Hv.Helper/VMware.HV.Helper.psd1

@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '1.3'
+ModuleVersion = '1.3.1'
 
 # ID used to uniquely identify this module
 GUID = '6d3f7fb5-4e52-43d8-91e1-f65f72532a1d'