Remove dynamic API version resolution in outputs (elastic#144)

Remove dynamic API version resolution in outputs (elastic#144)

- Add resource deployment conditions

Use the same resource API version in the output as used in the resource deployment

Closes elastic#143

- Add support for 5.5.2, 5.5.3, 5.6.2
- Simplify references within outputs
- Add output diffs for Kibana and Jumpbox resources

build/allowedValues.json

@@ -41,6 +41,15 @@
     },
     "5.5.1": {
       "kibana": "5.5.1"
+    },
+    "5.5.2": {
+      "kibana": "5.5.2"
+    },
+    "5.5.3": {
+      "kibana": "5.5.3"
+    },
+    "5.6.2": {
+      "kibana": "5.6.2"
     }
   },
   "numberOfDataNodes" : 50,

build/tasks/sanity-checks.js

@@ -4,11 +4,11 @@ var filereader = require('./lib/filereader');
 
 function checks(cb) {
   var errors = [];
+  var mainTemplate = require("../../src/mainTemplate.json");
+  var mainTemplateParams = _.keys(mainTemplate.parameters);
 
   var marketPlaceArmParity = () => {
-    var mainTemplate = require("../../src/mainTemplate.json");
     var uiTemplate = require("../../src/createUiDefinition.json");
-    var mainTemplateParams = _.keys(mainTemplate.parameters);
     var difference = _.difference(mainTemplateParams, _.keys(uiTemplate.parameters.outputs));
     if (difference.length == 0) return;
     var excludingDefault = [];
@@ -17,7 +17,7 @@ function checks(cb) {
       excludingDefault.push(p);
     });
     if (excludingDefault.length == 0) return;
-    errors.push("Main template has different inputs as the ui template outputs" + excludingDefault)
+    errors.push("Main template has different inputs as the ui template outputs: " + excludingDefault)
   }
 
   var outputDiff = (kind, template, empty) => {
@@ -28,6 +28,30 @@ function checks(cb) {
     errors.push("The " + kind +" template differs from its empty variant: " + difference);
   }
 
+  var parametersParity = () => {
+    var parameters = [
+      {
+        name: "password",
+        template: require("../../parameters/password.parameters.json")
+      },
+      {
+        name: "ssh",
+        template: require("../../parameters/ssh.parameters.json")
+      }];
+
+    parameters.forEach(p=> {
+      var difference = _.difference(mainTemplateParams, _.keys(p.template));
+      if (difference.length == 0) return;
+      var excludingDefault = [];
+      difference.forEach(p=> {
+        if (mainTemplate.parameters[p] && mainTemplate.parameters[p].defaultValue) return;
+        excludingDefault.push(p);
+      });
+      if (excludingDefault.length == 0) return;
+      errors.push(p.name + " parameters has different inputs than the main template parameters" + excludingDefault)
+    });
+  }
+
   var filter = function(filename) {
     return filename.endsWith(".json");
   }
@@ -56,14 +80,12 @@ function checks(cb) {
   marketPlaceArmParity();
   outputDiff("kibana", "machines/kibana-resources.json", "empty/empty-kibana-resources.json");
   outputDiff("jumpbox", "machines/jumpbox-resources.json", "empty/empty-jumpbox-resources.json");
-  outputDiff("client", "machines/client-nodes-resources.json", "empty/empty-client-nodes-resources.json");
-  outputDiff("master", "machines/master-nodes-resources.json", "empty/empty-master-nodes-resources.json");
-  outputDiff("networks", "networks/existing-virtual-network.json", "networks/new-virtual-network.json");
+  parametersParity();
 
   filereader.readFiles('../src/', filter, resourcesHaveProviderTag);
 
   if (errors.length) {
-    throw new Error("Sanity checks failed:\n" + errors);
+    throw new Error("Sanity checks failed:\n" + errors.join('\n'));
   }
 
   cb();

parameters/password.parameters.json

@@ -13,7 +13,7 @@
   "vmSizeKibana":{"value":"Standard_D1"},
   "kibanaCertBlob":{"value":""},
   "kibanaKeyBlob":{"value":""},
-  "kibanaPassphrase":{"value":""},
+  "kibanaKeyPassphrase":{"value":""},
   "jumpbox":{"value":"No"},
   "vmHostNamePrefix":{"value":""},
   "vmSizeDataNodes":{"value":"Standard_D1"},

parameters/ssh.parameters.json

@@ -13,7 +13,7 @@
   "vmSizeKibana":{"value":"Standard_D1"},
   "kibanaCertBlob":{"value":""},
   "kibanaKeyBlob":{"value":""},
-  "kibanaPassphrase":{"value":""},
+  "kibanaKeyPassphrase":{"value":""},
   "jumpbox":{"value":"No"},
   "vmHostNamePrefix":{"value":""},
   "vmSizeDataNodes":{"value":"Standard_D1"},

src/createUiDefinition.json

@@ -54,7 +54,7 @@
             "name": "esVersion",
             "type": "Microsoft.Common.DropDown",
             "label": "Elasticsearch version",
-            "defaultValue": "v5.5.1",
+            "defaultValue": "v5.6.2",
             "toolTip": "Choose a version of Elasticsearch.",
             "constraints": {
               "allowedValues": [
@@ -113,6 +113,18 @@
                 {
                   "label": "v5.5.1",
                   "value": "5.5.1"
+                },
+                {
+                  "label": "v5.5.2",
+                  "value": "5.5.2"
+                },
+                {
+                  "label": "v5.5.3",
+                  "value": "5.5.3"
+                },
+                {
+                  "label": "v5.6.2",
+                  "value": "5.6.2"
                 }
               ]
             }

src/loadbalancers/external-lb-resources.json

@@ -102,7 +102,7 @@
       }
     },
     {
-      "apiVersion": "2015-06-15",
+      "apiVersion": "2016-03-30",
       "type": "Microsoft.Network/publicIPAddresses",
       "name": "es-external-lb-ip",
       "location": "[parameters('networkSettings').location]",
@@ -180,7 +180,7 @@
   ],
   "outputs" : {
     "fqdn": {
-      "value": "[concat('http://',reference(resourceId('Microsoft.Network/publicIPAddresses','es-external-lb-ip'),providers('Microsoft.Network', 'publicIPAddresses').apiVersions[0]).dnsSettings.fqdn, ':9200')]",
+      "value": "[concat('http://', reference(resourceId('Microsoft.Network/publicIPAddresses','es-external-lb-ip'), '2016-03-30').dnsSettings.fqdn, ':9200')]",
       "type": "string"
     }
   }

