Scripts reviewed

Author: haraldpfirmann

Azure/Compute/Get-AzVMs.ps1

@@ -47,7 +47,8 @@ param(
     [string]$Name,
     [string]$ResourceGroupName,
     [string]$Location,
-    [string]$Properties = "Name, Location, ResourceGroupName, Tags, VmId, StatusCode, ID",
+    [ValidateSet('*','Name', 'Location', 'ResourceGroupName', 'Tags', 'VmId', 'StatusCode', 'ID')]
+    [string[]]$Properties = @('Name', 'Location', 'ResourceGroupName', 'Tags', 'VmId', 'StatusCode', 'ID'),
     [string]$Tenant
 )
 
@@ -56,9 +57,6 @@ Import-Module Az
 try{
 #    ConnectAzure -AzureCredential $AzureCredential -Tenant $Tenant
 
-    if([System.String]::IsNullOrWhiteSpace($Properties)){
-        $Properties = '*'
-    }
     [hashtable]$cmdArgs = @{'ErrorAction' = 'Stop'}
 
     if([System.String]::IsNullOrWhiteSpace($Name) -eq $false){
@@ -69,7 +67,7 @@ try{
         $cmdArgs.Add('Location',$Location)
     }
 
-    $ret = Get-AzVM @cmdArgs | Select-Object $Properties.Split(',')
+    $ret = Get-AzVM @cmdArgs | Select-Object $Properties
 
     if($SRXEnv) {
         $SRXEnv.ResultMessage = $ret 

Azure/Network/Get-AzNetworkSecurityGroups.ps1

@@ -44,18 +44,15 @@ param(
     [pscredential]$AzureCredential,
     [string]$Name,
     [string]$ResourceGroupName,
-    [string]$Properties = "Name,Location,ResourceGroupName,Id,Tags,Etag,ProvisioningState,Subnets,ResourceGuid",
+    [ValidateSet('*','Name','Location','ResourceGroupName','Id','Tags','Etag','ProvisioningState','Subnets','ResourceGuid')]
+    [string[]]$Properties = @('Name','Location','ResourceGroupName','Id','Tags','Etag','ProvisioningState','Subnets','ResourceGuid'),
     [string]$Tenant
 )
 
 Import-Module Az
 
 try{
   #  ConnectAzure -AzureCredential $AzureCredential -Tenant $Tenant
-
-    if([System.String]::IsNullOrWhiteSpace($Properties)){
-        $Properties = '*'
-    }
 
     [hashtable]$cmdArgs = @{'ErrorAction' = 'Stop'}
 
@@ -66,7 +63,7 @@ try{
         $cmdArgs.Add('ResourceGroupName',$ResourceGroupName)
     }
 
-    $ret = Get-AzNetworkSecurityGroup @cmdArgs | Select-Object $Properties.Split(',')
+    $ret = Get-AzNetworkSecurityGroup @cmdArgs | Select-Object $Properties
 
     if($SRXEnv) {
         $SRXEnv.ResultMessage = $ret 

Azure/SQL/Get-AzDatabases.1.ps1

@@ -49,7 +49,8 @@ param(
     [Parameter(Mandatory = $true)]
     [string]$ServerName,
     [string]$DBName,
-    [string]$Properties = "ResourceGroupName,ServerName,DatabaseName,Location,DatabaseId,Edition,CollationName,Status,CreationDate,Tags",
+    [ValidateSet('*','ResourceGroupName','ServerName','DatabaseName','Location','DatabaseId','Edition','CollationName','Status','CreationDate','Tags')]
+    [string[]]$Properties = @('ResourceGroupName','ServerName','DatabaseName','Location','DatabaseId','Edition','CollationName','Status','CreationDate','Tags'),
     [string]$Tenant
 )
 
@@ -58,9 +59,6 @@ Import-Module Az
 try{
  #   ConnectAzure -AzureCredential $AzureCredential -Tenant $Tenant
 
-    if([System.String]::IsNullOrWhiteSpace($Properties)){
-        $Properties = '*'
-    }
     [hashtable]$cmdArgs = @{'ErrorAction' = 'Stop'
                             'ServerName' = $ServerName
                             'ResourceGroupName' = $ResourceGroupName}
@@ -69,7 +67,7 @@ try{
         $cmdArgs.Add('DatabaseName',$DBName)
     }
 
-    $ret = Get-AzSqlDatabase @cmdArgs | Select-Object $Properties.Split(',')
+    $ret = Get-AzSqlDatabase @cmdArgs | Select-Object $Properties
 
     if($SRXEnv) {
         $SRXEnv.ResultMessage = $ret 

Azure/SQL/Get-AzElasticPools.ps1

@@ -49,7 +49,8 @@ param(
     [Parameter(Mandatory = $true)]
     [string]$ServerName,
     [string]$PoolName,
-    [string]$Properties = "ElasticPoolName,ResourceGroupName,ServerName,ResourceID,Location,State,Edition,Dtu,DatabaseDtuMax,DatabaseDtuMin,StorageMB,CreationDate,Tags",
+    [ValidateSet('*','ElasticPoolName','ResourceGroupName','ServerName','ResourceID','Location','State','Edition','Dtu','DatabaseDtuMax','DatabaseDtuMin','StorageMB','CreationDate','Tags')]
+    [string[]]$Properties = @('ElasticPoolName','ResourceGroupName','ServerName','ResourceID','Location','State','Edition','Dtu','DatabaseDtuMax','DatabaseDtuMin','StorageMB','CreationDate','Tags'),
     [string]$Tenant
 )
 
@@ -58,10 +59,6 @@ Import-Module Az
 try{
   #  ConnectAzure -AzureCredential $AzureCredential -Tenant $Tenant
 
-    if([System.String]::IsNullOrWhiteSpace($Properties)){
-        $Properties = '*'
-    }
-
     [hashtable]$cmdArgs = @{'ErrorAction' = 'Stop'
                             'ServerName' = $ServerName
                             'ResourceGroupName' = $ResourceGroupName}
@@ -70,7 +67,7 @@ try{
         $cmdArgs.Add('ElasticPoolName',$PoolName)
     }
 
-    $ret = Get-AzSqlElasticPool @cmdArgs | Select-Object $Properties.Split(',')
+    $ret = Get-AzSqlElasticPool @cmdArgs | Select-Object $Properties
 
     if($SRXEnv) {
         $SRXEnv.ResultMessage = $ret 

Azure/SQL/Remove-AzDatabase.ps1

@@ -55,9 +55,6 @@ Import-Module Az
 try{
 #    ConnectAzure -AzureCredential $AzureCredential -Tenant $Tenant
 
-    if([System.String]::IsNullOrWhiteSpace($Properties)){
-        $Properties = '*'
-    }
     [hashtable]$cmdArgs = @{'ErrorAction' = 'Stop'
                             'Force' = $null
                             'Confirm' = $false

Azure/SQL/Remove-AzElasticPool.ps1

@@ -55,9 +55,6 @@ Import-Module Az
 try{
 #    ConnectAzure -AzureCredential $AzureCredential -Tenant $Tenant
 
-    if([System.String]::IsNullOrWhiteSpace($Properties)){
-        $Properties = '*'
-    }
     [hashtable]$cmdArgs = @{'ErrorAction' = 'Stop'
                             'Force' = $null
                             'Confirm' = $false

Azure/_LIB_/AzureAzLibrary.ps1

@@ -85,7 +85,7 @@ function DisconnectAzure(){
 
         try{
             [string]$conName = 'SRAzureAccess'
-            if([System.String]::IsNullOrWhiteSpace($Tenant) -eq $true){
+            if([System.String]::IsNullOrWhiteSpace($Tenant) -eq $false){
                 $conName = 'SR' + $Tenant
             }
             Disconnect-AzAccount -Confirm:$false -ErrorAction Stop