Diagnostics cmdlet switch fix (#3067)

Author: Ajay Kumar Yadav

Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/en-US/resources.resjson

@@ -35,5 +35,6 @@
   "loc.messages.Nofileswerefoundtodeploywithsearchpattern0": "No files were found to deploy with search pattern {0}",
   "loc.messages.Foundmorethanonefiletodeploywithsearchpattern0Therecanbeonlyone": "Found more than one file to deploy with search pattern {0}. There can be only one.",
   "loc.messages.Storagekeysaredefinedininvalidformat": "Storage keys are defined in invalid format.",
-  "loc.messages.Unabletofind0usingprovidedsubscription": "Unable to find {0} using provided subscription"
+  "loc.messages.Unabletofind0usingprovidedsubscription": "Unable to find {0} using provided subscription",
+  "loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "Current version of azure powershell don't support external storage account for configuring diagnostics."
 }

Tasks/AzureCloudPowerShellDeployment/Utility.ps1

@@ -140,8 +140,25 @@ function Get-DiagnosticsExtensions($storageAccount, $extensionsPath, $storageAcc
                         $storageAccountKey = $primaryStorageKey
                     }
 
-                    Write-Host "New-AzureServiceDiagnosticsExtensionConfig -Role $role -StorageAccountName $storageAccountName -StorageAccountKey <storageKey> -DiagnosticsConfigurationPath $fullExtPath"
-                    $wadconfig = New-AzureServiceDiagnosticsExtensionConfig -Role $role -StorageAccountName $storageAccountName -StorageAccountKey $storageAccountKey -DiagnosticsConfigurationPath $fullExtPath 
+                    if((CmdletHasMember "StorageAccountName") -and (CmdletHasMember "StorageAccountKey"))
+                    {
+                        Write-Host "New-AzureServiceDiagnosticsExtensionConfig -Role $role -StorageAccountName $storageAccountName -StorageAccountKey <storageKey> -DiagnosticsConfigurationPath $fullExtPath"
+                        $wadconfig = New-AzureServiceDiagnosticsExtensionConfig -Role $role -StorageAccountName $storageAccountName -StorageAccountKey $storageAccountKey -DiagnosticsConfigurationPath $fullExtPath
+                    } 
+                    else
+                    {
+                        try
+                        {
+                            $storageContext = New-AzureStorageContext -StorageAccountName $storageAccountName -StorageAccountKey $storageAccountKey
+                            Write-Host "New-AzureServiceDiagnosticsExtensionConfig -Role $role -StorageContext $StorageContext -DiagnosticsConfigurationPath $fullExtPath"
+                            $wadconfig = New-AzureServiceDiagnosticsExtensionConfig -Role $role -StorageContext $StorageContext -DiagnosticsConfigurationPath $fullExtPath 
+                        }
+                        catch
+                        {
+                            Write-Warning (Get-VstsLocString -Key "Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics")
+                            throw $_.Exception
+                        }
+                    }
 
                     #Add each extension configuration to the array for use by caller
                     $diagnosticsConfigurations += $wadconfig
@@ -177,4 +194,15 @@ function Parse-StorageKeys($storageAccountKeys)
         }
     }
     return $roleStorageKeyMap
+}
+
+function CmdletHasMember($memberName) {
+    try{
+        $cmdletParameter = (gcm New-AzureServiceDiagnosticsExtensionConfig).Parameters.Keys.Contains($memberName)
+        return $cmdletParameter
+    }
+    catch
+    {
+        return false;
+    }  
 }

Tasks/AzureCloudPowerShellDeployment/task.json

@@ -13,7 +13,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 32
+        "Patch": 33
     },
     "demands": [
         "azureps"
@@ -186,6 +186,7 @@
         "Nofileswerefoundtodeploywithsearchpattern0": "No files were found to deploy with search pattern {0}",
         "Foundmorethanonefiletodeploywithsearchpattern0Therecanbeonlyone": "Found more than one file to deploy with search pattern {0}. There can be only one.",
         "Storagekeysaredefinedininvalidformat": "Storage keys are defined in invalid format.",
-        "Unabletofind0usingprovidedsubscription" :"Unable to find {0} using provided subscription"
+        "Unabletofind0usingprovidedsubscription" :"Unable to find {0} using provided subscription",
+        "Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "Current version of azure powershell don't support external storage account for configuring diagnostics."
     }
 }

Tasks/AzureCloudPowerShellDeployment/task.loc.json

@@ -13,7 +13,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 32
+    "Patch": 33
   },
   "demands": [
     "azureps"
@@ -186,6 +186,7 @@
     "Nofileswerefoundtodeploywithsearchpattern0": "ms-resource:loc.messages.Nofileswerefoundtodeploywithsearchpattern0",
     "Foundmorethanonefiletodeploywithsearchpattern0Therecanbeonlyone": "ms-resource:loc.messages.Foundmorethanonefiletodeploywithsearchpattern0Therecanbeonlyone",
     "Storagekeysaredefinedininvalidformat": "ms-resource:loc.messages.Storagekeysaredefinedininvalidformat",
-    "Unabletofind0usingprovidedsubscription": "ms-resource:loc.messages.Unabletofind0usingprovidedsubscription"
+    "Unabletofind0usingprovidedsubscription": "ms-resource:loc.messages.Unabletofind0usingprovidedsubscription",
+    "Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "ms-resource:loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics"
   }
 }