Skip to content

Commit fe8fdd1

Browse files
bishal-pdMSFTbishal-pdMSFT
authored
Merge pull request #4809 from Microsoft/users/biprasad/vmssTaskShip
Fix strings, names and icon in VMSS task
2 parents 077e11c + f7c18b3 commit fe8fdd1

File tree

11 files changed

+66
-100
lines changed

11 files changed

+66
-100
lines changed

‎Tasks/AzureVmssDeployment/Strings/resources.resjson/en-US/resources.resjson‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,23 @@
1818
"loc.messages.TaskNotFound": "Task.json file could not be found: %s",
1919
"loc.messages.TaskConstructorFailed": "Task failed while initializing. Error: %s",
2020
"loc.messages.InvalidValue": "%s is not a valid value. The valid values are: %s",
21-
"loc.messages.VMSSListFetchFailed": "Failed to fetch VMSS details.",
21+
"loc.messages.VMSSListFetchFailed": "Failed to fetch VMSS details. Error: %s",
2222
"loc.messages.NoVMSSFound": "No VMSS found with name %s.",
2323
"loc.messages.FailedToGetRGForVMSS": "Failed to get resource group information for VMSS %s.",
2424
"loc.messages.VMSSImageUpdateFailed": "Failed to update image for VMSS %s. Error: %s",
2525
"loc.messages.UpdatedVMSSImage": "Successfully updated VMSS image.",
26-
"loc.messages.VMSSUpdateImage": "Updating VMSS %s image to %s",
27-
"loc.messages.VMSSNameCannotBeNull": "VMSS name cannot be null or undefined and it must be of type string.",
28-
"loc.messages.GetVMSSFailedWillRetry": "Failed to get VMSS details with resource group %s and name %s. Error: %s. Will retry.",
29-
"loc.messages.GetVMSSFailed": "Failed to get VMSS details with resource group %s and name %s. Error: %s",
30-
"loc.messages.WaitingForVMSSImageUpdateCompletion": "Waiting for VMSS image to get updated..",
31-
"loc.messages.VMSSImageUpdateTimedOut": "Timed out waiting for VMSS image update to complete.",
32-
"loc.messages.VMSSDoesNotHaveCustomImage": "VMSS %s can not be updated as it uses a platform image. Only a VMSS which is currently using a custom image can be updated.",
33-
"loc.messages.VMSSImageUrlCannotBeNull": "Image url must be a non empty string.",
34-
"loc.messages.VMSSImageAlreadyUptoDate": "VMSS image is already up-to-date for %s.",
3526
"loc.messages.GetVMSSExtensionsListFailed": "Failed to fetch list of VM extensions for VMSS %s. Error: %s.",
3627
"loc.messages.CustomScriptExtensionRemoved": "Custom script extension %s removed successfully.",
3728
"loc.messages.CustomScriptExtensionInstalled": "Custom script extension %s installed successfully.",
3829
"loc.messages.RemovingCustomScriptExtension": "VMSS already has an custom script extension %s. This will be removed first.",
39-
"loc.messages.RemoveVMSSExtensionsFailed": "Failed to remove extension %s. Error: %s.",
40-
"loc.messages.SettingVMExtensionFailed": "Failed to install VM custom script extension on VMSS. Error:%s.",
30+
"loc.messages.RemoveVMSSExtensionsFailed": "Failed to remove VM extension %s. Error: %s.",
31+
"loc.messages.SettingVMExtensionFailed": "Failed to install VM custom script extension on VMSS. Error: %s.",
32+
"loc.messages.VMSSNameCannotBeNull": "VMSS name cannot be null or undefined and it must be of type string.",
33+
"loc.messages.GetVMSSFailed": "Failed to get VMSS details with resource group %s and name %s. Error: %s",
34+
"loc.messages.VMSSDoesNotHaveCustomImage": "VMSS %s can not be updated as it uses a platform image. Only a VMSS which is currently using a custom image can be updated.",
35+
"loc.messages.VMSSImageUrlCannotBeNull": "Image url must be a non empty string.",
36+
"loc.messages.VMSSImageAlreadyUptoDate": "Image is already up-to-date for %s. Skipping image update.",
37+
"loc.messages.NewVMSSImageUrl": "Url for new VMSS image: %s.",
38+
"loc.messages.VMSSUpdateImage": "Updating VMSS %s to use new image...",
4139
"loc.messages.ResourceNameCannotBeNull": "Resource name cannot be null."
4240
}

‎Tasks/AzureVmssDeployment/Tests/updateImage.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import path = require('path');
55
let taskPath = path.join(__dirname, '..', 'main.js');
66
let tr: tmrm.TaskMockRunner = new tmrm.TaskMockRunner(taskPath);
77

