FIX-FAILED-BESTPRACTICES: hdinsight-linux-ssh-publickey-metastore-vnet (

Azure#11367) * FIX-FAILED-BESTPRACTICES: hdinsight-linux-ssh-publickey-metastore-vnet * update password * Update metadata.json * Revert "update password" This reverts commit a3cd69f. * password update * reference * Revert "reference" This reverts commit f2ee1f0. * Revert "password update" This reverts commit 6c3a65c. * password update suggested by brian * Update metadata.json
martdob · Jul 26, 2021 · 14157c1 · 14157c1
1 parent 33e071c
commit 14157c1
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 17 deletions.
diff --git a/...kstarts/microsoft.hdinsight/hdinsight-linux-ssh-publickey-metastore-vnet/azuredeploy.json b/...kstarts/microsoft.hdinsight/hdinsight-linux-ssh-publickey-metastore-vnet/azuredeploy.json
@@ -154,7 +154,7 @@
             },
             "hive-site": {
               "javax.jdo.option.ConnectionDriverName": "com.microsoft.sqlserver.jdbc.SQLServerDriver",
-              "javax.jdo.option.ConnectionURL": "[concat('jdbc:sqlserver://', reference(resourceId(parameters('existingHiveMetastoreServerResourceGroupName'), 'Microsoft.Sql/servers',parameters('existingHiveMetastoreServerName')), '2018-06-01-preview').fullyQualifiedDomainName, ';database=',parameters('existingHiveMetastoreDatabaseName'),';encrypt=true;trustServerCertificate=true;create=false;loginTimeout=300')]",
+              "javax.jdo.option.ConnectionURL": "[concat('jdbc:sqlserver://', reference(resourceId(parameters('existingHiveMetastoreServerResourceGroupName'), 'Microsoft.Sql/servers',parameters('existingHiveMetastoreServerName')), '2021-02-01-preview').fullyQualifiedDomainName, ';database=',parameters('existingHiveMetastoreDatabaseName'),';encrypt=true;trustServerCertificate=true;create=false;loginTimeout=300')]",
               "javax.jdo.option.ConnectionUserName": "[parameters('existingHiveMetastoreUsername')]",
               "javax.jdo.option.ConnectionPassword": "[parameters('existingHiveMetastorePassword')]"
             },
@@ -163,19 +163,19 @@
               "hive_database_name": "[parameters('existingHiveMetastoreDatabaseName')]",
               "hive_database_type": "mssql",
               "hive_existing_mssql_server_database": "[parameters('existingHiveMetastoreDatabaseName')]",
-              "hive_existing_mssql_server_host": "[reference(resourceId(parameters('existingHiveMetastoreServerResourceGroupName'),'Microsoft.Sql/servers',parameters('existingHiveMetastoreServerName')), '2018-06-01-preview').fullyQualifiedDomainName]",
-              "hive_hostname": "[reference(resourceId(parameters('existingHiveMetastoreServerResourceGroupName'),'Microsoft.Sql/servers',parameters('existingHiveMetastoreServerName')), '2018-06-01-preview').fullyQualifiedDomainName]"
+              "hive_existing_mssql_server_host": "[reference(resourceId(parameters('existingHiveMetastoreServerResourceGroupName'),'Microsoft.Sql/servers',parameters('existingHiveMetastoreServerName')), '2021-02-01-preview').fullyQualifiedDomainName]",
+              "hive_hostname": "[reference(resourceId(parameters('existingHiveMetastoreServerResourceGroupName'),'Microsoft.Sql/servers',parameters('existingHiveMetastoreServerName')), '2021-02-01-preview').fullyQualifiedDomainName]"
 
             }
           }
         },
         "storageProfile": {
           "storageaccounts": [
             {
-              "name": "[replace(replace(concat(reference(resourceId(parameters('existingClusterStorageResourceGroup'), 'Microsoft.Storage/storageAccounts/', parameters('existingClusterStorageAccountName')), '2018-02-01').primaryEndpoints.blob),'https:',''),'/','')]",
+              "name": "[replace(replace(concat(reference(resourceId(parameters('existingClusterStorageResourceGroup'), 'Microsoft.Storage/storageAccounts/', parameters('existingClusterStorageAccountName')), '2021-04-01').primaryEndpoints.blob),'https:',''),'/','')]",
               "isDefault": true,
               "container": "[parameters('newOrExistingClusterStorageContainerName')]",
-              "key": "[listKeys(resourceId(parameters('existingClusterStorageResourceGroup'), 'Microsoft.Storage/storageAccounts', parameters('existingClusterStorageAccountName')), '2018-02-01').keys[0].value]"
+              "key": "[listKeys(resourceId(parameters('existingClusterStorageResourceGroup'), 'Microsoft.Storage/storageAccounts', parameters('existingClusterStorageAccountName')), '2021-04-01').keys[0].value]"
             }
           ]
         },

