Merge changes from main branch #2234
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…er (#2127) Co-authored-by: Sebastian Wolf <sebastian@tcg-vault.de>
* fix(glob): remove backslash in s3 upload key * fix license
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.3 to 1.15.4. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](follow-redirects/follow-redirects@v1.15.3...v1.15.4) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…/graphql-transformer-core (#2188)
fix(api): download rds layer only if required
chore: Release
- @aws-amplify/amplify-category-api@5.9.4 - @aws-amplify/data-construct@1.5.4 - amplify-category-api-e2e-core@4.4.6 - amplify-category-api-e2e-tests@3.19.3 - amplify-graphql-api-construct-tests@1.2.4 - @aws-amplify/graphql-api-construct@1.5.4 - @aws-amplify/graphql-auth-transformer@3.3.4 - @aws-amplify/graphql-default-value-transformer@2.2.3 - @aws-amplify/graphql-function-transformer@2.1.15 - @aws-amplify/graphql-http-transformer@2.1.15 - @aws-amplify/graphql-index-transformer@2.3.3 - amplify-category-api-graphql-migration-tests@2.4.19 - @aws-amplify/graphql-model-transformer@2.4.3 - @aws-amplify/graphql-maps-to-transformer@3.4.4 - @aws-amplify/graphql-predictions-transformer@2.1.15 - @aws-amplify/graphql-relational-transformer@2.3.4 - @aws-amplify/graphql-schema-generator@0.6.3 - @aws-amplify/graphql-schema-test-library@2.2.19 - @aws-amplify/graphql-searchable-transformer@2.5.0 - @aws-amplify/graphql-sql-transformer@0.2.3 - @aws-amplify/graphql-transformer-core@2.4.3 - @aws-amplify/graphql-transformer-migrator@2.2.16 - @aws-amplify/graphql-transformer-test-utils@0.4.3 - @aws-amplify/graphql-transformer@1.3.8 - @aws-amplify/graphql-schema-validation@0.3.0 - amplify-category-api-util-mock@6.4.8 - graphql-auth-transformer@7.2.74 - graphql-connection-transformer@5.2.72 - graphql-dynamodb-transformer@7.2.72 - graphql-elasticsearch-transformer@5.2.73 - graphql-function-transformer@3.3.63 - graphql-http-transformer@5.2.72 - graphql-key-transformer@3.2.72 - graphql-predictions-transformer@3.2.72 - graphql-transformer-core@8.2.5 - amplify-category-api-graphql-transformers-e2e-tests@8.6.8 - graphql-versioned-transformer@5.2.72
Release API Plugin
- @aws-amplify/amplify-category-api@5.9.5 - @aws-amplify/data-construct@1.5.5 - amplify-category-api-e2e-tests@3.19.4 - amplify-graphql-api-construct-tests@1.2.5 - @aws-amplify/graphql-api-construct@1.5.5 - @aws-amplify/graphql-auth-transformer@3.3.5 - @aws-amplify/graphql-default-value-transformer@2.2.4 - @aws-amplify/graphql-function-transformer@2.1.16 - @aws-amplify/graphql-http-transformer@2.1.16 - @aws-amplify/graphql-index-transformer@2.3.4 - amplify-category-api-graphql-migration-tests@2.4.20 - @aws-amplify/graphql-model-transformer@2.4.4 - @aws-amplify/graphql-maps-to-transformer@3.4.5 - @aws-amplify/graphql-predictions-transformer@2.1.16 - @aws-amplify/graphql-relational-transformer@2.3.5 - @aws-amplify/graphql-schema-generator@0.6.4 - @aws-amplify/graphql-schema-test-library@2.2.20 - @aws-amplify/graphql-searchable-transformer@2.5.1 - @aws-amplify/graphql-sql-transformer@0.2.4 - @aws-amplify/graphql-transformer-core@2.4.4 - @aws-amplify/graphql-transformer-migrator@2.2.17 - @aws-amplify/graphql-transformer-test-utils@0.4.4 - @aws-amplify/graphql-transformer@1.3.9 - amplify-category-api-util-mock@6.4.9 - amplify-category-api-graphql-transformers-e2e-tests@8.6.9
…2186) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.2 to 1.15.4. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](follow-redirects/follow-redirects@v1.15.2...v1.15.4) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
sundersc
previously approved these changes
Jan 31, 2024
AaronZyLee
approved these changes
Jan 31, 2024
palpatim
approved these changes
Feb 2, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Pull in the changes from last 2 releases into the feature branch.
There was only one merge conflict in Auth transformer that was straight forward to resolve.
CDK / CloudFormation Parameters Changed
Issue #, if available
Description of how you validated changes
E2E tests are running
Checklist
yarn testpassesBy submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.