Add application insights connection string support - APPLICATIONINSIGHTS_CONNECTION_STRING

Tasks/AzureFunctionAppContainerV1/operations/ReleaseAnnotationUtility.ts

@@ -7,7 +7,7 @@ import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azureModels'
 export async function addReleaseAnnotation(endpoint: AzureEndpoint, azureAppService: AzureAppService, isDeploymentSuccess: boolean): Promise<void> {
     try {
         var appSettings = await azureAppService.getApplicationSettings();
-        var instrumentationKey = appSettings && appSettings.properties && appSettings.properties.APPINSIGHTS_INSTRUMENTATIONKEY;
+        var instrumentationKey = getInstrumentationKey(appSettings);
         if(instrumentationKey) {
             let appinsightsResources: ApplicationInsightsResources = new ApplicationInsightsResources(endpoint);
             var appInsightsResources = await appinsightsResources.list(null, [`$filter=InstrumentationKey eq '${instrumentationKey}'`]);
@@ -89,4 +89,21 @@ function getPipelineVariable(variableName: string): string | undefined {
     let variable = tl.getVariable(variableName);
     //we dont want to set a variable to be empty string
     return !!variable ? variable : undefined;
-}
+}
+
+function getInstrumentationKey(appSettings: any): string | undefined {
+    let connectionString = appSettings?.properties?.APPLICATIONINSIGHTS_CONNECTION_STRING;
+    if (connectionString){
+        const FIELDS_SEPARATOR = ";";
+        const FIELD_KEY_VALUE_SEPARATOR = "=";
+
+        const kvPairs = connectionString.split(FIELDS_SEPARATOR);
+        for (const kvPair of kvPairs) {
+            const pair = kvPair.split(FIELD_KEY_VALUE_SEPARATOR);
+            if (pair.length === 2 && pair[0].trim().toLowerCase() === "instrumentationkey") {
+                return pair[1].trim();
+            }
+        }
+    }
+    return appSettings?.properties?.APPINSIGHTS_INSTRUMENTATIONKEY;
+}

Tasks/AzureFunctionAppContainerV1/task.json

@@ -17,7 +17,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 238,
+    "Minor": 240,
     "Patch": 0
   },
   "minimumAgentVersion": "2.104.1",

Tasks/AzureFunctionAppContainerV1/task.loc.json

@@ -17,7 +17,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 238,
+    "Minor": 240,
     "Patch": 0
   },
   "minimumAgentVersion": "2.104.1",

Tasks/AzureFunctionAppV1/operations/ReleaseAnnotationUtility.ts

