Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename to AzureSpringApps #17471

Merged
merged 21 commits into from
Apr 13, 2023

Conversation

yitaopan
Copy link
Member

Task name: AzureSpringCloudV0

Description: Rename Azure Spring Cloud too Azure Spring Apps (the new name of this service), keep task name so this task can still be referenced.

Documentation changes required: (Y/N) Y

Added unit tests: (Y/N) N

Attached related issue: (Y/N) N

Checklist:

  • Task version was bumped - please check instruction how to do it
  • Checked that applied changes work as expected

@@ -30,7 +30,7 @@ export class AzureSpringCloudDeploymentProvider {
var azureSpringCloudResourceId: string;
if (this.taskParameters.AzureSpringCloud.startsWith('/')) {
if (this.taskParameters.AzureSpringCloud.includes('..')){{
throw Error(tl.loc('InvalidAzureSpringCloudResourceId', 'this.taskParameters.AzureSpringCloud'));
throw Error(tl.loc('InvalidAzureSpringAppsResourceId', 'this.taskParameters.AzureSpringCloud'));
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to change "this.taskParameters.AzureSpringCloud"?

@@ -2,7 +2,7 @@ import { Package, PackageType } from 'azure-pipelines-tasks-webdeployment-common

export class Inputs {
public static readonly connectedServiceName = 'ConnectedServiceName';
public static readonly azureSpringCloud = 'AzureSpringCloud';
public static readonly azureSpringCloud = 'AzureSpringApps';
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If won't introduce breaking, how about change this param name "azureSpringCloud" as well?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this could introduce breaking, I will change it back.

@@ -468,7 +468,7 @@
"xmldom": "^0.1.27"
}
},
"node_modules/azure-pipelines-tasks-webdeployment-common-v4/node_modules/@types/mocha": {
"node_modules/azure-pipelines-tasks-webdeployment-common/node_modules/@types/mocha": {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just double confirm: it is by design to drop the "v4" instead of make it "v5", right?

Copy link
Member Author

@yitaopan yitaopan Jan 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There might be some conflict with master branch, let me double check.

@@ -246,6 +246,10 @@ export class AzureSpringCloud {
throw ToError(response);
}
provisioningState = response.body.properties.provisioningState;
if (provisioningState == "Failed"){
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch.

@@ -2,7 +2,7 @@
import tl = require('azure-pipelines-task-lib/task');
import { TaskParameters, TaskParametersUtility } from './operations/taskparameters';

import { AzureSpringCloudDeploymentProvider } from './deploymentProvider/AzureSpringCloudDeploymentProvider'
import { AzureSpringAppsDeploymentProvider } from './deploymentProvider/AzureSpringCloudDeploymentProvider'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we able to change "AzureSpringCloudDeploymentProvider"? Probably need to renam the file .

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, will do, I was about to check with you whether this is needed.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, good to know that.

@bowen5
Copy link

bowen5 commented Jan 5, 2023

LGTM.

@mmrazik
Copy link
Collaborator

mmrazik commented Apr 3, 2023

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 4 pipeline(s).

@bowen5
Copy link

bowen5 commented Apr 6, 2023

@kirill-ivlev @vmapetr @mmrazik can any of you help to merge? Thanks.

@KonstantinTyukalov
Copy link
Contributor

@bowen5 please, resolve PR conflicts.
Also, it seems you have some issues with dependencies files:
https://dev.azure.com/mseng/PipelineTools/_build/results?buildId=19626785&view=logs&j=55b94f1c-9d32-5114-bc90-83768ebbe0df&t=8334df59-c1ae-533d-4d46-13427016ffd1&l=18

> git diff --name-only /home/vsts/work/1/s/Tasks/AzureSpringCloudV0
Tasks/AzureSpringCloudV0/Tests/package-lock.json
Tasks/AzureSpringCloudV0/package-lock.json

Uncommitted changes found:

 - Tasks/AzureSpringCloudV0/Tests/package-lock.json

 - Tasks/AzureSpringCloudV0/package-lock.json


Please build your tasks locally and commit specified changes:

 - Tasks/AzureSpringCloudV0/Tests/package-lock.json
 - Tasks/AzureSpringCloudV0/package-lock.json

Make sure you are using Node 10 and NPM 6. For more details check our contribution guide - ***/blob/master/docs/contribute.md

@yitaopan
Copy link
Member Author

@KonstantinTyukalov Hi, thanks, I have merged master branch and rebuild the task using Node 10 and NPM 6. Can you please take a look again?

Copy link
Contributor

@KonstantinTyukalov KonstantinTyukalov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but please check few comments and bump task version according to the current sprint

Comment on lines +249 to +252
if (provisioningState == "Failed"){
tl.debug('KPack build failed');
throw ToError(response);
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[Suggestion] These changes aren't seems related to rebranding 😃
Probably, make sense to move it into separate PR, but it's up to you

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, sorry I didn't pointed this out, this would be a small ux improvement I think I could include here.

@@ -25,14 +25,15 @@
"@types/mocha": "8.2.1",
"@types/node": "^10.17.0",
"@types/q": "1.0.7",
"JSONPath": "^0.11.2",
"@xmldom/xmldom": "^0.8.4",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is that possibly dangerous deps update?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be ok (v0.8.4 contains fix for CVE-2022-39353), however the last one for 0.8.x is 0.8.7 (https://github.com/xmldom/xmldom/releases/tag/0.8.7).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I updated the version to 0.8.7 now

@KonstantinTyukalov
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 4 pipeline(s).

@KonstantinTyukalov
Copy link
Contributor

@yitaopan please don't forget to bump the task version, otherwise your changes may be missing until the next task changes.
Once you do, just ping me again and I'll merge this

@yitaopan
Copy link
Member Author

@KonstantinTyukalov I bumped the task version and updated the @xmldom/xmldom to the latest of 0.8.x, can you please take a look again? Thanks

@KonstantinTyukalov
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 4 pipeline(s).

@KonstantinTyukalov
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 4 pipeline(s).

@KonstantinTyukalov KonstantinTyukalov merged commit 29c22dd into microsoft:master Apr 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants