ARM templates changes to met MS requirements

JFrogContainerRegistry/AzureResourceManager/nested/azureDBDeploy.json

@@ -4,22 +4,18 @@
   "parameters": {
     "db_user": {
       "type": "string",
-      "minLength": 1,
-      "defaultValue": "artifactory"
+      "minLength": 1
     },
     "db_password": {
-      "type": "securestring",
-      "defaultValue": "jFrog123"
+      "type": "securestring"
     },
     "db_server": {
       "type": "string",
-      "minLength": 1,
-      "defaultValue": "artmssqlsrv"
+      "minLength": 1
     },
     "db_name": {
       "type": "string",
-      "minLength": 1,
-      "defaultValue": "artdb"
+      "minLength": 1
     },
     "db_location": {
       "type": "string",
@@ -35,9 +31,8 @@
     }
   },
   "variables": {
-    "apiVersion": "2015-05-01-preview",
     "rtdbCollation": "Latin1_General_100_CS_AS",
-    "db_location": "[if(equals(parameters('db_location'), ''), resourceGroup().location, parameters('db_location'))]"
+    "db_location": "[parameters('db_location')]"
   },
   "resources": [
     {
@@ -45,9 +40,9 @@
       "type": "Microsoft.Sql/servers",
       "kind": "v12.0",
       "location": "[variables('db_location')]",
-      "apiVersion": "[variables('apiVersion')]",
+      "apiVersion": "2015-05-01-preview",
       "dependsOn": [
-        
+
       ],
       "tags": {
         "displayName": "artifactoryDB"
@@ -62,7 +57,7 @@
           "name": "[uniqueString(parameters('db_server'), 'AllowAllWindowsAzureIps' )]",
           "type": "firewallrules",
           "location": "[variables('db_location')]",
-          "apiVersion": "[variables('apiVersion')]",
+          "apiVersion": "2015-05-01-preview",
           "dependsOn": [
             "[concat('Microsoft.Sql/servers/', parameters('db_server'))]"
           ],
@@ -76,7 +71,7 @@
           "type": "databases",
           "kind": "v12.0,user",
           "location": "[variables('db_location')]",
-          "apiVersion": "[variables('apiVersion')]",
+          "apiVersion": "2015-05-01-preview",
           "dependsOn": [
             "[parameters('db_server')]"
           ],