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.

Sign up for GitHub

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

Jump to bottom

Updating identity v2 beta versions for identity tests and reverting to GA version v1 for samples #15654

Merged
merged 10 commits into from
Jun 11, 2021
Merged

Updating identity v2 beta versions for identity tests and reverting to GA version v1 for samples #15654

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9e5fd4b
samples identity
KarishmaGhiya Jun 9, 2021
778d80b
update identity version
KarishmaGhiya Jun 10, 2021
f1140d8
update version
KarishmaGhiya Jun 10, 2021
09c4904
update identity versions for internal tests
KarishmaGhiya Jun 10, 2021
dc3a500
format
KarishmaGhiya Jun 11, 2021
cf76d8f
fix the dependecyOverrides
KarishmaGhiya Jun 11, 2021
ee6f131
replace tenant id
KarishmaGhiya Jun 11, 2021
a1bb3d7
update identity to beta.4
KarishmaGhiya Jun 11, 2021
dc267e6
Update node recordings
jeremymeng Jun 11, 2021
5f75241
re-gen nodejs recordings
jeremymeng Jun 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions common/config/rush/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions sdk/containerregistry/container-registry/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"devDependencies": {
"@azure/dev-tool": "^1.0.0",
"@azure/eslint-plugin-azure-sdk": "^3.0.0",
"@azure/identity": "^1.1.0",
"@azure/identity": "2.0.0-beta.3",
Copy link
Member

Choose a reason for hiding this comment

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

same question about beta3 vs beta4.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated

"@azure/ms-rest-nodeauth": "^3.0.8",
"@azure/test-utils-recorder": "^1.0.0",
"@microsoft/api-extractor": "7.7.11",
Expand Down Expand Up @@ -132,7 +132,10 @@
"azure-container-registry"
],
"requiredResources": {
"Azure Container Registry": "https://docs.microsoft.com/azure/container-registry/container-registry-get-started-portal"
"Azure Container Registry": "https://docs.microsoft.com/azure/container-registry/container-registry-get-started-portal",
"dependencyOverrides": {
"@azure/identity": "^1.3.0"
}
}
}
}
2 changes: 1 addition & 1 deletion sdk/containerregistry/container-registry/samples/v1/javascript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
"dependencies": {
"@azure/container-registry": "next",
"dotenv": "latest",
"@azure/identity": "^1.1.0"
"@azure/identity": "^1.3.0"
}
}
2 changes: 1 addition & 1 deletion sdk/containerregistry/container-registry/samples/v1/typescript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"dependencies": {
"@azure/container-registry": "next",
"dotenv": "latest",
"@azure/identity": "^1.1.0"
"@azure/identity": "^1.3.0"
},
"devDependencies": {
"typescript": "~4.2.0",
Expand Down
2 changes: 1 addition & 1 deletion sdk/eventhub/event-hubs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
"devDependencies": {
"@azure/dev-tool": "^1.0.0",
"@azure/eslint-plugin-azure-sdk": "^3.0.0",
"@azure/identity": "^1.1.0",
"@azure/identity": "2.0.0-beta.3",
Copy link
Contributor

Choose a reason for hiding this comment

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

Wait, why does event hubs get beta.3 and everyone else gets beta.4? I feel left behind 😄

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Now it should be on par with everyone 🥇

Copy link
Member

Choose a reason for hiding this comment

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

is this intentionally beta.3 vs beta.4?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No I was in the middle of conversation with Daniel when I made this beta.3, then we decided to go with beta.4. Thanks!

"@azure/test-utils-perfstress": "^1.0.0",
"@microsoft/api-extractor": "7.7.11",
"@rollup/plugin-commonjs": "11.0.2",
Expand Down
2 changes: 1 addition & 1 deletion sdk/identity/identity/test/manual-integration/AzureArc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"@azure/identity": "^1.3.0",
"@azure/identity": "2.0.0-beta.4",
"@azure/keyvault-secrets": "^4.1.0",
"typescript": "^4.2.4"
}
Expand Down
2 changes: 1 addition & 1 deletion sdk/identity/identity/test/manual-integration/AzureFunctions/IdentityTest/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"description": "",
"devDependencies": {
"@azure/functions": "1.2.3",
"@azure/identity": "^1.3.0",
"@azure/identity": "2.0.0-beta.4",
"@azure/keyvault-secrets": "^4.1.0",
"npm-run-all": "^4.1.5",
"typescript": "^3.3.3"
Expand Down
2 changes: 1 addition & 1 deletion sdk/identity/identity/test/manual-integration/AzureVM/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"@azure/identity": "1.1.0-preview.2",
"@azure/identity": "2.0.0-beta.4",
"@azure/keyvault-secrets": "^4.0.2"
}
}
2 changes: 1 addition & 1 deletion sdk/identity/identity/test/manual-integration/Cloudshell/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"@azure/identity": "1.1.0-preview.2",
"@azure/identity": "2.0.0-beta.4",
"@azure/keyvault-secrets": "^4.0.2"
}
}
2 changes: 1 addition & 1 deletion sdk/identity/identity/test/manual-integration/Kubernetes/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"dependencies": {
"yargs": "15.1.0",
"@types/yargs": "15.0.3",
"@azure/identity": "1.1.0-preview.2",
"@azure/identity": "2.0.0-beta.4",
"@azure/keyvault-secrets": "^4.0.2"
}
}
2 changes: 1 addition & 1 deletion ...dentity/test/manual-integration/webjobs/App_Data/jobs/triggered/AzureTestJob/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"@azure/identity": "^1.0.2",
"@azure/identity": "2.0.0-beta.4",
"@azure/keyvault-secrets": "^4.0.2",
"tslib": "^1.10.0"
}
Expand Down
2 changes: 1 addition & 1 deletion sdk/identity/identity/test/manual/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"author": "Microsoft Corporation",
"license": "MIT",
"dependencies": {
"@azure/identity": "2.0.0-beta.3",
"@azure/identity": "2.0.0-beta.4",
"@azure/service-bus": "^7.0.3",
"react": "^16.8.6",
"react-dom": "^16.8.6",
Expand Down
3 changes: 3 additions & 0 deletions sdk/servicebus/service-bus/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@
"requiredResources": {
"Azure Service Bus": "https://docs.microsoft.com/azure/service-bus-messaging"
},
"dependencyOverrides": {
Copy link
Contributor

Choose a reason for hiding this comment

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

In Container Registry the dependencyOverrides was under requiredResources while here the two are siblings...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes they should be siblings. I updated container registry package.json.

Copy link
Contributor

Choose a reason for hiding this comment

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

Does this just override the rush config? I'm curious why service-bus needs it but not event hubs.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is for the serviceBus samples though

"@azure/identity": "^1.1.0"
Copy link
Member

Choose a reason for hiding this comment

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

why not using ^1.3.0?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is what the service-bus samples originally supported - ^1.1.0. Didn't want to change that, unless package owner wants to. ^1.1.0 means it will support all versions from 1.1.0 to the latest (1.3.0)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

https://github.com/Azure/azure-sdk-for-js/pull/15632/files

},
"skip": [
"receiveMessagesLoop.js",
"receiveMessagesStreaming.js",
Expand Down
2 changes: 1 addition & 1 deletion sdk/servicebus/service-bus/samples/v7/javascript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"dotenv": "latest",
"ws": "^7.1.1",
"https-proxy-agent": "^5.0.0",
"@azure/identity": "2.0.0-beta.3",
"@azure/identity": "^1.1.0",
"@azure/abort-controller": "^1.0.0"
}
}
2 changes: 1 addition & 1 deletion sdk/servicebus/service-bus/samples/v7/typescript/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"dotenv": "latest",
"ws": "^7.1.1",
"https-proxy-agent": "^5.0.0",
"@azure/identity": "2.0.0-beta.3",
"@azure/identity": "^1.1.0",
"@azure/abort-controller": "^1.0.0"
},
"devDependencies": {
Expand Down