From 3737a3354a656a2aa4e268b361e91d1e7a85acec Mon Sep 17 00:00:00 2001 From: Kristian Nese Date: Thu, 18 Aug 2016 19:08:07 +0200 Subject: [PATCH] strong versioning of API --- service-fabric-oms/azuredeploy.json | 34 ++++++++++++----------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/service-fabric-oms/azuredeploy.json b/service-fabric-oms/azuredeploy.json index b662b2861c95..35372ff1541f 100644 --- a/service-fabric-oms/azuredeploy.json +++ b/service-fabric-oms/azuredeploy.json @@ -141,12 +141,6 @@ "applicationDiagnosticsStorageAccountName": "[toLower(concat(uniqueString(resourceGroup().id), '3' ))]", "solution": "[Concat('ServiceFabric', '(', parameters('omsWorkspacename'), ')')]", "solutionName": "ServiceFabric", - "vmssApiVersion": "2016-03-30", - "lbApiVersion": "2015-06-15", - "omsApiVersion": "2015-11-01-preview", - "vNetApiVersion": "2015-06-15", - "storageApiVersion": "2015-06-15", - "publicIPApiVersion": "2015-06-15", "vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]", "subnet0Ref": "[concat(variables('vnetID'),'/subnets/',variables('subnet0Name'))]", "lbID0": "[resourceId('Microsoft.Network/loadBalancers', concat('LB','-', parameters('clusterName'),'-',parameters('vmNodeType0Name')))]", @@ -166,7 +160,7 @@ }, "resources": [ { - "apiVersion": "[variables('storageApiVersion')]", + "apiVersion": "2015-06-15", "type": "Microsoft.Storage/storageAccounts", "name": "[variables('supportLogStorageAccountName')]", "location": "[parameters('computeLocation')]", @@ -179,7 +173,7 @@ } }, { - "apiVersion": "[variables('storageApiVersion')]", + "apiVersion": "2015-06-15", "type": "Microsoft.Storage/storageAccounts", "name": "[variables('applicationDiagnosticsStorageAccountName')]", "location": "[parameters('computeLocation')]", @@ -192,7 +186,7 @@ } }, { - "apiVersion": "[variables('vNetApiVersion')]", + "apiVersion": "2015-06-15", "type": "Microsoft.Network/virtualNetworks", "name": "[variables('virtualNetworkName')]", "location": "[parameters('computeLocation')]", @@ -217,7 +211,7 @@ } }, { - "apiVersion": "[variables('publicIPApiVersion')]", + "apiVersion": "2015-06-15", "type": "Microsoft.Network/publicIPAddresses", "name": "[concat(variables('lbIPName'),'-','0')]", "location": "[parameters('computeLocation')]", @@ -233,7 +227,7 @@ } }, { - "apiVersion": "[variables('lbApiVersion')]", + "apiVersion": "2015-06-15", "type": "Microsoft.Network/loadBalancers", "name": "[concat('LB','-', parameters('clusterName'),'-',parameters('vmNodeType0Name'))]", "location": "[parameters('computeLocation')]", @@ -338,7 +332,7 @@ } }, { - "apiVersion": "[variables('storageApiVersion')]", + "apiVersion": "2015-06-15", "type": "Microsoft.Storage/storageAccounts", "name": "[variables('uniqueStringArray0')[copyIndex()]]", "location": "[parameters('computeLocation')]", @@ -355,7 +349,7 @@ } }, { - "apiVersion": "[variables('vmssApiVersion')]", + "apiVersion": "2016-03-30", "type": "Microsoft.Compute/virtualMachineScaleSets", "name": "[parameters('vmNodeType0Name')]", "location": "[parameters('computeLocation')]", @@ -384,8 +378,8 @@ "type": "ServiceFabricNode", "autoUpgradeMinorVersion": false, "protectedSettings": { - "StorageAccountKey1": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('supportLogStorageAccountName')),'2015-05-01-preview').key1]", - "StorageAccountKey2": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('supportLogStorageAccountName')),'2015-05-01-preview').key2]" + "StorageAccountKey1": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('supportLogStorageAccountName')),'2015-06-15').key1]", + "StorageAccountKey2": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('supportLogStorageAccountName')),'2015-06-15').key2]" }, "publisher": "Microsoft.Azure.ServiceFabric", "settings": { @@ -404,7 +398,7 @@ "autoUpgradeMinorVersion": true, "protectedSettings": { "storageAccountName": "[variables('applicationDiagnosticsStorageAccountName')]", - "storageAccountKey": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('applicationDiagnosticsStorageAccountName')),'2015-05-01-preview').key1]", + "storageAccountKey": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('applicationDiagnosticsStorageAccountName')),'2015-06-15').key1]", "storageAccountEndPoint": "https://core.windows.net/" }, "publisher": "Microsoft.Azure.Diagnostics", @@ -567,7 +561,7 @@ } }, { - "apiVersion": "[variables('omsApiVersion')]", + "apiVersion": "2015-11-01-preview", "location": "[parameters('omsRegion')]", "name": "[parameters('omsWorkspacename')]", "type": "Microsoft.OperationalInsights/workspaces", @@ -578,7 +572,7 @@ }, "resources": [ { - "apiVersion": "[variables('omsApiVersion')]", + "apiVersion": "2015-11-01-preview", "name": "[concat(variables('applicationDiagnosticsStorageAccountName'),parameters('omsWorkspacename'))]", "type": "storageinsightconfigs", "dependsOn": [ @@ -593,14 +587,14 @@ ], "storageAccount": { "id": "[resourceId('Microsoft.Storage/storageaccounts/', variables('applicationDiagnosticsStorageAccountName'))]", - "key": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('applicationDiagnosticsStorageAccountName')), providers('Microsoft.Storage', 'storageAccounts').apiVersions[0]).keys[0].value]" + "key": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('applicationDiagnosticsStorageAccountName')),'2015-06-15').key1.value]" } } } ] }, { - "apiVersion": "[variables('omsApiVersion')]", + "apiVersion": "2015-11-01-preview", "location": "[parameters('omsRegion')]", "name": "[variables('solution')]", "type": "Microsoft.OperationsManagement/solutions",