Skip to content

Commit

Permalink
fix(cdk-assets): use same SDK versions as other packages (#121)
Browse files Browse the repository at this point in the history
Fixes dependency resolution warnings when installing toolkit-lib.

```
npm warn ERESOLVE overriding peer dependency
npm warn While resolving: @aws-sdk/lib-storage@3.750.0
npm warn Found: @aws-sdk/client-s3@3.741.0
npm warn node_modules/@aws-sdk/client-s3
npm warn   @aws-sdk/client-s3@"3.741" from @aws-cdk/toolkit-lib@0.1.0
npm warn   node_modules/@aws-cdk/toolkit-lib
npm warn     @aws-cdk/toolkit-lib@"*" from the root project
npm warn   2 more (@aws-sdk/lib-storage, cdk-assets)
npm warn
npm warn Could not resolve dependency:
npm warn peer @aws-sdk/client-s3@"^3.750.0" from @aws-sdk/lib-storage@3.750.0
npm warn node_modules/cdk-assets/node_modules/@aws-sdk/lib-storage
npm warn   @aws-sdk/lib-storage@"^3.750.0" from cdk-assets@3.0.0-rc.144
npm warn   node_modules/cdk-assets
npm warn
npm warn Conflicting peer dependency: @aws-sdk/client-s3@3.750.0
npm warn node_modules/@aws-sdk/client-s3
npm warn   peer @aws-sdk/client-s3@"^3.750.0" from @aws-sdk/lib-storage@3.750.0
npm warn   node_modules/cdk-assets/node_modules/@aws-sdk/lib-storage
npm warn     @aws-sdk/lib-storage@"^3.750.0" from cdk-assets@3.0.0-rc.144
npm warn     node_modules/cdk-assets
```

---
By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache-2.0 license

---------

Signed-off-by: github-actions <github-actions@github.com>
Co-authored-by: github-actions <github-actions@github.com>
  • Loading branch information
mrgrain and github-actions authored Feb 24, 2025
1 parent a23376e commit 298a6c1
Show file tree
Hide file tree
Showing 9 changed files with 199 additions and 6,471 deletions.
2 changes: 2 additions & 0 deletions .projen/deps.json

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

8 changes: 4 additions & 4 deletions .projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ const repoProject = new yarn.Monorepo({
'glob',
'semver',
`@aws-sdk/client-s3@${CLI_SDK_V3_RANGE}`,
'@aws-sdk/credential-providers',
'@aws-sdk/lib-storage',
`@aws-sdk/credential-providers@${CLI_SDK_V3_RANGE}`,
`@aws-sdk/lib-storage@${CLI_SDK_V3_RANGE}`,
],
vscodeWorkspace: true,
vscodeWorkspaceOptions: {
Expand Down Expand Up @@ -558,8 +558,8 @@ const cdkAssets = configureProject(
`@aws-sdk/client-s3@${CLI_SDK_V3_RANGE}`,
`@aws-sdk/client-secrets-manager@${CLI_SDK_V3_RANGE}`,
`@aws-sdk/client-sts@${CLI_SDK_V3_RANGE}`,
'@aws-sdk/credential-providers',
'@aws-sdk/lib-storage',
`@aws-sdk/credential-providers@${CLI_SDK_V3_RANGE}`,
`@aws-sdk/lib-storage@${CLI_SDK_V3_RANGE}`,
'@smithy/config-resolver',
'@smithy/node-config-provider',
],
Expand Down
4 changes: 2 additions & 2 deletions package.json

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

3,278 changes: 93 additions & 3,185 deletions packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES

Large diffs are not rendered by default.

3,278 changes: 93 additions & 3,185 deletions packages/aws-cdk/THIRD_PARTY_LICENSES

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions packages/cdk-assets/.projen/deps.json

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

2 changes: 1 addition & 1 deletion packages/cdk-assets/.projen/tasks.json

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

4 changes: 2 additions & 2 deletions packages/cdk-assets/package.json

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

92 changes: 0 additions & 92 deletions yarn.lock

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

0 comments on commit 298a6c1

Please sign in to comment.