Scripts reviewed

HaraldPfirmann · HaraldPfirmann · commit 99da7d1cbe1d · 2020-06-26T14:55:24.000+02:00
diff --git a/VMware/Cluster/Get-VMHVCluster.ps1 b/VMware/Cluster/Get-VMHVCluster.ps1
@@ -73,6 +73,9 @@ Param(
 Import-Module VMware.PowerCLI
 
 try{
+    if($Properties -contains '*'){
+        $Properties = @('*')
+    }
     $Script:vmServer = Connect-VIServer -Server $VIServer -Credential $VICredential -ErrorAction Stop
 
     if($PSCmdlet.ParameterSetName  -eq "byID"){
diff --git a/VMware/Datastore/Get-VMHVDatastore.ps1 b/VMware/Datastore/Get-VMHVDatastore.ps1
@@ -52,6 +52,9 @@ Param(
 Import-Module VMware.PowerCLI
 
 try{
+    if($Properties -contains '*'){
+        $Properties = @('*')
+    }
     $Script:vmServer = Connect-VIServer -Server $VIServer -Credential $VICredential -ErrorAction Stop
     
     if([System.String]::IsNullOrWhiteSpace($Datastore) -eq $true){
diff --git a/VMware/Host/Get-VMHVHost.ps1 b/VMware/Host/Get-VMHVHost.ps1
@@ -88,6 +88,9 @@ Param(
 Import-Module VMware.PowerCLI
 
 try{
+    if($Properties -contains '*'){
+        $Properties = @('*')
+    }
     $Script:vmServer = Connect-VIServer -Server $VIServer -Credential $VICredential -ErrorAction Stop
     [hashtable]$cmdArgs = @{'ErrorAction' = 'Stop'
                             'Server' = $Script:vmServer
diff --git a/VMware/ResourcePool/Get-VMHVResourcePool.ps1 b/VMware/ResourcePool/Get-VMHVResourcePool.ps1
@@ -73,6 +73,9 @@ Param(
 Import-Module VMware.PowerCLI
 
 try{
+    if($Properties -contains '*'){
+        $Properties = @('*')
+    }
     $Script:vmServer = Connect-VIServer -Server $VIServer -Credential $VICredential -ErrorAction Stop
     [hashtable]$cmdArgs = @{'ErrorAction' = 'Stop'
                             'Server' = $Script:vmServer
diff --git a/VMware/Server/Get-VMHVCounters.ps1 b/VMware/Server/Get-VMHVCounters.ps1
@@ -52,6 +52,9 @@ Param(
 Import-Module VMware.PowerCLI
 
 try{
+    if($Properties -contains '*'){
+        $Properties = @('*')
+    }
     if([System.String]::IsNullOrWhiteSpace($CounterName) -eq $true){
         $CounterName = "*"
     }
diff --git a/VMware/Tasks/Get-VMHVHistoryTasks.ps1 b/VMware/Tasks/Get-VMHVHistoryTasks.ps1
@@ -83,6 +83,9 @@ Param(
 Import-Module VMware.PowerCLI
 
 try{
+    if($Properties -contains '*'){
+        $Properties = @('*')
+    }
     $Script:vmServer = Connect-VIServer -Server $VIServer -Credential $VICredential -ErrorAction Stop
     
     $sView = Get-View ServiceInstance -Server $Script:vmServer
diff --git a/VMware/Tasks/Get-VMHVTask.ps1 b/VMware/Tasks/Get-VMHVTask.ps1
@@ -49,6 +49,9 @@ Param(
 Import-Module VMware.PowerCLI
 
 try{
+    if($Properties -contains '*'){
+        $Properties = @('*')
+    }
     $Script:vmServer = Connect-VIServer -Server $VIServer -Credential $VICredential -ErrorAction Stop
     
     if([System.String]::IsNullOrWhiteSpace($Status) -eq $true){
diff --git a/VMware/VMs/Dismount-VMHVTools.ps1 b/VMware/VMs/Dismount-VMHVTools.ps1
@@ -64,7 +64,7 @@ try{
     Dismount-Tools -VM $Script:machine -Server $Script:vmServer -ErrorAction Stop
     
     $result = Get-VMGuest -VM $Script:machine -Server $Script:vmServer -ErrorAction Stop `
-                    | Select-Object $Properties.Split(",")
+                    | Select-Object $Properties
 
     if($SRXEnv) {
         $SRXEnv.ResultMessage = $result 
diff --git a/VMware/VMs/Get-VMHVGuestSystem.ps1 b/VMware/VMs/Get-VMHVGuestSystem.ps1
@@ -58,6 +58,9 @@ Param(
 Import-Module VMware.PowerCLI
 
 try{
+    if($Properties -contains '*'){
+        $Properties = @('*')
+    }
     $Script:vmServer = Connect-VIServer -Server $VIServer -Credential $VICredential -ErrorAction Stop
 
     if($PSCmdlet.ParameterSetName  -eq "byID"){
diff --git a/VMware/VMs/Get-VMHVSnapShot.ps1 b/VMware/VMs/Get-VMHVSnapShot.ps1
@@ -64,6 +64,9 @@ Param(
 Import-Module VMware.PowerCLI
 
 try{
+    if($Properties -contains '*'){
+        $Properties = @('*')
+    }
     if([System.String]::IsNullOrWhiteSpace($Name) -eq $true){
         $Name = "*"
     }
diff --git a/VMware/VMs/Get-VMHVVirtualMachine.ps1 b/VMware/VMs/Get-VMHVVirtualMachine.ps1
@@ -73,6 +73,9 @@ Param(
 Import-Module VMware.PowerCLI
 
 try{
+    if($Properties -contains '*'){
+        $Properties = @('*')
+    }
     $Script:vmServer = Connect-VIServer -Server $VIServer -Credential $VICredential -ErrorAction Stop
     [hashtable]$cmdArgs = @{'ErrorAction' = 'Stop'
                             'Server' = $Script:vmServer
diff --git a/VMware/VMs/Get-VMHVVirtualMachineStartPolicy.ps1 b/VMware/VMs/Get-VMHVVirtualMachineStartPolicy.ps1
@@ -58,6 +58,9 @@ Param(
 Import-Module VMware.PowerCLI
 
 try{
+    if($Properties -contains '*'){
+        $Properties = @('*')
+    }
     $Script:vmServer = Connect-VIServer -Server $VIServer -Credential $VICredential -ErrorAction Stop
 
     if($PSCmdlet.ParameterSetName  -eq "byID"){
diff --git a/WinFileManagement/Disks/Get-FilMDisk.ps1 b/WinFileManagement/Disks/Get-FilMDisk.ps1
@@ -48,6 +48,9 @@ Param(
 $Script:Cim=$null
 $Script:output = @()
 try{ 
+    if($Properties -contains '*'){
+        $Properties = @('*')
+    }
     if([System.String]::IsNullOrWhiteSpace($FriendlyName)){
         $FriendlyName= "*"
     }
diff --git a/WinFileManagement/Disks/Get-FilMPartition.ps1 b/WinFileManagement/Disks/Get-FilMPartition.ps1
@@ -56,6 +56,9 @@ Param(
 $Script:Cim=$null
 $Script:output = @()
 try{ 
+    if($Properties -contains '*'){
+        $Properties = @('*')
+    }
     if([System.String]::IsNullOrWhiteSpace($ComputerName)){
         $ComputerName=[System.Net.DNS]::GetHostByName('').HostName
     }          
diff --git a/WinFileManagement/Disks/Get-FilMStorageSetting.ps1 b/WinFileManagement/Disks/Get-FilMStorageSetting.ps1
@@ -40,6 +40,9 @@ Param(
 $Script:Cim=$null
 $Script:output = @()
 try{ 
+    if($Properties -contains '*'){
+        $Properties = @('*')
+    }
     if([System.String]::IsNullOrWhiteSpace($ComputerName)){
         $ComputerName=[System.Net.DNS]::GetHostByName('').HostName
     }          
diff --git a/WinFileManagement/Disks/Get-FilMVolume.ps1 b/WinFileManagement/Disks/Get-FilMVolume.ps1
@@ -45,6 +45,9 @@ $Script:Cim=$null
 $Script:output = @()
 
 try{
+    if($Properties -contains '*'){
+        $Properties = @('*')
+    }
     if($DriveLetter.Length -gt 0){
         $DriveLetter = $DriveLetter.Substring(0,1)
         if(-not [System.Char]::IsLetter($DriveLetter)){
diff --git a/WinFileManagement/Shares/Get-FilMShare.ps1 b/WinFileManagement/Shares/Get-FilMShare.ps1
@@ -44,8 +44,13 @@ Param(
 
 $Script:Cim = $null
 try{
-    if($null -eq ($Properties | Where-Object {$_ -eq 'Name'})){
-        $Properties += "Name"
+    if($Properties -contains '*'){
+        $Properties = @('*')
+    }
+    else{
+        if($null -eq ($Properties | Where-Object {$_ -eq 'Name'})){
+            $Properties += "Name"
+        }
     }
     
     if([System.String]::IsNullOrWhiteSpace($ComputerName)){
diff --git a/WinFileManagement/Shares/Get-FilMSharePermissions.ps1 b/WinFileManagement/Shares/Get-FilMSharePermissions.ps1
@@ -51,7 +51,7 @@ try{
     }
 
     $objShare = Get-SmbShareAccess -Name $ShareName -CimSession $Script:Cim -ErrorAction Stop `
-                        | Select-Object $Properties | Sort-Object AccessControlType,AccountName | Format-List    
+                        | Select-Object $script:Properties | Sort-Object AccessControlType,AccountName | Format-List    
     if($SRXEnv) {
         $SRXEnv.ResultMessage = $objShare
     }
diff --git a/WinFileManagement/Shares/Get-FilMShares.ps1 b/WinFileManagement/Shares/Get-FilMShares.ps1
@@ -47,8 +47,13 @@ Param(
 
 $Script:Cim = $null
 try{
-    if($null -eq ($Properties | Where-Object {$_ -eq 'Name'})){
-        $Properties += "Name"
+    if($Properties -contains '*'){
+        $Properties = @('*')
+    }
+    else{
+        if($null -eq ($Properties | Where-Object {$_ -eq 'Name'})){
+            $Properties += "Name"
+        }
     }
     
     if([System.String]::IsNullOrWhiteSpace($ComputerName)){
diff --git a/WinFileManagement/Shares/New-FilMShare.ps1 b/WinFileManagement/Shares/New-FilMShare.ps1
@@ -74,6 +74,9 @@ $Script:Cim = $null
 $Script:output = @()
 [string[]]$Properties = @('Name','Description','Path','ShareState','ScopeName','CurrentUsers','ShareType','AvailabilityType','EncryptData')
 try{
+    if($Properties -contains '*'){
+        $Properties = @('*')
+    }
     if([System.String]::IsNullOrWhiteSpace($ScopeName)){
         $ScopeName = '*'
     }
@@ -134,7 +137,7 @@ try{
     } 
 
     $Script:output += Get-SmbShare -Name $ShareName -CimSession $Script:Cim -IncludeHidden -ErrorAction Stop `
-                    | Select-Object @($Properties)
+                    | Select-Object $Properties
     if($SRXEnv) {
         $SRXEnv.ResultMessage = $Script:output
     }
diff --git a/WinFileManagement/Shares/Set-FilMShare.ps1 b/WinFileManagement/Shares/Set-FilMShare.ps1
@@ -68,7 +68,7 @@ try{
             $null = Set-SmbShare -Name $ShareName -CimSession $Script:Cim -EncryptData $EncryptData -Force -ErrorAction Stop
         }
         $Script:Share = Get-SmbShare -Name $ShareName -CimSession $Script:Cim -IncludeHidden -ErrorAction Stop `
-                        | Select-Object @($Properties)
+                        | Select-Object $Properties
     }  
       
     if($SRXEnv) {
diff --git a/WinFileManagement/_REPORTS_/Get-FilMDisk_Html.ps1 b/WinFileManagement/_REPORTS_/Get-FilMDisk_Html.ps1
@@ -43,7 +43,7 @@ Param(
 
 $Script:Cim=$null
 try{ 
-    [string[]]$Properties = @('Number','FriendlyName','Size','AllocatedSize','IsBoot','IsSystem')
+    [string[]]$Script:Properties = @('Number','FriendlyName','Size','AllocatedSize','IsBoot','IsSystem')
     if([System.String]::IsNullOrWhiteSpace($FriendlyName)){
         $FriendlyName= "*"
     }
@@ -66,7 +66,7 @@ try{
         $cmdArgs.Add('Number' ,$Number)
     }
     $Script:output = @()
-    Get-Disk @cmdArgs | Select-Object $Properties | ForEach-Object{
+    Get-Disk @cmdArgs | Select-Object $Script:Properties | ForEach-Object{
         $Script:output += New-Object PSObject -Property (([ordered] @{ 
             Number = $_.Number
             FriendlyName = $_.FriendlyName
diff --git a/WinFileManagement/_REPORTS_/Get-FilMSharePermissions_Html.ps1 b/WinFileManagement/_REPORTS_/Get-FilMSharePermissions_Html.ps1
@@ -56,7 +56,7 @@ try{
     if([System.String]::IsNullOrWhiteSpace($ShareName) -eq $false){
         $cmdArgs.Add('Name',$ShareName)
     }
-    $objShare = Get-SmbShare @cmdArgs | Get-SmbShareAccess |  Sort-Object Name,AccountName | Select-Object $Properties 
+    $objShare = Get-SmbShare @cmdArgs | Get-SmbShareAccess |  Sort-Object Name,AccountName | Select-Object $Script:Properties 
 
     ShowResultConvertToHtml -Result $objShare
 }
diff --git a/WinFileManagement/_REPORTS_/Get-FilMShares_Html.ps1 b/WinFileManagement/_REPORTS_/Get-FilMShares_Html.ps1
@@ -52,8 +52,13 @@ Param(
 
 $Script:Cim = $null
 try{
-    if($null -eq ($Properties | Where-Object {$_ -eq 'Name'})){
-        $Properties += "Name"
+    if($Properties -contains '*'){
+        $Properties = @('*')
+    }
+    else{
+        if($null -eq ($Properties | Where-Object {$_ -eq 'Name'})){
+            $Properties += "Name"
+        }
     }
     
     if([System.String]::IsNullOrWhiteSpace($ComputerName)){

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,9 @@ Param(`
`52`	`52`	`Import-Module VMware.PowerCLI`
`53`	`53`
`54`	`54`	`try{`
	`55`	`+ if($Properties -contains '*'){`
	`56`	`+ $Properties = @('*')`
	`57`	`+ }`
`55`	`58`	`if([System.String]::IsNullOrWhiteSpace($CounterName) -eq $true){`
`56`	`59`	`$CounterName = "*"`
`57`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,9 @@ Param(`
`64`	`64`	`Import-Module VMware.PowerCLI`
`65`	`65`
`66`	`66`	`try{`
	`67`	`+ if($Properties -contains '*'){`
	`68`	`+ $Properties = @('*')`
	`69`	`+ }`
`67`	`70`	`if([System.String]::IsNullOrWhiteSpace($Name) -eq $true){`
`68`	`71`	`$Name = "*"`
`69`	`72`	`}`