Skip to content

Conversation

@dpilch
Copy link
Contributor

@dpilch dpilch commented Aug 2, 2024

Description of changes

Merge main to migration

Conflicts:

  • packages/amplify-graphql-api-construct/.jsii - regenerate to resolve
  • yarn.lock - regenerate to resolve
  • packages/amplify-graphql-api-construct-tests/package.json - add new dep @aws-sdk/client-dynamodb and set to latest version
  • packages/amplify-graphql-model-transformer/src/resources/amplify-dynamodb-table/amplify-table-manager-lambda/amplify-table-manager-handler.ts - conflict on imports. Kept both changes.

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

sundersc and others added 18 commits July 24, 2024 12:10
* fix(amplify-category-api): add gen2 tags to dynamodb tables

* fix(amplify-category-api): lint fix

* fix(amplify-category-api): update flow and e2e test

* fix(amplify-category-api): fix unit tests

* fix(amplify-category-api): wait for table status

* fix(amplify-category-api): missing custom tags

* fix(amplify-category-api): compare tags for updated values

* test: update test tags to show original vs updated

* fix: allow to remove all tags

* test: add test for tags on table replace

* fix(amplify-category-api): support delete all tags

* fix(amplify-category-api): fix unit tests

* fix(amplify-category-api): handle removing some of the tags

---------

Co-authored-by: Dane Pilcher <[email protected]>
* chore: update .jsii assembly

* chore: update .jsii assembly

* fix: add tags to dynamodb tables (#2694)

* fix(amplify-category-api): add gen2 tags to dynamodb tables

* fix(amplify-category-api): lint fix

* fix(amplify-category-api): update flow and e2e test

* fix(amplify-category-api): fix unit tests

* fix(amplify-category-api): wait for table status

* fix(amplify-category-api): missing custom tags

* fix(amplify-category-api): compare tags for updated values

* test: update test tags to show original vs updated

* fix: allow to remove all tags

* test: add test for tags on table replace

* fix(amplify-category-api): support delete all tags

* fix(amplify-category-api): fix unit tests

* fix(amplify-category-api): handle removing some of the tags

---------

Co-authored-by: Dane Pilcher <[email protected]>

---------

Co-authored-by: amplify-data-ci <[email protected]>
Co-authored-by: Christopher Sundersingh <[email protected]>
Co-authored-by: Dane Pilcher <[email protected]>
Bumps [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser) from 4.4.0 to 4.4.1.
- [Release notes](https://github.com/NaturalIntelligence/fast-xml-parser/releases)
- [Changelog](https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/CHANGELOG.md)
- [Commits](NaturalIntelligence/fast-xml-parser@v4.4.0...v4.4.1)

---
updated-dependencies:
- dependency-name: fast-xml-parser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dpilch dpilch requested a review from a team as a code owner August 2, 2024 19:32
@dpilch dpilch marked this pull request as draft August 8, 2024 19:32
@dpilch dpilch force-pushed the merge-main-to-migration branch from 4f7acba to 9ea454d Compare August 9, 2024 14:18
@dpilch dpilch force-pushed the merge-main-to-migration branch from 9ea454d to b1d350c Compare August 9, 2024 14:19
@dpilch dpilch marked this pull request as ready for review August 9, 2024 14:57
@dpilch dpilch requested a review from a team as a code owner August 9, 2024 14:57
@dpilch dpilch enabled auto-merge August 9, 2024 14:58
@dpilch dpilch merged commit 86fe20a into feature/gen2-migration Aug 9, 2024
@dpilch dpilch deleted the merge-main-to-migration branch August 9, 2024 16:54
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.

7 participants