diff --git a/...rosoft.hdinsight/hdinsight-linux-ssh-publickey-metastore-vnet/azuredeploy.parameters.json b/...rosoft.hdinsight/hdinsight-linux-ssh-publickey-metastore-vnet/azuredeploy.parameters.json
@@ -39,7 +39,7 @@
             "value": "GET-PREREQ-existingHiveMetastoreUsername"
         },
         "existingHiveMetastorePassword": {
-            "value": "GET-PREREQ-existingHiveMetastorePassword"
+            "reference": "GEN-KEYVAULT-PASSWORD-REFERENCE"
         },
         "existingVirtualNetworkResourceGroup": {
             "value": "GET-PREREQ-existingVirtualNetworkResourceGroup"

diff --git a/quickstarts/microsoft.hdinsight/hdinsight-linux-ssh-publickey-metastore-vnet/metadata.json b/quickstarts/microsoft.hdinsight/hdinsight-linux-ssh-publickey-metastore-vnet/metadata.json
@@ -5,5 +5,5 @@
   "description": "This template allows you to create an HDInsight cluster running Linux, on an existing Hive metastore and virtual network. The SSH authentication method for the cluster is username / password.",
   "summary": "Deploy an HDInsight cluster (running Linux) on an existing Hive metastore and virtual network. The SSH authentication method for the cluster is username / password.",
   "githubUsername": "matt1883",
-  "dateUpdated": "2021-04-26"
+  "dateUpdated": "2021-07-26"
 }
diff --git a/...ft.hdinsight/hdinsight-linux-ssh-publickey-metastore-vnet/prereqs/prereq.azuredeploy.json b/...ft.hdinsight/hdinsight-linux-ssh-publickey-metastore-vnet/prereqs/prereq.azuredeploy.json
@@ -40,7 +40,7 @@
       "name": "[variables('storageAccountName')]",
       "type": "Microsoft.Storage/storageAccounts",
       "location": "[parameters('location')]",
-      "apiVersion": "2018-02-01",
+      "apiVersion": "2021-04-01",
       "sku": {
         "name": "[variables('storageAccountType')]"
       },
@@ -53,7 +53,7 @@
       "name": "[variables('vNetName')]",
       "type": "Microsoft.Network/virtualNetworks",
       "location": "[parameters('location')]",
-      "apiVersion": "2018-04-01",      
+      "apiVersion": "2021-02-01",      
       "tags": {
         "displayName": "vNet"
       },
@@ -77,7 +77,7 @@
       "name": "[variables('serverName')]",
       "type": "Microsoft.Sql/servers",
       "location": "[parameters('location')]",
-      "apiVersion": "2018-06-01-preview",      
+      "apiVersion": "2021-02-01-preview",      
       "tags": {
         "displayName": "server"
       },
@@ -90,7 +90,7 @@
           "name": "AllowAllWindowsAzureIps",
           "type": "firewallrules",
           "location": "[parameters('location')]",
-          "apiVersion": "2018-06-01-preview",
+          "apiVersion": "2021-02-01-preview",
           "dependsOn": [
             "[resourceId('Microsoft.Sql/servers', variables('serverName'))]"
           ],
@@ -103,7 +103,7 @@
           "name": "[variables('dataBaseName')]",
           "type": "databases",
           "location": "[parameters('location')]",
-          "apiVersion": "2018-06-01-preview",
+          "apiVersion": "2021-02-01-preview",
           "dependsOn": [
             "[resourceId('Microsoft.Sql/servers', variables('serverName'))]"
           ],
@@ -149,10 +149,6 @@
       "type": "string",
       "value": "[parameters('databaseAdminUsername')]"
     },
-    "existingHiveMetastorePassword": {
-      "type": "string",
-      "value": "[parameters('databaseAdminPassword')]"
-    },
     "existingVirtualNetworkResourceGroup": {
       "type": "string",
       "value": "[resourceGroup().name]"

diff --git a/...t/hdinsight-linux-ssh-publickey-metastore-vnet/prereqs/prereq.azuredeploy.parameters.json b/...t/hdinsight-linux-ssh-publickey-metastore-vnet/prereqs/prereq.azuredeploy.parameters.json
@@ -6,7 +6,7 @@
             "value": "GEN-UNIQUE"
         },
         "databaseAdminPassword": {
-            "value": "GEN-PASSWORD"
+            "reference": "GEN-KEYVAULT-PASSWORD-REFERENCE"
         }
     }
 }