src/loadbalancers/waf-application-gateway-resources.json

@@ -241,7 +241,7 @@
   ],
   "outputs" : {
     "fqdn": {
-      "value": "",
+      "value": "N/A",
       "type": "string"
     }
   }

src/machines/jumpbox-resources.json

@@ -195,7 +195,7 @@
   ],
   "outputs": {
     "ssh": {
-      "value": "[concat(parameters('credentials').adminUsername, '@',reference(resourceId('Microsoft.Network/publicIPAddresses',variables('publicIpName')),providers('Microsoft.Network', 'publicIPAddresses').apiVersions[0]).dnsSettings.fqdn)]",
+      "value": "[concat(parameters('credentials').adminUsername, '@', reference(variables('publicIpName')).dnsSettings.fqdn)]",
       "type": "string"
     }
   }

src/machines/kibana-resources.json

@@ -243,7 +243,7 @@
   ],
   "outputs": {
     "fqdn": {
-      "value": "[concat(variables('https'), reference(resourceId('Microsoft.Network/publicIPAddresses', variables('publicIpName')),providers('Microsoft.Network', 'publicIPAddresses').apiVersions[0]).dnsSettings.fqdn, ':5601')]",
+      "value": "[concat(variables('https'), reference(variables('publicIpName')).dnsSettings.fqdn, ':5601')]",
       "type": "string"
     }
   }

src/mainTemplate.json

