Skip to content

Commit d0612c3

Browse files
authored
Python extension path fix - Azure App Service Manage Task m132 (#7048)
* resolved merge conflicts * make string const * removed space * removed space * added comment to track * changed task version
1 parent 8d31d94 commit d0612c3

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

Tasks/AzureAppServiceManage/operations/KuduServiceUtils.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import tl = require('vsts-task-lib/task');
22
import Q = require('q');
33
import { Kudu } from 'azure-arm-rest/azure-arm-app-service-kudu';
44
import webClient = require('azure-arm-rest/webClient');
5+
const pythonExtensionPrefix: string = "azureappservice-";
56

67
export class KuduServiceUtils {
78
private _appServiceKuduService: Kudu;
@@ -52,8 +53,10 @@ export class KuduServiceUtils {
5253

5354
for(var extensionID of extensionList) {
5455
var siteExtensionDetails = null;
55-
if(siteExtensionMap[extensionID]) {
56-
siteExtensionDetails = siteExtensionMap[extensionID];
56+
57+
// Python extensions are moved to Nuget and the extensions IDs are changed. The belo check ensures that old extensions are mapped to new extension ID.
58+
if(siteExtensionMap[extensionID] || (extensionID.startsWith('python') && siteExtensionMap[pythonExtensionPrefix + extensionID])) {
59+
siteExtensionDetails = siteExtensionMap[extensionID] || siteExtensionMap[pythonExtensionPrefix + extensionID];
5760
console.log(tl.loc('ExtensionAlreadyInstalled', extensionID));
5861
}
5962
else {
@@ -123,7 +126,7 @@ export class KuduServiceUtils {
123126
}
124127

125128
private _getExtensionLocalPath(extensionInfo: JSON): string {
126-
var extensionId: string = extensionInfo['id'];
129+
var extensionId: string = extensionInfo['id'].replace(pythonExtensionPrefix, "");
127130
var homeDir = "D:\\home\\";
128131

129132
if(extensionId.startsWith('python2')) {

Tasks/AzureAppServiceManage/task.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"version": {
1818
"Major": 0,
1919
"Minor": 2,
20-
"Patch": 25
20+
"Patch": 27
2121
},
2222
"minimumAgentVersion": "1.102.0",
2323
"instanceNameFormat": "$(Action): $(WebAppName)",

Tasks/AzureAppServiceManage/task.loc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"version": {
1818
"Major": 0,
1919
"Minor": 2,
20-
"Patch": 25
20+
"Patch": 27
2121
},
2222
"minimumAgentVersion": "1.102.0",
2323
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",

0 commit comments

Comments
 (0)