Adding develop branch for testing purpose

Author: choudharypooja

arm-template-deployment/deployRGParent.json

@@ -30,10 +30,21 @@
         "description": "Enable Activity logs to be sent to the event hub that will get created in this deployment"
       },
       "defaultValue": "Yes"
+    },
+    "sourceCodeBranch": {
+      "type": "String",
+      "allowedValues": [
+        "master",
+        "develop"
+      ],
+      "metadata": {
+        "description": "Github branch from which the code is to be deployed"
+      },
+      "defaultValue": "master"
     }
   },
   "variables": {
-    "templateBaseUri": "https://raw.githubusercontent.com/logicmonitor/lm-logs-azure/master/arm-template-deployment/",
+    "templateBaseUri": "[concat('https://raw.githubusercontent.com/logicmonitor/lm-logs-azure/',parameters('sourceCodeBranch'),'/arm-template-deployment/')]",
     "deploymentResourceGroupName": "[concat('lm-logs','-',parameters('LM_Company_name'), '-', replace(parameters('resource_group_region'),' ',''),'-group')]",
     "eventhubNamespace": "[concat('lm-logs','-',parameters('LM_Company_name'), '-', replace(parameters('resource_group_region'),' ',''))]",
     "eventhubLogsName": "log-hub",
@@ -75,6 +86,9 @@
           },
           "Azure_Client_Id": {
             "value": "[parameters('Azure_Client_Id')]"
+          },
+          "sourceCodeBranch": {
+            "value": "[parameters('sourceCodeBranch')]"
           }
         }
       },

arm-template-deployment/deployResourcesInRG.json

@@ -16,6 +16,9 @@
     },
     "azure_region": {
       "type": "string"
+    },
+    "sourceCodeBranch": {
+      "type": "string"
     }
   },
   "variables": {
@@ -127,7 +130,7 @@
             },
             {
               "name": "WEBSITE_RUN_FROM_PACKAGE",
-              "value": "https://github.com/logicmonitor/lm-logs-azure/raw/master/package/lm-logs-azure.zip"
+              "value": "[concat('https://github.com/logicmonitor/lm-logs-azure/raw/',parameters('sourceCodeBranch'),'/package/lm-logs-azure.zip')]"
             },
             {
               "name": "AzureWebJobsStorage",

arm-template-deployment/deploymentChildScript.json

@@ -20,6 +20,9 @@
     },
     "utcNow": {
       "type": "String"
+    },
+    "sourceCodeBranch": {
+      "type": "string"
     }
   },
   "resources": [
@@ -40,11 +43,11 @@
         "forceUpdateTag": "[parameters('utcNow')]",
         "azPowerShellVersion": "5.6",
         "timeout": "PT1H",
-        "arguments": "[format(' -resourceGroup {0} -lmCompanyName {1} -subscriptionId {2} -location {3}', parameters('resourceGroup'),parameters('LM_Company_name'), parameters('subscriptionId'), parameters('location'))]",
-        "primaryScriptURI": "https://raw.githubusercontent.com/logicmonitor/lm-logs-azure/master/diagnostic-settings-scripts/policyCreationAndRemediationTemplate.ps1",
+        "arguments": "[format(' -resourceGroup {0} -lmCompanyName {1} -subscriptionId {2} -location {3} -sourceCodeBranch {4}', parameters('resourceGroup'),parameters('LM_Company_name'), parameters('subscriptionId'), parameters('location'), parameters('sourceCodeBranch'))]",
+        "primaryScriptURI": "[concat('https://raw.githubusercontent.com/logicmonitor/lm-logs-azure/',parameters('sourceCodeBranch'),'/diagnostic-settings-scripts/policyCreationAndRemediationTemplate.ps1')]",
         "supportingScriptUris": [
-          "https://raw.githubusercontent.com/logicmonitor/lm-logs-azure/master/diagnostic-settings-scripts/policyAssignment.ps1",
-          "https://raw.githubusercontent.com/logicmonitor/lm-logs-azure/master/diagnostic-settings-scripts/policyInitiativeRemediation.ps1"
+          "[concat('https://raw.githubusercontent.com/logicmonitor/lm-logs-azure/',parameters('sourceCodeBranch'),'/diagnostic-settings-scripts/policyAssignment.ps1')]",
+          "[concat('https://raw.githubusercontent.com/logicmonitor/lm-logs-azure/',parameters('sourceCodeBranch'),'/diagnostic-settings-scripts/policyInitiativeRemediation.ps1')]"
         ],
         "cleanupPreference": "Always",
         "retentionInterval": "P1D"

arm-template-deployment/deploymentParentScript.json

@@ -12,10 +12,21 @@
       "defaultValue": "[utcNow()]",
       "type": "String",
       "metadata": "Please do not edit this setting"
+    },
+    "sourceCodeBranch": {
+      "type": "String",
+      "allowedValues": [
+        "master",
+        "develop"
+      ],
+      "metadata": {
+        "description": "branch from which the code is to be deployed"
+      },
+      "defaultValue": "master"
     }
   },
   "variables": {
-    "templateBaseUri": "https://raw.githubusercontent.com/logicmonitor/lm-logs-azure/master/arm-template-deployment/",
+    "templateBaseUri": "[concat('https://raw.githubusercontent.com/logicmonitor/lm-logs-azure/',parameters('sourceCodeBranch'),'/arm-template-deployment/')]",
     "deploymentResourceGroupName": "[concat('lm-logs-',parameters('LM_Company_name'),'-',resourceGroup().Location,'-group')]",
     "managedIdentityName": "[concat('msi-', variables('deploymentResourceGroupName'), '-deploy')]",
     "managedIdentityId": "[concat('/subscriptions/', subscription().subscriptionId, '/resourceGroups/', variables('deploymentResourceGroupName'), '/providers/Microsoft.ManagedIdentity/userAssignedIdentities/', variables('managedIdentityName'))]"
@@ -49,6 +60,9 @@
           },
           "location": {
             "value": "[resourceGroup().Location]"
+          },
+          "sourceCodeBranch": {
+            "value": "[parameters('sourceCodeBranch')]"
           }
         }
       },

