AzureRM backward compatibility; Rename diagnostic extension name

knithinc · knithinc · commit 2b5b55aac63e · 2017-09-25T14:00:41.000-07:00
diff --git a/CanaryValidator/Canary.Tests.ps1 b/CanaryValidator/Canary.Tests.ps1
@@ -569,7 +569,9 @@ while ($runCount -le $NumberOfIterations)
 
         Invoke-Usecase -Name 'RegisterResourceProviders' -Description "Register resource providers" -UsecaseBlock `
         {
-            ("Microsoft.Storage", "Microsoft.Compute", "Microsoft.Network", "Microsoft.KeyVault") | ForEach-Object {Get-AzureRmResourceProvider -ProviderNamespace $_} | Register-AzureRmResourceProvider -Force
+            $parameters = @{}
+            if ((Get-Module AzureRM -ListAvailable).Version -le "1.2.10") {$parameters = @{"Force" = $True}}
+            ("Microsoft.Storage", "Microsoft.Compute", "Microsoft.Network", "Microsoft.KeyVault") | ForEach-Object {Get-AzureRmResourceProvider -ProviderNamespace $_} | Register-AzureRmResourceProvider @parameters
             $sleepTime = 0        
             while($true)
             {
diff --git a/CanaryValidator/azuredeploy.json b/CanaryValidator/azuredeploy.json
@@ -648,7 +648,7 @@
         {
             "apiVersion": "[variables('apiVersion')]",
             "type": "Microsoft.Compute/virtualMachines/extensions",
-            "name": "[concat(concat(variables('VMNamePrefix'), '1'),'/Microsoft.Insights.VMDiagnosticsSettings')]",           
+            "name": "[concat(concat(variables('VMNamePrefix'), '1'),'/VMDiagnosticsSettings')]",           
             "location": "[variables('location')]",
             "dependsOn": [
                 "[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName3'))]",
diff --git a/CanaryValidator/azuredeploy.nolinux.json b/CanaryValidator/azuredeploy.nolinux.json
@@ -547,7 +547,7 @@
         {
             "apiVersion": "[variables('apiVersion')]",
             "type": "Microsoft.Compute/virtualMachines/extensions",
-            "name": "[concat(concat(variables('VMNamePrefix'), '1'),'/Microsoft.Insights.VMDiagnosticsSettings')]",           
+            "name": "[concat(concat(variables('VMNamePrefix'), '1'),'/VMDiagnosticsSettings')]",           
             "location": "[variables('location')]",
             "dependsOn": [
                 "[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName3'))]",

Original file line number	Diff line number	Diff line change
`@@ -569,7 +569,9 @@ while ($runCount -le $NumberOfIterations)`
`569`	`569`
`570`	`570`	Invoke-Usecase -Name 'RegisterResourceProviders' -Description "Register resource providers" -UsecaseBlock `
`571`	`571`	`{`
`572`		`- ("Microsoft.Storage", "Microsoft.Compute", "Microsoft.Network", "Microsoft.KeyVault") \| ForEach-Object {Get-AzureRmResourceProvider -ProviderNamespace $_} \| Register-AzureRmResourceProvider -Force`
	`572`	`+ $parameters = @{}`
	`573`	`+ if ((Get-Module AzureRM -ListAvailable).Version -le "1.2.10") {$parameters = @{"Force" = $True}}`
	`574`	`+ ("Microsoft.Storage", "Microsoft.Compute", "Microsoft.Network", "Microsoft.KeyVault") \| ForEach-Object {Get-AzureRmResourceProvider -ProviderNamespace $_} \| Register-AzureRmResourceProvider @parameters`
`573`	`575`	`$sleepTime = 0`
`574`	`576`	`while($true)`
`575`	`577`	`{`
Original file line number	Diff line number	Diff line change
`@@ -648,7 +648,7 @@`
`648`	`648`	`{`
`649`	`649`	`"apiVersion": "[variables('apiVersion')]",`
`650`	`650`	`"type": "Microsoft.Compute/virtualMachines/extensions",`
`651`		`- "name": "[concat(concat(variables('VMNamePrefix'), '1'),'/Microsoft.Insights.VMDiagnosticsSettings')]",`
	`651`	`+ "name": "[concat(concat(variables('VMNamePrefix'), '1'),'/VMDiagnosticsSettings')]",`
`652`	`652`	`"location": "[variables('location')]",`
`653`	`653`	`"dependsOn": [`
`654`	`654`	`"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName3'))]",`
Original file line number	Diff line number	Diff line change
`@@ -547,7 +547,7 @@`
`547`	`547`	`{`
`548`	`548`	`"apiVersion": "[variables('apiVersion')]",`
`549`	`549`	`"type": "Microsoft.Compute/virtualMachines/extensions",`
`550`		`- "name": "[concat(concat(variables('VMNamePrefix'), '1'),'/Microsoft.Insights.VMDiagnosticsSettings')]",`
	`550`	`+ "name": "[concat(concat(variables('VMNamePrefix'), '1'),'/VMDiagnosticsSettings')]",`
`551`	`551`	`"location": "[variables('location')]",`
`552`	`552`	`"dependsOn": [`
`553`	`553`	`"[concat('Microsoft.Storage/storageAccounts/', variables('storageAccountName3'))]",`