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: merge main to cdkv2 #955

Merged
merged 21 commits into from
Nov 4, 2022
Merged

chore: merge main to cdkv2 #955

merged 21 commits into from
Nov 4, 2022

Conversation

sobolk
Copy link
Member

@sobolk sobolk commented Nov 4, 2022

Description of changes

This merges changes from main to cdkv2.

Conflicts resolved:

  • CHANGELOGS - cdkv2 entries to the top, main entries below
  • package.json files - in favor of cdkv2 branch
  • nested-stack.js - on whitespaces around Lazy.uncachedString. In favor of main to prevent further conflicts.

Issue #, if available

Description of how you validated changes

yarn clean && yarn dev-build && yarn test

E2E tests.

Checklist

  • [ x] PR description included
  • [ x] yarn test passes
  • [ x] 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.

phani-srikar and others added 21 commits October 24, 2022 12:45
 - @aws-amplify/amplify-category-api@4.0.6
 - amplify-category-api-e2e-core@4.0.9
 - amplify-category-api-e2e-tests@3.10.11
 - @aws-amplify/graphql-auth-transformer@1.1.1
 - @aws-amplify/graphql-default-value-transformer@0.7.1
 - @aws-amplify/graphql-function-transformer@0.7.29
 - @aws-amplify/graphql-http-transformer@0.8.29
 - @aws-amplify/graphql-index-transformer@0.14.1
 - @aws-amplify/graphql-maps-to-transformer@1.1.32
 - amplify-category-api-graphql-migration-tests@2.3.16
 - @aws-amplify/graphql-model-transformer@0.16.1
 - @aws-amplify/graphql-predictions-transformer@0.6.29
 - @aws-amplify/graphql-relational-transformer@0.12.1
 - @aws-amplify/graphql-schema-test-library@1.1.15
 - @aws-amplify/graphql-searchable-transformer@0.16.1
 - @aws-amplify/graphql-transformer-core@0.17.13
 - @aws-amplify/graphql-transformer-interfaces@1.14.8
 - @aws-amplify/graphql-transformer-migrator@1.4.8
 - amplify-category-api-migration-tests@5.0.9
 - amplify-category-api-util-mock@5.1.15
 - amplify-category-api-graphql-transformers-e2e-tests@8.3.1
fix: replace deprecated cdk methods
fix: suppress CDK deprecation warnings
Release feat: suppress CDK migration warnings
 - @aws-amplify/amplify-category-api@4.0.7
 - amplify-category-api-e2e-tests@3.10.12
 - @aws-amplify/graphql-auth-transformer@1.1.2
 - @aws-amplify/graphql-default-value-transformer@0.7.2
 - @aws-amplify/graphql-function-transformer@0.7.30
 - @aws-amplify/graphql-http-transformer@0.8.30
 - @aws-amplify/graphql-index-transformer@0.14.2
 - @aws-amplify/graphql-maps-to-transformer@1.1.33
 - amplify-category-api-graphql-migration-tests@2.3.17
 - @aws-amplify/graphql-model-transformer@0.16.2
 - @aws-amplify/graphql-predictions-transformer@0.6.30
 - @aws-amplify/graphql-relational-transformer@0.12.2
 - @aws-amplify/graphql-schema-test-library@1.1.16
 - @aws-amplify/graphql-searchable-transformer@0.16.2
 - @aws-amplify/graphql-transformer-core@0.17.14
 - @aws-amplify/graphql-transformer-migrator@1.4.9
 - amplify-category-api-util-mock@5.1.16
 - amplify-category-api-graphql-transformers-e2e-tests@8.3.2
fix(graphql): protect relational fields when fields rules are restrictive
 - @aws-amplify/amplify-category-api@4.0.8
 - amplify-category-api-e2e-tests@3.10.13
 - @aws-amplify/graphql-auth-transformer@1.1.3
 - @aws-amplify/graphql-maps-to-transformer@1.1.34
 - amplify-category-api-graphql-migration-tests@2.3.18
 - @aws-amplify/graphql-relational-transformer@0.12.3
 - @aws-amplify/graphql-schema-test-library@1.1.17
 - amplify-category-api-util-mock@5.1.17
 - amplify-category-api-graphql-transformers-e2e-tests@8.3.3
@sobolk sobolk requested a review from a team as a code owner November 4, 2022 17:43
@sobolk sobolk merged commit f9d5b36 into cdkv2 Nov 4, 2022
@sobolk sobolk deleted the cdkv2-merge-main branch November 4, 2022 22:08
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.

None yet

6 participants