diagnostic-settings-scripts/policyCreationAndRemediationTemplate.ps1

@@ -10,7 +10,10 @@ param
     [string]$subscriptionId,
 
     [Parameter(Mandatory = $True)]
-    [string]$location
+    [string]$location,
+
+    [Parameter(Mandatory = $True)]
+    [string]$sourceCodeBranch
 
 )
 
@@ -56,14 +59,14 @@ $targetResourceGroup = 'lm-logs-' + $lmCompanyName + '-' + $location + '-group'
 $eventhubNameSpace = $targetResourceGroup.replace('-group','')
 $eventhubName = 'log-hub'
 $eventhubAuthorizationId = 'RootManageSharedAccessKey'
-
+$templateUri = 'https://raw.githubusercontent.com/logicmonitor/lm-logs-azure/'+$sourceCodeBranch+'/arm-template-deployment/ARMTemplateExport.json'
 Get-AzResourceGroup -Name $targetResourceGroup -ErrorVariable notPresent -ErrorAction SilentlyContinue
 if ($notPresent) {
     Write-Host "target resource group not present..."
     exit;
 }
 else{
-    New-AzDeployment -TemplateUri "https://raw.githubusercontent.com/logicmonitor/lm-logs-azure/master/arm-template-deployment/ARMTemplateExport.json" -Location "West US" -Verbose
+    New-AzDeployment -TemplateUri $templateUri -Location "West US" -Verbose
     $policyAssignments = ./policyAssignment.ps1 -resourceGroup $resourceGroup -location $location -eventhubName $eventhubName -eventhubNameSpace $eventhubNameSpace -eventhubAuthorizationId $eventhubAuthorizationId -targetResourceGroup $targetResourceGroup
     Write-Host "Running compliance result for $($policyAssignments.PolicyAssignmentId)" -ForegroundColor Cyan
     Start-AzPolicyComplianceScan -ResourceGroupName $policyAssignments.ResourceGroupName