@@ -20,7 +20,7 @@
     },
     "esVersion": {
       "type": "string",
-      "defaultValue": "5.5.1",
+      "defaultValue": "5.6.2",
       "allowedValues": [
         "2.0.2",
         "2.1.2",
@@ -35,7 +35,10 @@
         "5.4.2",
         "5.4.3",
         "5.5.0",
-        "5.5.1"
+        "5.5.1",
+        "5.5.2",
+        "5.5.3",
+        "5.6.2"
       ],
       "metadata": {
         "description": "Elasticsearch version to install"
@@ -742,31 +745,15 @@
   "variables": {
     "templateBaseUrl": "[concat(parameters('artifactsBaseUrl'), '/')]",
     "sharedTemplateUrl": "[concat(variables('templateBaseUrl'), 'partials/shared-resources.json')]",
-    "networkOptions": {
-      "new": {
-        "internal": "new-virtual-network",
-        "external": "new-virtual-network",
-        "gateway": "new-virtual-network-with-gateway"
-      },
-      "existing": {
-        "internal": "existing-virtual-network",
-        "external": "existing-virtual-network",
-        "gateway": "existing-virtual-network"
-      }
-    },
-    "networkTemplateUrl": "[concat(variables('templateBaseUrl'), 'networks/', variables('networkOptions')[parameters('vNetNewOrExisting')][parameters('loadBalancerType')],'.json')]",
+    "networkTemplateUrl": "[concat(variables('templateBaseUrl'), 'networks/', if(equals(parameters('vNetNewOrExisting'), 'new'), if(equals(parameters('loadBalancerType'), 'gateway'), 'new-virtual-network-with-gateway', 'new-virtual-network'), 'existing-virtual-network'), '.json')]",
     "loadBalancerOptions": {
       "internal": "internal-lb-resources",
       "external": "external-lb-resources",
       "gateway": "[concat(toLower(parameters('appGatewayTier')),'-application-gateway-resources')]"
     },
     "loadBalancerTemplateUrl": "[concat(variables('templateBaseUrl'), 'loadbalancers/', variables('loadBalancerOptions')[parameters('loadBalancerType')],'.json')]",
     "osSettingsTemplateUrl": "[concat(variables('templateBaseUrl'), 'settings/ubuntuSettings.json')]",
-    "locationDeployToResourceGroup": {
-      "true": "[resourceGroup().location]",
-      "false": "[parameters('location')]"
-    },
-    "location": "[variables('locationDeployToResourceGroup')[string(equals('resourcegroup', toLower(parameters('location'))))]]",
+    "location": "[if(equals('resourcegroup', toLower(parameters('location'))), resourceGroup().location, parameters('location'))]",
     "azureCloudStorageAccount": {
       "name": "[parameters('azureCloudStorageAccountName')]",
       "key": "[parameters('azureCloudStorageAccountKey')]",
@@ -786,7 +773,10 @@
       "5.4.2": "5.4.2",
       "5.4.3": "5.4.3",
       "5.5.0": "5.5.0",
-      "5.5.1": "5.5.1"
+      "5.5.1": "5.5.1",
+      "5.5.2": "5.5.2",
+      "5.5.3": "5.5.3",
+      "5.6.2": "5.6.2"
     },
     "esSettings": {
       "clusterName": "[parameters('esClusterName')]",
@@ -800,22 +790,14 @@
       "securityKibanaServerPwd": "[uniqueString(resourceGroup().id, deployment().name, parameters('securityKibanaPassword'))]",
       "kibanaVersion": "[variables('esToKibanaMapping')[parameters('esVersion')]]"
     },
-    "masterNodeCount": {
-      "No": "3",
-      "Yes": "0"
-    },
-    "kibanajumpboxNodeCount": {
-      "No": "0",
-      "Yes": "1"
-    },
     "phoneHomeSettings": {
       "email": "[parameters('userEmail')]",
       "firstName": "[parameters('userFirstName')]",
       "lastName": "[parameters('userLastName')]",
       "jobTitle": "[parameters('userJobTitle')]",
       "company": "[parameters('userCompany')]",
       "country": "[parameters('userCountry')]",
-      "topology": "[concat('m=', variables('masterNodeCount')[parameters('dataNodesAreMasterEligible')], ' ', parameters('vmSizeMasterNodes'), ',d=', parameters('vmDataNodeCount'), ' ', parameters('vmSizeDataNodes'), ',c=', parameters('vmClientNodeCount'), ' ', parameters('vmSizeClientNodes'), ',k=', variables('kibanajumpboxNodeCount')[parameters('kibana')], ' ', parameters('vmSizeKibana'), ',j=', variables('kibanajumpboxNodeCount')[parameters('jumpbox')], ' Standard_A0', ',l=', parameters('loadBalancerType'))]"
+      "topology": "[concat('m=', if(equals(parameters('dataNodesAreMasterEligible'), 'No'), '3', '0'), ' ', parameters('vmSizeMasterNodes'), ',d=', parameters('vmDataNodeCount'), ' ', parameters('vmSizeDataNodes'), ',c=', parameters('vmClientNodeCount'), ' ', parameters('vmSizeClientNodes'), ',k=', if(equals(parameters('kibana'), 'Yes'), '1', '0'), ' ', parameters('vmSizeKibana'), ',j=', if(equals(parameters('jumpbox'), 'Yes'), '1', '0'), ' Standard_A0', ',l=', parameters('loadBalancerType'))]"
     },
     "networkResourceGroupMap": {
       "new": "[resourceGroup().name]",
@@ -1141,16 +1123,7 @@
     "nodesPerStorageAccount": "[variables('nodesPerStorageMapping')[concat(variables('resolvedStorageAccountType'), '_', parameters('vmDataDiskSize'), '_', string(variables('numberOfDataDisks')))]]",
     "nodesPerStorageAccountDiv": "[div(add(add(1, variables('nodesPerStorageAccount')), int(replace(string(sub(1, variables('nodesPerStorageAccount'))), '-', ''))), 2)]",
     "storageAccountsCount": "[add(div(parameters('vmDataNodeCount'), variables('nodesPerStorageAccountDiv')), mod(add(mod(parameters('vmDataNodeCount'), variables('nodesPerStorageAccountDiv')),2), add(mod(parameters('vmDataNodeCount'), variables('nodesPerStorageAccountDiv')),1)))]",
-    "enableAnonymousAccessOpts": {
-      "internal": "No",
-      "external": "No",
-      "gateway": "Yes"
-    },
-    "kibanaHttpsOpts": [
-      "No",
-      "Yes"
-    ],
-    "kibanaHttps": "[variables('kibanaHttpsOpts')[mul(length(take(parameters('kibanaKeyBlob'), 1)), length(take(parameters('kibanaCertBlob'), 1)))]]",
+    "kibanaHttps": "[if(and(greater(length(parameters('kibanaKeyBlob')), 0), greater(length(parameters('kibanaCertBlob')), 0)), 'Yes', 'No')]",
     "topologySettings": {
       "dataNodesAreMasterEligible": "[parameters('dataNodesAreMasterEligible')]",
       "vmDataNodeCount": "[parameters('vmDataNodeCount')]",
@@ -1176,7 +1149,7 @@
       },
       "dataLoadBalancerBackEndPools": "[variables('dataLoadBalancerOptions')[variables('clientResourceIndex')].backendPools]",
       "loadBalancerBackEndPools": "[variables('lbBackEndPoolsAdded').backendPools]",
-      "enableAnonymousAccess": "[variables('enableAnonymousAccessOpts')[parameters('loadBalancerType')]]"
+      "enableAnonymousAccess": "[if(equals(parameters('loadBalancerType'), 'gateway'), 'Yes', 'No')]"
     },
     "networkSettings": {
       "name": "[parameters('vNetName')]",
@@ -1241,6 +1214,7 @@
       }
     },
     {
+      "condition": "[equals(parameters('vNetNewOrExisting'), 'new')]",
       "name": "network",
       "type": "Microsoft.Resources/deployments",
       "apiVersion": "2016-02-01",