8-
tr.setInput("action", "UpdateImage");
8+
tr.setInput("action", "Update image");
99
tr.setInput("ConnectedServiceName", "AzureRM");
1010
tr.setInput("vmssName", process.env["noMatchingVmss"] === "true" ? "random-vmss" : "testvmss1");
1111
tr.setInput("imageUrl", process.env["imageUrlAlreadyUptoDate"] === "true" ? "http://old-url" : "https://someurl");

‎Tasks/AzureVmssDeployment/icon.png‎

-70 Bytes
Loading

‎Tasks/AzureVmssDeployment/icon.svg‎

Lines changed: 18 additions & 45 deletions
Loading

‎Tasks/AzureVmssDeployment/main.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ async function run(): Promise<void> {
99
var vmssOperation = new VirtualMachineScaleSet(taskParameters);
1010
switch (taskParameters.action) {
1111
case "UpdateImage":
12+
case "Update image":
1213
await vmssOperation.execute();
1314
break;
1415
default:

‎Tasks/AzureVmssDeployment/operations/VirtualMachineScaleSet.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export default class VirtualMachineScaleSet {
2323

2424
switch (this.taskParameters.action) {
2525
case "UpdateImage":
26+
case "Update image":
2627
var extensionMetadata: azureModel.VMExtensionMetadata = null;
2728
if(!!this.taskParameters.customScriptUrl) {
2829
extensionMetadata = this._getCustomScriptExtensionMetadata(osType);
@@ -61,7 +62,7 @@ export default class VirtualMachineScaleSet {
6162
return new Promise<any>((resolve, reject) => {
6263
client.virtualMachineScaleSets.list(null, (error, result, request, response) => {
6364
if (error) {
64-
return reject(tl.loc("VMSSListFetchFailed", this.taskParameters.vmssName, utils.getError(error)));
65+
return reject(tl.loc("VMSSListFetchFailed", utils.getError(error)));
6566
}
6667

6768
var vmssList: azureModel.VMSS[] = result;
@@ -142,7 +143,7 @@ export default class VirtualMachineScaleSet {
142143
return new Promise<void>((resolve, reject) => {
143144
client.virtualMachineScaleSets.updateImage(resourceGroupName, this.taskParameters.vmssName, this.taskParameters.imageUrl, null, (error, result, request, response) => {
144145
if (error) {
145-
return reject(tl.loc("VMSSImageUpdateFailed", utils.getError(error)));
146+
return reject(tl.loc("VMSSImageUpdateFailed", this.taskParameters.vmssName, utils.getError(error)));
146147
}
147148
console.log(tl.loc("UpdatedVMSSImage"));
148149
return resolve();

‎Tasks/AzureVmssDeployment/task.json‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 0,
1616
"Minor": 0,
17-
"Patch": 2
17+
"Patch": 3
1818
},
1919
"demands": [],
2020
"minimumAgentVersion": "2.0.0",
@@ -28,7 +28,7 @@
2828
"name": "Image",
2929
"displayName": "Image Details",
3030
"isExpanded": true,
31-
"visibleRule": "action = UpdateImage"
31+
"visibleRule": "action = Update image || action = UpdateImage"
3232
}
3333
],
3434
"inputs": [
@@ -45,12 +45,12 @@
4545
"name": "action",
4646
"type": "pickList",
4747
"label": "Action",
48-
"defaultValue": "UpdateImage",
48+
"defaultValue": "Update image",
4949
"required": true,
5050
"groupName": "AzureDetails",
5151
"helpMarkDown": "Action to be performed on the scale set.",
5252
"options": {
53-
"UpdateImage": "Update image"
53+
"Update image": "Update image"
5454
}
5555
},
5656
{
@@ -92,26 +92,24 @@
9292
"TaskNotFound": "Task.json file could not be found: %s",
9393
"TaskConstructorFailed": "Task failed while initializing. Error: %s",
9494
"InvalidValue": "%s is not a valid value. The valid values are: %s",
95-
"VMSSListFetchFailed": "Failed to fetch VMSS details.",
95+
"VMSSListFetchFailed": "Failed to fetch VMSS details. Error: %s",
9696
"NoVMSSFound": "No VMSS found with name %s.",
9797
"FailedToGetRGForVMSS": "Failed to get resource group information for VMSS %s.",
9898
"VMSSImageUpdateFailed": "Failed to update image for VMSS %s. Error: %s",
9999
"UpdatedVMSSImage": "Successfully updated VMSS image.",
100-
"VMSSUpdateImage": "Updating VMSS %s image to %s",
101-
"VMSSNameCannotBeNull": "VMSS name cannot be null or undefined and it must be of type string.",
102-
"GetVMSSFailedWillRetry": "Failed to get VMSS details with resource group %s and name %s. Error: %s. Will retry.",
103-
"GetVMSSFailed": "Failed to get VMSS details with resource group %s and name %s. Error: %s",
104-
"WaitingForVMSSImageUpdateCompletion": "Waiting for VMSS image to get updated..",
105-
"VMSSImageUpdateTimedOut": "Timed out waiting for VMSS image update to complete.",
106-
"VMSSDoesNotHaveCustomImage": "VMSS %s can not be updated as it uses a platform image. Only a VMSS which is currently using a custom image can be updated.",
107-
"VMSSImageUrlCannotBeNull": "Image url must be a non empty string.",
108-
"VMSSImageAlreadyUptoDate": "VMSS image is already up-to-date for %s.",
109100
"GetVMSSExtensionsListFailed": "Failed to fetch list of VM extensions for VMSS %s. Error: %s.",
110101
"CustomScriptExtensionRemoved": "Custom script extension %s removed successfully.",
111102
"CustomScriptExtensionInstalled": "Custom script extension %s installed successfully.",
112103
"RemovingCustomScriptExtension": "VMSS already has an custom script extension %s. This will be removed first.",
113-
"RemoveVMSSExtensionsFailed": "Failed to remove extension %s. Error: %s.",
114-
"SettingVMExtensionFailed": "Failed to install VM custom script extension on VMSS. Error:%s.",
104+
"RemoveVMSSExtensionsFailed": "Failed to remove VM extension %s. Error: %s.",
105+
"SettingVMExtensionFailed": "Failed to install VM custom script extension on VMSS. Error: %s.",
106+
"VMSSNameCannotBeNull": "VMSS name cannot be null or undefined and it must be of type string.",
107+
"GetVMSSFailed": "Failed to get VMSS details with resource group %s and name %s. Error: %s",
108+
"VMSSDoesNotHaveCustomImage": "VMSS %s can not be updated as it uses a platform image. Only a VMSS which is currently using a custom image can be updated.",
109+
"VMSSImageUrlCannotBeNull": "Image url must be a non empty string.",
110+
"VMSSImageAlreadyUptoDate": "Image is already up-to-date for %s. Skipping image update.",
111+
"NewVMSSImageUrl": "Url for new VMSS image: %s.",
112+
"VMSSUpdateImage": "Updating VMSS %s to use new image...",
115113
"ResourceNameCannotBeNull": "Resource name cannot be null."
116114
}
117115
}

‎Tasks/AzureVmssDeployment/task.loc.json‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": {
1515
"Major": 0,
1616
"Minor": 0,
17-
"Patch": 2
17+
"Patch": 3
1818
},
1919
"demands": [],
2020
"minimumAgentVersion": "2.0.0",
@@ -28,7 +28,7 @@
2828
"name": "Image",
2929
"displayName": "ms-resource:loc.group.displayName.Image",
3030
"isExpanded": true,
31-
"visibleRule": "action = UpdateImage"
31+
"visibleRule": "action = Update image || action = UpdateImage"
3232
}
3333
],
3434
"inputs": [
@@ -45,12 +45,12 @@
4545
"name": "action",
4646
"type": "pickList",
4747
"label": "ms-resource:loc.input.label.action",
48-
"defaultValue": "UpdateImage",
48+
"defaultValue": "Update image",
4949
"required": true,
5050
"groupName": "AzureDetails",
5151
"helpMarkDown": "ms-resource:loc.input.help.action",
5252
"options": {
53-
"UpdateImage": "Update image"
53+
"Update image": "Update image"
5454
}
5555
},
5656
{
@@ -97,21 +97,19 @@
9797
"FailedToGetRGForVMSS": "ms-resource:loc.messages.FailedToGetRGForVMSS",
9898
"VMSSImageUpdateFailed": "ms-resource:loc.messages.VMSSImageUpdateFailed",
9999
"UpdatedVMSSImage": "ms-resource:loc.messages.UpdatedVMSSImage",
100-
"VMSSUpdateImage": "ms-resource:loc.messages.VMSSUpdateImage",
101-
"VMSSNameCannotBeNull": "ms-resource:loc.messages.VMSSNameCannotBeNull",
102-
"GetVMSSFailedWillRetry": "ms-resource:loc.messages.GetVMSSFailedWillRetry",
103-
"GetVMSSFailed": "ms-resource:loc.messages.GetVMSSFailed",
104-
"WaitingForVMSSImageUpdateCompletion": "ms-resource:loc.messages.WaitingForVMSSImageUpdateCompletion",
105-
"VMSSImageUpdateTimedOut": "ms-resource:loc.messages.VMSSImageUpdateTimedOut",
106-
"VMSSDoesNotHaveCustomImage": "ms-resource:loc.messages.VMSSDoesNotHaveCustomImage",
107-
"VMSSImageUrlCannotBeNull": "ms-resource:loc.messages.VMSSImageUrlCannotBeNull",
108-
"VMSSImageAlreadyUptoDate": "ms-resource:loc.messages.VMSSImageAlreadyUptoDate",
109100
"GetVMSSExtensionsListFailed": "ms-resource:loc.messages.GetVMSSExtensionsListFailed",
110101
"CustomScriptExtensionRemoved": "ms-resource:loc.messages.CustomScriptExtensionRemoved",
111102
"CustomScriptExtensionInstalled": "ms-resource:loc.messages.CustomScriptExtensionInstalled",
112103
"RemovingCustomScriptExtension": "ms-resource:loc.messages.RemovingCustomScriptExtension",
113104
"RemoveVMSSExtensionsFailed": "ms-resource:loc.messages.RemoveVMSSExtensionsFailed",
114105
"SettingVMExtensionFailed": "ms-resource:loc.messages.SettingVMExtensionFailed",
106+
"VMSSNameCannotBeNull": "ms-resource:loc.messages.VMSSNameCannotBeNull",
107+
"GetVMSSFailed": "ms-resource:loc.messages.GetVMSSFailed",
108+
"VMSSDoesNotHaveCustomImage": "ms-resource:loc.messages.VMSSDoesNotHaveCustomImage",
109+
"VMSSImageUrlCannotBeNull": "ms-resource:loc.messages.VMSSImageUrlCannotBeNull",
110+
"VMSSImageAlreadyUptoDate": "ms-resource:loc.messages.VMSSImageAlreadyUptoDate",
111+
"NewVMSSImageUrl": "ms-resource:loc.messages.NewVMSSImageUrl",
112+
"VMSSUpdateImage": "ms-resource:loc.messages.VMSSUpdateImage",
115113
"ResourceNameCannotBeNull": "ms-resource:loc.messages.ResourceNameCannotBeNull"
116114
}
117115
}

‎Tasks/Common/azure-arm-rest/Strings/resources.resjson/en-US/resources.resjson‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,11 @@
2727
"loc.messages.ResourceGroupDeceededLength": "\"resourceGroupName\" should satisfy the constraint - \"MinLength\": 1",
2828
"loc.messages.ResourceGroupDoesntMatchPattern": "\"resourceGroupName\" should satisfy the constraint - \"Pattern\": /^[-\\w\\._\\(\\)]+$/",
2929
"loc.messages.VMSSNameCannotBeNull": "VMSS name cannot be null or undefined and it must be of type string.",
30-
"loc.messages.GetVMSSFailedWillRetry": "Failed to get VMSS details with resource group %s and name %s. Error: %s. Will retry.",
3130
"loc.messages.GetVMSSFailed": "Failed to get VMSS details with resource group %s and name %s. Error: %s",
32-
"loc.messages.VMSSUpdateImage": "Updating VMSS %s image to %s",
33-
"loc.messages.WaitingForVMSSImageUpdateCompletion": "Waiting for VMSS image to get updated..",
34-
"loc.messages.VMSSImageUpdateTimedOut": "Timed out waiting for VMSS image update to complete.",
3531
"loc.messages.VMSSDoesNotHaveCustomImage": "VMSS %s can not be updated as it uses a platform image. Only a VMSS which is currently using a custom image can be updated.",
3632
"loc.messages.VMSSImageUrlCannotBeNull": "Image url must be a non empty string.",
37-
"loc.messages.VMSSImageAlreadyUptoDate": "VMSS image is already up-to-date.",
33+
"loc.messages.VMSSImageAlreadyUptoDate": "Image is already up-to-date for %s. Skipping image update.",
34+
"loc.messages.NewVMSSImageUrl": "Url for new VMSS image: %s.",
35+
"loc.messages.VMSSUpdateImage": "Updating VMSS %s to use new image...",
3836
"loc.messages.ResourceNameCannotBeNull": "Resource name cannot be null."
3937
}

‎Tasks/Common/azure-arm-rest/azure-arm-compute.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,8 @@ export class VirtualMachineScaleSets {
779779
httpRequest.body = JSON.stringify(patchBody);
780780

781781
// patch VMSS image
782-
console.log(tl.loc("VMSSUpdateImage", vmssName, imageUrl));
782+
console.log(tl.loc("NewVMSSImageUrl", imageUrl));
783+
console.log(tl.loc("VMSSUpdateImage", vmssName));
783784
this.client.beginRequest(httpRequest).then((response: webClient.WebResponse) => {
784785
var deferred = Q.defer<azureServiceClient.ApiResult>();
785786
var statusCode = response.statusCode;

0 commit comments

Comments
 (0)