@@ -8,7 +8,7 @@ var uuidV4 = require("uuid/v4");
 export async function addReleaseAnnotation(endpoint: AzureEndpoint, azureAppService: AzureAppService, isDeploymentSuccess: boolean): Promise<void> {
     try {
         var appSettings = await azureAppService.getApplicationSettings();
-        var instrumentationKey = appSettings && appSettings.properties && appSettings.properties.APPINSIGHTS_INSTRUMENTATIONKEY;
+        var instrumentationKey = getInstrumentationKey(appSettings);
         if(instrumentationKey) {
             let appinsightsResources: ApplicationInsightsResources = new ApplicationInsightsResources(endpoint);
             var appInsightsResources = await appinsightsResources.list(null, [`$filter=InstrumentationKey eq '${instrumentationKey}'`]);
@@ -91,3 +91,20 @@ function getPipelineVariable(variableName: string): string | undefined {
     //we dont want to set a variable to be empty string
     return !!variable ? variable : undefined;
 }
+
+function getInstrumentationKey(appSettings: any): string | undefined {
+    let connectionString = appSettings?.properties?.APPLICATIONINSIGHTS_CONNECTION_STRING;
+    if (connectionString){
+        const FIELDS_SEPARATOR = ";";
+        const FIELD_KEY_VALUE_SEPARATOR = "=";
+
+        const kvPairs = connectionString.split(FIELDS_SEPARATOR);
+        for (const kvPair of kvPairs) {
+            const pair = kvPair.split(FIELD_KEY_VALUE_SEPARATOR);
+            if (pair.length === 2 && pair[0].trim().toLowerCase() === "instrumentationkey") {
+                return pair[1].trim();
+            }
+        }
+    }
+    return appSettings?.properties?.APPINSIGHTS_INSTRUMENTATIONKEY;
+}

Tasks/AzureFunctionAppV1/task.json

@@ -17,7 +17,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 238,
+    "Minor": 240,
     "Patch": 0
   },
   "minimumAgentVersion": "2.104.1",

Tasks/AzureFunctionAppV1/task.loc.json

@@ -17,7 +17,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 238,
+    "Minor": 240,
     "Patch": 0
   },
   "minimumAgentVersion": "2.104.1",

Tasks/AzureFunctionAppV2/operations/ReleaseAnnotationUtility.ts

@@ -8,7 +8,7 @@ var uuidV4 = require("uuid/v4");
 export async function addReleaseAnnotation(endpoint: AzureEndpoint, azureAppService: AzureAppService, isDeploymentSuccess: boolean): Promise<void> {
     try {
         var appSettings = await azureAppService.getApplicationSettings();
-        var instrumentationKey = appSettings && appSettings.properties && appSettings.properties.APPINSIGHTS_INSTRUMENTATIONKEY;
+        var instrumentationKey = getInstrumentationKey(appSettings);
         if(instrumentationKey) {
             let appinsightsResources: ApplicationInsightsResources = new ApplicationInsightsResources(endpoint);
             var appInsightsResources = await appinsightsResources.list(null, [`$filter=InstrumentationKey eq '${instrumentationKey}'`]);
@@ -91,3 +91,20 @@ function getPipelineVariable(variableName: string): string | undefined {
     //we dont want to set a variable to be empty string
     return !!variable ? variable : undefined;
 }
+
+function getInstrumentationKey(appSettings: any): string | undefined {
+    let connectionString = appSettings?.properties?.APPLICATIONINSIGHTS_CONNECTION_STRING;
+    if (connectionString){
+        const FIELDS_SEPARATOR = ";";
+        const FIELD_KEY_VALUE_SEPARATOR = "=";
+
+        const kvPairs = connectionString.split(FIELDS_SEPARATOR);
+        for (const kvPair of kvPairs) {
+            const pair = kvPair.split(FIELD_KEY_VALUE_SEPARATOR);
+            if (pair.length === 2 && pair[0].trim().toLowerCase() === "instrumentationkey") {
+                return pair[1].trim();
+            }
+        }
+    }
+    return appSettings?.properties?.APPINSIGHTS_INSTRUMENTATIONKEY;
+}

Tasks/AzureFunctionAppV2/task.json

@@ -17,7 +17,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 238,
+    "Minor": 240,
     "Patch": 0
   },
   "releaseNotes": "What's new in version 2.* <br /> Removed WAR Deploy Support, setting Web.Config options, and the option for the Startup command for Linux Azure Function Apps.",

Tasks/AzureFunctionAppV2/task.loc.json

@@ -17,7 +17,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 238,
+    "Minor": 240,
     "Patch": 0
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",

Tasks/AzureRmWebAppDeploymentV3/operations/ReleaseAnnotationUtility.ts

@@ -8,7 +8,7 @@ var uuidV4 = require("uuid/v4");
 export async function addReleaseAnnotation(endpoint: AzureEndpoint, azureAppService: AzureAppService, isDeploymentSuccess: boolean): Promise<void> {
     try {
         var appSettings = await azureAppService.getApplicationSettings();
-        var instrumentationKey = appSettings && appSettings.properties && appSettings.properties.APPINSIGHTS_INSTRUMENTATIONKEY;
+        var instrumentationKey = getInstrumentationKey(appSettings);
         if(instrumentationKey) {
             let appinsightsResources: ApplicationInsightsResources = new ApplicationInsightsResources(endpoint);
             var appInsightsResources = await appinsightsResources.list(null, [`$filter=InstrumentationKey eq '${instrumentationKey}'`]);
@@ -90,4 +90,21 @@ function getPipelineVariable(variableName: string): string | undefined {
     let variable = tl.getVariable(variableName);
     //we dont want to set a variable to be empty string
     return !!variable ? variable : undefined;
-}
+}
+
+function getInstrumentationKey(appSettings: any): string | undefined {
+    let connectionString = appSettings?.properties?.APPLICATIONINSIGHTS_CONNECTION_STRING;
+    if (connectionString){
+        const FIELDS_SEPARATOR = ";";
+        const FIELD_KEY_VALUE_SEPARATOR = "=";
+
+        const kvPairs = connectionString.split(FIELDS_SEPARATOR);
+        for (const kvPair of kvPairs) {
+            const pair = kvPair.split(FIELD_KEY_VALUE_SEPARATOR);
+            if (pair.length === 2 && pair[0].trim().toLowerCase() === "instrumentationkey") {
+                return pair[1].trim();
+            }
+        }
+    }
+    return appSettings?.properties?.APPINSIGHTS_INSTRUMENTATIONKEY;
+}

Tasks/AzureRmWebAppDeploymentV3/task.json

@@ -18,7 +18,7 @@
   "version": {
     "Major": 3,
     "Minor": 240,
-    "Patch": 2
+    "Patch": 4
   },
   "releaseNotes": "What's new in Version 3.0: <br/>&nbsp;&nbsp;Supports File Transformations (XDT) <br/>&nbsp;&nbsp;Supports Variable Substitutions(XML, JSON) <br/>Click [here](https://aka.ms/azurermwebdeployreadme) for more information.",
   "minimumAgentVersion": "2.104.1",
@@ -622,12 +622,12 @@
   ],
   "instanceNameFormat": "Azure App Service Deploy: $(WebAppName)",
   "execution": {
+    "Node10": {
+      "target": "azurermwebappdeployment.js"
+    },
     "Node16": {
       "target": "azurermwebappdeployment.js",
       "argumentFormat": ""
-    },
-    "Node10": {
-      "target": "azurermwebappdeployment.js"
     }
   },
   "messages": {

Tasks/AzureRmWebAppDeploymentV3/task.loc.json

@@ -18,7 +18,7 @@
   "version": {
     "Major": 3,
     "Minor": 240,
-    "Patch": 2
+    "Patch": 4
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "minimumAgentVersion": "2.104.1",
@@ -622,12 +622,12 @@
   ],
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",
   "execution": {
+    "Node10": {
+      "target": "azurermwebappdeployment.js"
+    },
     "Node16": {
       "target": "azurermwebappdeployment.js",
       "argumentFormat": ""
-    },
-    "Node10": {
-      "target": "azurermwebappdeployment.js"
     }
   },
   "messages": {

Tasks/AzureRmWebAppDeploymentV4/operations/ReleaseAnnotationUtility.ts

@@ -8,7 +8,7 @@ var uuidV4 = require("uuid/v4");
 export async function addReleaseAnnotation(endpoint: AzureEndpoint, azureAppService: AzureAppService, isDeploymentSuccess: boolean): Promise<void> {
     try {
         var appSettings = await azureAppService.getApplicationSettings();
-        var instrumentationKey = appSettings && appSettings.properties && appSettings.properties.APPINSIGHTS_INSTRUMENTATIONKEY;
+        var instrumentationKey = getInstrumentationKey(appSettings);
         if(instrumentationKey) {
             let appinsightsResources: ApplicationInsightsResources = new ApplicationInsightsResources(endpoint);
             var appInsightsResources = await appinsightsResources.list(null, [`$filter=InstrumentationKey eq '${instrumentationKey}'`]);
@@ -90,4 +90,21 @@ function getPipelineVariable(variableName: string): string | undefined {
     let variable = tl.getVariable(variableName);
     //we dont want to set a variable to be empty string
     return !!variable ? variable : undefined;
+}
+
+function getInstrumentationKey(appSettings: any): string | undefined {
+    let connectionString = appSettings?.properties?.APPLICATIONINSIGHTS_CONNECTION_STRING;
+    if (connectionString){
+        const FIELDS_SEPARATOR = ";";
+        const FIELD_KEY_VALUE_SEPARATOR = "=";
+
+        const kvPairs = connectionString.split(FIELDS_SEPARATOR);
+        for (const kvPair of kvPairs) {
+            const pair = kvPair.split(FIELD_KEY_VALUE_SEPARATOR);
+            if (pair.length === 2 && pair[0].trim().toLowerCase() === "instrumentationkey") {
+                return pair[1].trim();
+            }
+        }
+    }
+    return appSettings?.properties?.APPINSIGHTS_INSTRUMENTATIONKEY;
 }

Tasks/AzureRmWebAppDeploymentV4/task.json

@@ -18,7 +18,7 @@
   "version": {
     "Major": 4,
     "Minor": 240,
-    "Patch": 2
+    "Patch": 4
   },
   "releaseNotes": "What's new in version 4.*<br />Supports Zip Deploy, Run From Package, War Deploy [Details here](https://aka.ms/appServiceDeploymentMethods)<br />Supports App Service Environments<br />Improved UI for discovering different App service types supported by the task<br/>Run From Package is the preferred deployment method, which makes files in wwwroot folder read-only<br/>Click [here](https://aka.ms/azurermwebdeployreadme) for more information.",
   "minimumAgentVersion": "2.104.1",
@@ -495,12 +495,12 @@
   ],
   "instanceNameFormat": "Azure App Service Deploy: $(WebAppName)",
   "execution": {
+    "Node10": {
+      "target": "azurermwebappdeployment.js"
+    },
     "Node16": {
       "target": "azurermwebappdeployment.js",
       "argumentFormat": ""
-    },
-    "Node10": {
-      "target": "azurermwebappdeployment.js"
     }
   },
   "messages": {

Tasks/AzureRmWebAppDeploymentV4/task.loc.json

@@ -18,7 +18,7 @@
   "version": {
     "Major": 4,
     "Minor": 240,
-    "Patch": 2
+    "Patch": 4
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "minimumAgentVersion": "2.104.1",
@@ -495,12 +495,12 @@
   ],
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",
   "execution": {
+    "Node10": {
+      "target": "azurermwebappdeployment.js"
+    },
     "Node16": {
       "target": "azurermwebappdeployment.js",
       "argumentFormat": ""
-    },
-    "Node10": {
-      "target": "azurermwebappdeployment.js"
     }
   },
   "messages": {

Tasks/AzureWebAppContainerV1/operations/ReleaseAnnotationUtility.ts

@@ -7,7 +7,7 @@ import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azureModels'
 export async function addReleaseAnnotation(endpoint: AzureEndpoint, azureAppService: AzureAppService, isDeploymentSuccess: boolean): Promise<void> {
     try {
         var appSettings = await azureAppService.getApplicationSettings();
-        var instrumentationKey = appSettings && appSettings.properties && appSettings.properties.APPINSIGHTS_INSTRUMENTATIONKEY;
+        var instrumentationKey = getInstrumentationKey(appSettings);
         if(instrumentationKey) {
             let appinsightsResources: ApplicationInsightsResources = new ApplicationInsightsResources(endpoint);
             var appInsightsResources = await appinsightsResources.list(null, [`$filter=InstrumentationKey eq '${instrumentationKey}'`]);
@@ -89,4 +89,21 @@ function getPipelineVariable(variableName: string): string | undefined {
     let variable = tl.getVariable(variableName);
     //we dont want to set a variable to be empty string
     return !!variable ? variable : undefined;
-}
+}
+
+function getInstrumentationKey(appSettings: any): string | undefined {
+    let connectionString = appSettings?.properties?.APPLICATIONINSIGHTS_CONNECTION_STRING;
+    if (connectionString){
+        const FIELDS_SEPARATOR = ";";
+        const FIELD_KEY_VALUE_SEPARATOR = "=";
+
+        const kvPairs = connectionString.split(FIELDS_SEPARATOR);
+        for (const kvPair of kvPairs) {
+            const pair = kvPair.split(FIELD_KEY_VALUE_SEPARATOR);
+            if (pair.length === 2 && pair[0].trim().toLowerCase() === "instrumentationkey") {
+                return pair[1].trim();
+            }
+        }
+    }
+    return appSettings?.properties?.APPINSIGHTS_INSTRUMENTATIONKEY;
+}

Tasks/AzureWebAppContainerV1/task.json

@@ -17,7 +17,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 238,
+    "Minor": 240,
     "Patch": 0
   },
   "minimumAgentVersion": "2.104.1",

Tasks/AzureWebAppContainerV1/task.loc.json

@@ -17,7 +17,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 238,
+    "Minor": 240,
     "Patch": 0
   },
   "minimumAgentVersion": "2.104.1",

Tasks/AzureWebAppV1/operations/ReleaseAnnotationUtility.ts

@@ -8,7 +8,7 @@ var uuidV4 = require("uuid/v4");
 export async function addReleaseAnnotation(endpoint: AzureEndpoint, azureAppService: AzureAppService, isDeploymentSuccess: boolean): Promise<void> {
     try {
         var appSettings = await azureAppService.getApplicationSettings();
-        var instrumentationKey = appSettings && appSettings.properties && appSettings.properties.APPINSIGHTS_INSTRUMENTATIONKEY;
+        var instrumentationKey = getInstrumentationKey(appSettings);
         if(instrumentationKey) {
             let appinsightsResources: ApplicationInsightsResources = new ApplicationInsightsResources(endpoint);
             var appInsightsResources = await appinsightsResources.list(null, [`$filter=InstrumentationKey eq '${instrumentationKey}'`]);
@@ -90,4 +90,21 @@ function getPipelineVariable(variableName: string): string | undefined {
     let variable = tl.getVariable(variableName);
     //we dont want to set a variable to be empty string
     return !!variable ? variable : undefined;
-}
+}
+
+function getInstrumentationKey(appSettings: any): string | undefined {
+    let connectionString = appSettings?.properties?.APPLICATIONINSIGHTS_CONNECTION_STRING;
+    if (connectionString){
+        const FIELDS_SEPARATOR = ";";
+        const FIELD_KEY_VALUE_SEPARATOR = "=";
+
+        const kvPairs = connectionString.split(FIELDS_SEPARATOR);
+        for (const kvPair of kvPairs) {
+            const pair = kvPair.split(FIELD_KEY_VALUE_SEPARATOR);
+            if (pair.length === 2 && pair[0].trim().toLowerCase() === "instrumentationkey") {
+                return pair[1].trim();
+            }
+        }
+    }
+    return appSettings?.properties?.APPINSIGHTS_INSTRUMENTATIONKEY;
+}