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

chore: update aws-sdk, cdk, typescript dependency, regen yarn.lock #8739

Merged
merged 4 commits into from
Nov 9, 2021
Merged

chore: update aws-sdk, cdk, typescript dependency, regen yarn.lock #8739

merged 4 commits into from
Nov 9, 2021

Conversation

attilah
Copy link
Contributor

@attilah attilah commented Nov 8, 2021

Description of changes

Some major dependencies are out of sync with version numbers this PR fixes it.

  • sync up aws-sdk version and update to latest
  • sync up cdk and update to latest
  • sync up typescript
  • regenerate yarn.lock to purge outdated transitive dependencies

Checklist

  • PR description included
  • yarn test passes
  • Tests are changed or added
  • Relevant documentation is changed or added (and PR referenced)
  • New AWS SDK calls or CloudFormation actions have been added to relevant test and service IAM policies

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

Copy link
Contributor

@cjihrig cjihrig left a comment

Choose a reason for hiding this comment

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

Didn't review the entire yarn.lock file in detail, but the changes LGTM. The SDK and CDK have already published new versions, but I won't block this PR on that.

@@ -27,7 +27,7 @@
},
"dependencies": {
"amplify-velocity-template": "1.4.5",
"aws-sdk": "^2.963.0",
"aws-sdk": "^2.1022.0",
Copy link
Contributor

Choose a reason for hiding this comment

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

It looks like this is already up to 2.1024.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.

oh I update, these changes are from Friday :D

"@aws-cdk/custom-resources": "~1.124.0",
"@aws-cdk/cx-api": "~1.124.0",
"@aws-cdk/region-info": "~1.124.0",
"@aws-cdk/assets": "~1.130.0",
Copy link
Contributor

Choose a reason for hiding this comment

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

It looks like CDK is up to 1.131.0.

Copy link
Contributor

@jhockett jhockett left a comment

Choose a reason for hiding this comment

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

LGTM, except I see some references to the older aws-sdk version in the main yarn.lock file and the older aws-cdk version in graphql-transformers-e2e-tests/resources/jsonServer/yarn.lock.

@codecov-commenter
Copy link

codecov-commenter commented Nov 8, 2021

Codecov Report

Merging #8739 (a743f17) into master (46e1ee6) will decrease coverage by 0.19%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #8739      +/-   ##
==========================================
- Coverage   57.20%   57.01%   -0.20%     
==========================================
  Files         757      757              
  Lines       42243    42935     +692     
  Branches     8659     9558     +899     
==========================================
+ Hits        24166    24479     +313     
+ Misses      17263    16544     -719     
- Partials      814     1912    +1098     
Impacted Files Coverage Δ
...nsformer/src/RelationalDBSchemaTransformerUtils.ts 100.00% <ø> (ø)
...ackages/graphql-transformer-core/src/util/getIn.ts 75.00% <0.00%> (-10.72%) ⬇️
...ify-category-auth/src/utils/getAuthResourceName.js 80.00% <0.00%> (-8.89%) ⬇️
...ages/amplify-graphql-types-generator/src/errors.ts 65.62% <0.00%> (-8.45%) ⬇️
...amplify-cli-core/src/utils/isResourceNameUnique.ts 83.33% <0.00%> (-7.58%) ⬇️
...g/lib/S3AndCloudFront/helpers/configure-Website.js 84.61% <0.00%> (-7.06%) ⬇️
...ages/amplify-storage-simulator/src/server/utils.ts 54.16% <0.00%> (-3.62%) ⬇️
...-utils/awscloudformation/legacy-update-resource.ts 89.28% <0.00%> (-3.31%) ⬇️
...fy-graphql-auth-transformer/src/resolvers/field.ts 70.83% <0.00%> (-3.08%) ⬇️
.../src/service-walkthroughs/placeIndexWalkthrough.ts 79.38% <0.00%> (-3.04%) ⬇️
... and 347 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 46e1ee6...a743f17. Read the comment docs.

"@aws-cdk/core" "1.131.0"
"@aws-cdk/cx-api" "1.131.0"
constructs "^3.3.69"

"@aws-cdk/aws-apigatewayv2@~1.124.0":
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm seeing ~1.124.0 references here and throughout the lockfile

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's because published versions are the same as we've currently in package.json and monorepo seems to be not smart enought with yarn 1.x ? it is pulling in those deps from published npm...

@sachscode sachscode merged commit d8065a8 into aws-amplify:master Nov 9, 2021
ammarkarachi pushed a commit to ammarkarachi/amplify-cli that referenced this pull request Nov 9, 2021
sachscode pushed a commit that referenced this pull request Nov 9, 2021
* Revert "fix(amplify-category-auth): added username attributes to configure sms (#8624)"

This reverts commit adb70b1.

* Revert "Model vnext unit test update (#8749)"

This reverts commit 8a308a8.

* Revert "Revert "feat: version blocking for CLI (#8737)" (#8747)"

This reverts commit 2d5110c.

* Revert "chore: update aws-sdk, cdk, typescript dependency, regen yarn.lock (#8739)"

This reverts commit d8065a8.

* Revert "feat: version blocking for CLI (#8737)"

This reverts commit b92cd32.

* Revert "Remove pipelineFunction references in favor of resolvers (#8729)"

This reverts commit a0295aa.

* Revert "fix: move @model params to root stack and fix ds logical id (#8736)"

This reverts commit df4408c.

* Revert "fix(amplify-provider-awscloudformation): use amplify prompts for warnings (#8731)"

This reverts commit 98840ec.
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.

5 participants