Merge branch 'develop' into gov-cloud-support-log-integrations-2

Author: prakalp05

arm-template-deployment/deployRGParent.json

@@ -87,7 +87,23 @@
         "description": "Enable Activity logs to be sent to the event hub that will get created in this deployment"
       },
       "defaultValue": "Yes"
+    },
+    "TLSVersionStorageAccount": {
+      "type": "string",
+      "defaultValue": "1_2",
+      "metadata": {
+        "description": "Provide an appropriate TLS version for storage account. Format - X_X"
+      }
+    },
+    "TLSVersionFunctionApp": {
+      "type": "string",
+      "defaultValue": "1.3",
+      "metadata": {
+        "description": "Provide an appropriate TLS version for function app. Format - X.X"
+      }
     }
+
+
   },
   "resources": [
     {
@@ -141,8 +157,14 @@
           "Include_Metadata_keys": {
             "value": "[parameters('Include_Metadata_keys')]"
           },
-          "LM_Tenant_Id": {
+          "LM_Tenant_Id" : {
             "value": "[parameters('LM_Tenant_Id')]"
+          },
+          "TLSVersionStorageAccount": {
+            "value": "[parameters('TLSVersionStorageAccount')]"
+          },
+          "TLSVersionFunctionApp": {
+            "value": "[parameters('TLSVersionFunctionApp')]"
           }
         }
       },

arm-template-deployment/deployResourcesInRG.json

@@ -34,6 +34,12 @@
     },
     "LM_Domain_Name": {
       "type": "string"
+    },
+    "TLSVersionStorageAccount" : {
+      "type"  : "string"
+    },
+    "TLSVersionFunctionApp" : {
+      "type" : "string"
     }
   },
   "variables": {
@@ -46,7 +52,8 @@
     "functionServerfarms": "[concat(variables('eventhubNamespace'),'-service-plan')]",
     "listener": "listener",
     "sender": "sender",
-    "lm_auth": "[concat('{ \"LM_ACCESS_ID\" : \"',parameters('LM_Access_Id'),'\", \"LM_ACCESS_KEY\" : \"', parameters('LM_Access_Key'), '\", \"LM_BEARER_TOKEN\" : \"', parameters('LM_Bearer_Token'), '\" }')]"
+    "lm_auth": "[concat('{ \"LM_ACCESS_ID\" : \"',parameters('LM_Access_Id'),'\", \"LM_ACCESS_KEY\" : \"', parameters('LM_Access_Key'), '\", \"LM_BEARER_TOKEN\" : \"', parameters('LM_Bearer_Token'), '\" }')]",
+    "tlsVersionStorageAccount" : "[concat('TLS',parameters('TLSVersionStorageAccount'))]"
   },
   "resources": [
     {
@@ -74,7 +81,7 @@
       "apiVersion": "2019-06-01",
       "location": "[resourceGroup().location]",
       "properties": {
-        "minimumTlsVersion": "TLS1_2",
+        "minimumTlsVersion": "[variables('tlsVersionStorageAccount')]",
         "encryption": {
           "services": {
             "file": {
@@ -209,7 +216,8 @@
               "name": "LM_DOMAIN_NAME",
               "value": "[parameters('LM_Domain_Name')]"
             }
-          ]
+          ],
+          "minTlsVersion" : "[parameters('TLSVersionFunctionApp')]"
         }
       },
       "dependsOn": [