From 9b41435541f4554cebc7a5267d6c88748ab3f34f Mon Sep 17 00:00:00 2001 From: bobbyu99 Date: Mon, 23 Dec 2024 14:17:28 -0800 Subject: [PATCH] Release PR (#3093) * chore: update .jsii assembly * chore: update .jsii assembly * ci: remove unused codeql config (#3079) * docs: update readme for gen 2 (#3080) * chore(deps-dev): bump jsii from 5.6.0 to 5.6.4 (#3082) * chore(deps-dev): bump jsii from 5.6.0 to 5.6.4 Bumps [jsii](https://github.com/aws/jsii-compiler) from 5.6.0 to 5.6.4. - [Release notes](https://github.com/aws/jsii-compiler/releases) - [Changelog](https://github.com/aws/jsii-compiler/blob/main/releases.json) - [Commits](https://github.com/aws/jsii-compiler/compare/v5.6.0...v5.6.4) --- updated-dependencies: - dependency-name: jsii dependency-type: direct:development ... Signed-off-by: dependabot[bot] * chore: regenerate .jsii Signed-off-by: Kevin Shan --------- Signed-off-by: dependabot[bot] Signed-off-by: Kevin Shan Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kevin Shan * chore: remove `@aws-cdk/assert` from `data-construct`, `api-construct`, and `transformer-core` (#3089) * chore: remove @aws-cdk/assert dep * chore: updated dependency licenses * chore: removed `@aws-cdk/assert` dep from root `package.json` * chore: remove `cfnspec` and `cloudformation` deps * chore: suppress reexport and type-only files from coverage metrics in @aws-amplify/graphql-category-api (#3087) * fix: remove transitive dev dependencies from bundled jsii constructs (#3092) * remove transitive dev dependencies from jsii constructs * update jsii * update yarn.lock * update dep licenses --------- Signed-off-by: dependabot[bot] Signed-off-by: Kevin Shan Co-authored-by: amplify-data-ci Co-authored-by: Dane Pilcher Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kevin Shan Co-authored-by: Tim Schmelter Co-authored-by: Ian Saultz <52051793+atierian@users.noreply.github.com> --- .github/codeql/codeql-config.yml | 3 +- Readme.md | 70 +-- dependency_licenses.txt | 458 ------------------ package.json | 50 -- packages/amplify-data-construct/.jsii | 71 +-- packages/amplify-data-construct/package.json | 50 -- packages/amplify-graphql-api-construct/.jsii | 69 +-- .../jest.config.js | 7 - .../package.json | 50 -- .../src/__tests__/index-import.test.ts | 6 +- .../src/index.ts | 33 ++ .../src/types.ts | 100 ++++ .../package.json | 1 - yarn.lock | 104 ++-- 14 files changed, 243 insertions(+), 829 deletions(-) diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml index ec0304ed90..c1af0f00c0 100644 --- a/.github/codeql/codeql-config.yml +++ b/.github/codeql/codeql-config.yml @@ -1,2 +1 @@ -paths-ignore: - - packages/amplify-category-api/resources/awscloudformation/container-templates/**/*.js +name: 'CodeQL config' diff --git a/Readme.md b/Readme.md index a918bcb01f..d6df3385cf 100644 --- a/Readme.md +++ b/Readme.md @@ -6,9 +6,6 @@ Discord Chat - - - build:started @@ -18,74 +15,45 @@ [![Open Bugs](https://img.shields.io/github/issues/aws-amplify/amplify-category-api/bug?color=d73a4a&label=bugs)](https://github.com/aws-amplify/amplify-category-api/issues?q=is%3Aissue+is%3Aopen+label%3Abug) [![Feature Requests](https://img.shields.io/github/issues/aws-amplify/amplify-category-api/feature-request?color=ff9001&label=feature%20requests)](https://github.com/aws-amplify/amplify-category-api/issues?q=is%3Aissue+label%3Afeature-request+is%3Aopen) -[![Enhancements](https://img.shields.io/github/issues/aws-amplify/amplify-category-api/enhancement?color=4287f5&label=enhancement)](https://github.com/aws-amplify/amplify-category-api/issues?q=is%3Aissue+is%3Aopen+label%3Aenhancement) [![Closed Issues](https://img.shields.io/github/issues-closed/aws-amplify/amplify-category-api?color=%2325CC00&label=issues%20closed)](https://github.com/aws-amplify/amplify-category-api/issues?q=is%3Aissue+is%3Aclosed+) -# AWS Amplify API Category - -The AWS Amplify CLI is a toolchain which includes a robust feature set for simplifying mobile and web application development. The CLI uses AWS CloudFormation and nested stacks to allow you to add or modify configurations locally before you push them for execution in your account. - -- [Install the CLI](#install-the-cli) -- [Tutorials](#tutorials) -- [Contributing](#contributing) -- [Changelog](https://github.com/aws-amplify/amplify-category-api/releases/latest) - -This repo manages the API category within Amplify CLI. The Category is responsible for managing graphql build and transformation processes, generating resources to deploy into your cloud stack in order to compute and store data for your graphql and REST endpoints, and providing inputs to codegen processes for use later in your end application. +# AWS Amplify Gen 2 Data -## Install the CLI +This next generation of Amplify’s backend building experience lets you author your frontend and backend definition completely with TypeScript, a file convention, and Git branch-based environments. To learn more, visit [AWS Amplify Gen 2](https://docs.amplify.aws). -- Requires Node.js® version 18 or later +This repo manages the data within Amplify. Data is responsible for managing graphql build and transformation processes, generating resources to deploy into your cloud stack in order to compute and store data for your graphql and REST endpoints, and providing inputs to codegen processes for use later in your end application. -Install and configure the Amplify CLI as follows: - -```bash -$ npm install -g @aws-amplify/cli -$ amplify configure -``` +## Quickstart -**_Note_**: If you're having permission issues on your system installing the CLI, please try the following command: +To get started with Amplify Gen 2, visit [AWS Amplify Gen 2 Quickstart](https://docs.amplify.aws/react/start). ```bash -$ sudo npm install -g @aws-amplify/cli --unsafe-perm=true -$ amplify configure +npm create amplify@latest ``` -### Category specific commands: - -The following table lists the current set of commands supported by the Amplify API Category Plugin. - -| Command | Description | -| ---------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- | -| amplify api add | Takes you through steps in the CLI to add an API resource to your backend. | -| amplify api add-graphql-datasource | Takes you through the steps in the CLI to import an already existing Aurora Serverless data source to an existing GraphQL API resource. | -| amplify api update | Takes you through steps in the CLI to update an API resource. | -| amplify api gql-compile | Compiles your GraphQL schema and generates a corresponding cloudformation template. | -| amplify api push | Provisions only API cloud resources with the latest local developments. | -| amplify api remove | Removes an API resource from your local backend. The resource is removed from the cloud on the next push command. | - ## Tutorials - [Getting Started guide](https://docs.amplify.aws/start) -- [GraphQL transform tutorial](https://docs.amplify.aws/cli/graphql-transformer/overview) +- [Setup data](https://docs.amplify.aws/react/build-a-backend/data/set-up-data/) -## Developing +## Security -To set up your local development environment, go to [Local Environment Setup](https://github.com/aws-amplify/amplify-category-api/blob/main/CONTRIBUTING.md#local-environment-setup). +If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public GitHub issue. -To test your category, do the following: +## Code of Conduct -```sh -cd -amplify-dev init -amplify-dev -``` +This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct). +For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact +opensource-codeofconduct@amazon.com with any additional questions or comments. -Before pushing code or sending a pull request, do the following: +## Community -- At the command line, run `yarn lint` at the top-level directory. This invokes eslint to check for lint errors in all of our packages. -- You can use `yarn lint` to find some of the lint errors. To attempt fix them, go to the package that has errors and run `yarn lint-fix` -- If there are any remaining lint errors, resolve them manually. Linting your code is a best practice that ensures good code quality so it's important that you don't skip this step. +Join the [Discord Server](https://discord.com/invite/amplify). ## Contributing We are thankful for any contributions from the community. Look at our [Contribution Guidelines](https://github.com/aws-amplify/amplify-category-api/blob/main/CONTRIBUTING.md). + +## License + +This project is licensed under the Apache-2.0 License. diff --git a/dependency_licenses.txt b/dependency_licenses.txt index e3c7a1fcfa..8a1d9be43f 100644 --- a/dependency_licenses.txt +++ b/dependency_licenses.txt @@ -824,218 +824,6 @@ limitations under the License. ----- -The following software may be included in this product: @aws-cdk/assert, @aws-cdk/cloudformation-diff. A copy of the source code may be downloaded from https://github.com/aws/aws-cdk.git (@aws-cdk/assert), https://github.com/aws/aws-cdk.git (@aws-cdk/cloudformation-diff). This software contains the following license and notice below: - -Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - -NOTICE - -AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved. - ------ - The following software may be included in this product: @aws-cdk/asset-awscli-v1, @aws-cdk/asset-kubectl-v20, @aws-cdk/asset-node-proxy-agent-v6, jsii, jsii-rosetta. A copy of the source code may be downloaded from https://github.com/cdklabs/awscdk-asset-awscli.git (@aws-cdk/asset-awscli-v1), https://github.com/cdklabs/awscdk-asset-kubectl.git (@aws-cdk/asset-kubectl-v20), https://github.com/cdklabs/awscdk-asset-node-proxy-agent.git (@aws-cdk/asset-node-proxy-agent-v6), https://github.com/aws/jsii-compiler.git (jsii), https://github.com/aws/jsii-rosetta.git (jsii-rosetta). This software contains the following license and notice below: Apache License @@ -1459,218 +1247,6 @@ Copyright 2018-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. ----- -The following software may be included in this product: @aws-cdk/cfnspec. A copy of the source code may be downloaded from https://github.com/aws/aws-cdk.git. This software contains the following license and notice below: - -Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2018-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - -NOTICE - -AWS Cloud Development Kit (AWS CDK) -Copyright 2018-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. - ------ - The following software may be included in this product: @aws-cdk/cloud-assembly-schema. A copy of the source code may be downloaded from https://github.com/cdklabs/cloud-assembly-schema.git. This software contains the following license and notice below: Apache License @@ -14327,40 +13903,6 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ----- -The following software may be included in this product: diff. A copy of the source code may be downloaded from git://github.com/kpdecker/jsdiff.git. This software contains the following license and notice below: - -BSD 3-Clause License - -Copyright (c) 2009-2015, Kevin Decker -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ------ - The following software may be included in this product: doctrine. A copy of the source code may be downloaded from https://github.com/eslint/doctrine.git. This software contains the following license and notice below: Apache License diff --git a/package.json b/package.json index 3d0cd53a9f..de1d1541f1 100755 --- a/package.json +++ b/package.json @@ -129,9 +129,6 @@ "@aws-amplify/data-construct/@aws-amplify/graphql-transformer-interfaces", "@aws-amplify/data-construct/@aws-amplify/platform-core", "@aws-amplify/data-construct/@aws-amplify/plugin-types", - "@aws-amplify/data-construct/@aws-cdk/assert", - "@aws-amplify/data-construct/@aws-cdk/cfnspec", - "@aws-amplify/data-construct/@aws-cdk/cloudformation-diff", "@aws-amplify/data-construct/@aws-crypto/crc32", "@aws-amplify/data-construct/@aws-crypto/sha256-browser", "@aws-amplify/data-construct/@aws-crypto/sha256-js", @@ -204,51 +201,29 @@ "@aws-amplify/data-construct/@smithy/util-stream", "@aws-amplify/data-construct/@smithy/util-uri-escape", "@aws-amplify/data-construct/@smithy/util-utf8", - "@aws-amplify/data-construct/ajv", - "@aws-amplify/data-construct/ansi-regex", - "@aws-amplify/data-construct/ansi-styles", - "@aws-amplify/data-construct/astral-regex", - "@aws-amplify/data-construct/at-least-node", "@aws-amplify/data-construct/bowser", - "@aws-amplify/data-construct/chalk", "@aws-amplify/data-construct/charenc", "@aws-amplify/data-construct/ci-info", - "@aws-amplify/data-construct/color-convert", - "@aws-amplify/data-construct/color-name", "@aws-amplify/data-construct/crypt", - "@aws-amplify/data-construct/diff", - "@aws-amplify/data-construct/emoji-regex", - "@aws-amplify/data-construct/fast-deep-equal", - "@aws-amplify/data-construct/fast-uri", "@aws-amplify/data-construct/fast-xml-parser", "@aws-amplify/data-construct/fs-extra", "@aws-amplify/data-construct/graceful-fs", "@aws-amplify/data-construct/graphql", "@aws-amplify/data-construct/graphql-mapping-template", "@aws-amplify/data-construct/graphql-transformer-common", - "@aws-amplify/data-construct/has-flag", "@aws-amplify/data-construct/hjson", "@aws-amplify/data-construct/immer", "@aws-amplify/data-construct/is-buffer", "@aws-amplify/data-construct/is-ci", - "@aws-amplify/data-construct/is-fullwidth-code-point", - "@aws-amplify/data-construct/json-schema-traverse", "@aws-amplify/data-construct/jsonfile", "@aws-amplify/data-construct/libphonenumber-js", "@aws-amplify/data-construct/lodash", "@aws-amplify/data-construct/lodash.mergewith", - "@aws-amplify/data-construct/lodash.truncate", "@aws-amplify/data-construct/md5", "@aws-amplify/data-construct/object-hash", "@aws-amplify/data-construct/pluralize", - "@aws-amplify/data-construct/require-from-string", "@aws-amplify/data-construct/semver", - "@aws-amplify/data-construct/slice-ansi", - "@aws-amplify/data-construct/string-width", - "@aws-amplify/data-construct/strip-ansi", "@aws-amplify/data-construct/strnum", - "@aws-amplify/data-construct/supports-color", - "@aws-amplify/data-construct/table", "@aws-amplify/data-construct/ts-dedent", "@aws-amplify/data-construct/tslib", "@aws-amplify/data-construct/universalify", @@ -276,9 +251,6 @@ "@aws-amplify/graphql-api-construct/@aws-amplify/graphql-transformer-interfaces", "@aws-amplify/graphql-api-construct/@aws-amplify/platform-core", "@aws-amplify/graphql-api-construct/@aws-amplify/plugin-types", - "@aws-amplify/graphql-api-construct/@aws-cdk/assert", - "@aws-amplify/graphql-api-construct/@aws-cdk/cfnspec", - "@aws-amplify/graphql-api-construct/@aws-cdk/cloudformation-diff", "@aws-amplify/graphql-api-construct/@aws-crypto/crc32", "@aws-amplify/graphql-api-construct/@aws-crypto/sha256-browser", "@aws-amplify/graphql-api-construct/@aws-crypto/sha256-js", @@ -351,51 +323,29 @@ "@aws-amplify/graphql-api-construct/@smithy/util-stream", "@aws-amplify/graphql-api-construct/@smithy/util-uri-escape", "@aws-amplify/graphql-api-construct/@smithy/util-utf8", - "@aws-amplify/graphql-api-construct/ajv", - "@aws-amplify/graphql-api-construct/ansi-regex", - "@aws-amplify/graphql-api-construct/ansi-styles", - "@aws-amplify/graphql-api-construct/astral-regex", - "@aws-amplify/graphql-api-construct/at-least-node", "@aws-amplify/graphql-api-construct/bowser", - "@aws-amplify/graphql-api-construct/chalk", "@aws-amplify/graphql-api-construct/charenc", "@aws-amplify/graphql-api-construct/ci-info", - "@aws-amplify/graphql-api-construct/color-convert", - "@aws-amplify/graphql-api-construct/color-name", "@aws-amplify/graphql-api-construct/crypt", - "@aws-amplify/graphql-api-construct/diff", - "@aws-amplify/graphql-api-construct/emoji-regex", - "@aws-amplify/graphql-api-construct/fast-deep-equal", - "@aws-amplify/graphql-api-construct/fast-uri", "@aws-amplify/graphql-api-construct/fast-xml-parser", "@aws-amplify/graphql-api-construct/fs-extra", "@aws-amplify/graphql-api-construct/graceful-fs", "@aws-amplify/graphql-api-construct/graphql", "@aws-amplify/graphql-api-construct/graphql-mapping-template", "@aws-amplify/graphql-api-construct/graphql-transformer-common", - "@aws-amplify/graphql-api-construct/has-flag", "@aws-amplify/graphql-api-construct/hjson", "@aws-amplify/graphql-api-construct/immer", "@aws-amplify/graphql-api-construct/is-buffer", "@aws-amplify/graphql-api-construct/is-ci", - "@aws-amplify/graphql-api-construct/is-fullwidth-code-point", - "@aws-amplify/graphql-api-construct/json-schema-traverse", "@aws-amplify/graphql-api-construct/jsonfile", "@aws-amplify/graphql-api-construct/libphonenumber-js", "@aws-amplify/graphql-api-construct/lodash", "@aws-amplify/graphql-api-construct/lodash.mergewith", - "@aws-amplify/graphql-api-construct/lodash.truncate", "@aws-amplify/graphql-api-construct/md5", "@aws-amplify/graphql-api-construct/object-hash", "@aws-amplify/graphql-api-construct/pluralize", - "@aws-amplify/graphql-api-construct/require-from-string", "@aws-amplify/graphql-api-construct/semver", - "@aws-amplify/graphql-api-construct/slice-ansi", - "@aws-amplify/graphql-api-construct/string-width", - "@aws-amplify/graphql-api-construct/strip-ansi", "@aws-amplify/graphql-api-construct/strnum", - "@aws-amplify/graphql-api-construct/supports-color", - "@aws-amplify/graphql-api-construct/table", "@aws-amplify/graphql-api-construct/ts-dedent", "@aws-amplify/graphql-api-construct/tslib", "@aws-amplify/graphql-api-construct/universalify", diff --git a/packages/amplify-data-construct/.jsii b/packages/amplify-data-construct/.jsii index 0b081325ce..8675eebd90 100644 --- a/packages/amplify-data-construct/.jsii +++ b/packages/amplify-data-construct/.jsii @@ -9,28 +9,25 @@ "@aws-amplify/ai-constructs": "^1.0.0", "@aws-amplify/backend-output-schemas": "^1.0.0", "@aws-amplify/backend-output-storage": "^1.0.0", - "@aws-amplify/graphql-auth-transformer": "4.1.7", - "@aws-amplify/graphql-conversation-transformer": "1.1.2", - "@aws-amplify/graphql-default-value-transformer": "3.1.4", - "@aws-amplify/graphql-directives": "2.6.0", - "@aws-amplify/graphql-function-transformer": "3.1.6", - "@aws-amplify/graphql-generation-transformer": "1.1.0", - "@aws-amplify/graphql-http-transformer": "3.0.9", - "@aws-amplify/graphql-index-transformer": "3.0.9", - "@aws-amplify/graphql-maps-to-transformer": "4.0.9", - "@aws-amplify/graphql-model-transformer": "3.1.1", - "@aws-amplify/graphql-predictions-transformer": "3.0.9", - "@aws-amplify/graphql-relational-transformer": "3.1.1", - "@aws-amplify/graphql-searchable-transformer": "3.0.9", - "@aws-amplify/graphql-sql-transformer": "0.4.9", - "@aws-amplify/graphql-transformer": "2.2.2", - "@aws-amplify/graphql-transformer-core": "3.3.1", - "@aws-amplify/graphql-transformer-interfaces": "4.2.0", + "@aws-amplify/graphql-auth-transformer": "4.1.8", + "@aws-amplify/graphql-conversation-transformer": "1.1.3", + "@aws-amplify/graphql-default-value-transformer": "3.1.5", + "@aws-amplify/graphql-directives": "2.6.1", + "@aws-amplify/graphql-function-transformer": "3.1.7", + "@aws-amplify/graphql-generation-transformer": "1.1.1", + "@aws-amplify/graphql-http-transformer": "3.0.10", + "@aws-amplify/graphql-index-transformer": "3.0.10", + "@aws-amplify/graphql-maps-to-transformer": "4.0.10", + "@aws-amplify/graphql-model-transformer": "3.1.2", + "@aws-amplify/graphql-predictions-transformer": "3.0.10", + "@aws-amplify/graphql-relational-transformer": "3.1.2", + "@aws-amplify/graphql-searchable-transformer": "3.0.10", + "@aws-amplify/graphql-sql-transformer": "0.4.10", + "@aws-amplify/graphql-transformer": "2.2.3", + "@aws-amplify/graphql-transformer-core": "3.3.2", + "@aws-amplify/graphql-transformer-interfaces": "4.2.1", "@aws-amplify/platform-core": "^1.0.0", "@aws-amplify/plugin-types": "^1.0.0", - "@aws-cdk/assert": "^2.68.0", - "@aws-cdk/cfnspec": "2.68.0", - "@aws-cdk/cloudformation-diff": "2.68.0", "@aws-crypto/crc32": "5.2.0", "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "^5.2.0", @@ -103,51 +100,29 @@ "@smithy/util-stream": "^3.1.3", "@smithy/util-uri-escape": "^3.0.0", "@smithy/util-utf8": "^3.0.0", - "ajv": "^8.0.1", - "ansi-regex": "^5.0.1", - "ansi-styles": "^4.1.0", - "astral-regex": "^2.0.0", - "at-least-node": "^1.0.0", "bowser": "^2.11.0", - "chalk": "^4", "charenc": "^0.0.2", "ci-info": "^3.2.0", - "color-convert": "^2.0.1", - "color-name": "~1.1.4", "crypt": "^0.0.2", - "diff": "^5.1.0", - "emoji-regex": "^8.0.0", - "fast-deep-equal": "^3.1.3", - "fast-uri": "^3.0.1", "fast-xml-parser": "4.4.1", "fs-extra": "^8.1.0", "graceful-fs": "^4.2.0", "graphql": "^15.5.0", - "graphql-mapping-template": "5.0.1", - "graphql-transformer-common": "5.1.1", - "has-flag": "^4.0.0", + "graphql-mapping-template": "5.0.2", + "graphql-transformer-common": "5.1.2", "hjson": "^3.2.2", "immer": "^9.0.12", "is-buffer": "~1.1.6", "is-ci": "^3.0.1", - "is-fullwidth-code-point": "^3.0.0", - "json-schema-traverse": "^1.0.0", "jsonfile": "^4.0.0", "libphonenumber-js": "1.9.47", "lodash": "^4.17.21", "lodash.mergewith": "^4.6.2", - "lodash.truncate": "^4.4.2", "md5": "^2.2.1", "object-hash": "^3.0.0", "pluralize": "8.0.0", - "require-from-string": "^2.0.2", "semver": "^7.6.3", - "slice-ansi": "^4.0.0", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", "strnum": "^1.0.5", - "supports-color": "^7.1.0", - "table": "^6.8.1", "ts-dedent": "^2.0.0", "tslib": "^2.6.2", "universalify": "^0.1.0", @@ -155,7 +130,7 @@ "zod": "^3.22.2" }, "dependencies": { - "@aws-amplify/graphql-api-construct": "1.18.2", + "@aws-amplify/graphql-api-construct": "1.18.3", "aws-cdk-lib": "^2.168.0", "constructs": "^10.3.0" }, @@ -4055,7 +4030,7 @@ "stability": "stable" }, "homepage": "https://github.com/aws-amplify/amplify-category-api.git", - "jsiiVersion": "5.6.0 (build 7be6ace)", + "jsiiVersion": "5.6.4 (build a446c6c)", "keywords": [ "awscdk", "aws-cdk", @@ -4090,6 +4065,6 @@ } }, "types": {}, - "version": "1.14.2", - "fingerprint": "APjytkZM54Hm1aMlPGMXzuoTZBDCo4V2Abg4rDYBE1A=" + "version": "1.14.3", + "fingerprint": "UQiK5GuQIpq7OG8vglMhaPd/82OaQqVaKTmhDoui4ZM=" } \ No newline at end of file diff --git a/packages/amplify-data-construct/package.json b/packages/amplify-data-construct/package.json index 5695ae7039..af9dfc4f83 100644 --- a/packages/amplify-data-construct/package.json +++ b/packages/amplify-data-construct/package.json @@ -55,9 +55,6 @@ "@aws-amplify/graphql-transformer-interfaces", "@aws-amplify/platform-core", "@aws-amplify/plugin-types", - "@aws-cdk/assert", - "@aws-cdk/cfnspec", - "@aws-cdk/cloudformation-diff", "@aws-crypto/crc32", "@aws-crypto/sha256-browser", "@aws-crypto/sha256-js", @@ -130,51 +127,29 @@ "@smithy/util-stream", "@smithy/util-uri-escape", "@smithy/util-utf8", - "ajv", - "ansi-regex", - "ansi-styles", - "astral-regex", - "at-least-node", "bowser", - "chalk", "charenc", "ci-info", - "color-convert", - "color-name", "crypt", - "diff", - "emoji-regex", - "fast-deep-equal", - "fast-uri", "fast-xml-parser", "fs-extra", "graceful-fs", "graphql", "graphql-mapping-template", "graphql-transformer-common", - "has-flag", "hjson", "immer", "is-buffer", "is-ci", - "is-fullwidth-code-point", - "json-schema-traverse", "jsonfile", "libphonenumber-js", "lodash", "lodash.mergewith", - "lodash.truncate", "md5", "object-hash", "pluralize", - "require-from-string", "semver", - "slice-ansi", - "string-width", - "strip-ansi", "strnum", - "supports-color", - "table", "ts-dedent", "tslib", "universalify", @@ -205,9 +180,6 @@ "@aws-amplify/graphql-transformer-interfaces": "4.2.1", "@aws-amplify/platform-core": "^1.0.0", "@aws-amplify/plugin-types": "^1.0.0", - "@aws-cdk/assert": "^2.68.0", - "@aws-cdk/cfnspec": "2.68.0", - "@aws-cdk/cloudformation-diff": "2.68.0", "@aws-crypto/crc32": "5.2.0", "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "^5.2.0", @@ -280,51 +252,29 @@ "@smithy/util-stream": "^3.1.3", "@smithy/util-uri-escape": "^3.0.0", "@smithy/util-utf8": "^3.0.0", - "ajv": "^8.0.1", - "ansi-regex": "^5.0.1", - "ansi-styles": "^4.1.0", - "astral-regex": "^2.0.0", - "at-least-node": "^1.0.0", "bowser": "^2.11.0", - "chalk": "^4", "charenc": "^0.0.2", "ci-info": "^3.2.0", - "color-convert": "^2.0.1", - "color-name": "~1.1.4", "crypt": "^0.0.2", - "diff": "^5.1.0", - "emoji-regex": "^8.0.0", - "fast-deep-equal": "^3.1.3", - "fast-uri": "^3.0.1", "fast-xml-parser": "4.4.1", "fs-extra": "^8.1.0", "graceful-fs": "^4.2.0", "graphql": "^15.5.0", "graphql-mapping-template": "5.0.2", "graphql-transformer-common": "5.1.2", - "has-flag": "^4.0.0", "hjson": "^3.2.2", "immer": "^9.0.12", "is-buffer": "~1.1.6", "is-ci": "^3.0.1", - "is-fullwidth-code-point": "^3.0.0", - "json-schema-traverse": "^1.0.0", "jsonfile": "^4.0.0", "libphonenumber-js": "1.9.47", "lodash": "^4.17.21", "lodash.mergewith": "^4.6.2", - "lodash.truncate": "^4.4.2", "md5": "^2.2.1", "object-hash": "^3.0.0", "pluralize": "8.0.0", - "require-from-string": "^2.0.2", "semver": "^7.6.3", - "slice-ansi": "^4.0.0", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", "strnum": "^1.0.5", - "supports-color": "^7.1.0", - "table": "^6.8.1", "ts-dedent": "^2.0.0", "tslib": "^2.6.2", "universalify": "^0.1.0", diff --git a/packages/amplify-graphql-api-construct/.jsii b/packages/amplify-graphql-api-construct/.jsii index 573cbf3af4..cdc3ac850e 100644 --- a/packages/amplify-graphql-api-construct/.jsii +++ b/packages/amplify-graphql-api-construct/.jsii @@ -9,28 +9,25 @@ "@aws-amplify/ai-constructs": "^1.0.0", "@aws-amplify/backend-output-schemas": "^1.0.0", "@aws-amplify/backend-output-storage": "^1.0.0", - "@aws-amplify/graphql-auth-transformer": "4.1.7", - "@aws-amplify/graphql-conversation-transformer": "1.1.2", - "@aws-amplify/graphql-default-value-transformer": "3.1.4", - "@aws-amplify/graphql-directives": "2.6.0", - "@aws-amplify/graphql-function-transformer": "3.1.6", - "@aws-amplify/graphql-generation-transformer": "1.1.0", - "@aws-amplify/graphql-http-transformer": "3.0.9", - "@aws-amplify/graphql-index-transformer": "3.0.9", - "@aws-amplify/graphql-maps-to-transformer": "4.0.9", - "@aws-amplify/graphql-model-transformer": "3.1.1", - "@aws-amplify/graphql-predictions-transformer": "3.0.9", - "@aws-amplify/graphql-relational-transformer": "3.1.1", - "@aws-amplify/graphql-searchable-transformer": "3.0.9", - "@aws-amplify/graphql-sql-transformer": "0.4.9", - "@aws-amplify/graphql-transformer": "2.2.2", - "@aws-amplify/graphql-transformer-core": "3.3.1", - "@aws-amplify/graphql-transformer-interfaces": "4.2.0", + "@aws-amplify/graphql-auth-transformer": "4.1.8", + "@aws-amplify/graphql-conversation-transformer": "1.1.3", + "@aws-amplify/graphql-default-value-transformer": "3.1.5", + "@aws-amplify/graphql-directives": "2.6.1", + "@aws-amplify/graphql-function-transformer": "3.1.7", + "@aws-amplify/graphql-generation-transformer": "1.1.1", + "@aws-amplify/graphql-http-transformer": "3.0.10", + "@aws-amplify/graphql-index-transformer": "3.0.10", + "@aws-amplify/graphql-maps-to-transformer": "4.0.10", + "@aws-amplify/graphql-model-transformer": "3.1.2", + "@aws-amplify/graphql-predictions-transformer": "3.0.10", + "@aws-amplify/graphql-relational-transformer": "3.1.2", + "@aws-amplify/graphql-searchable-transformer": "3.0.10", + "@aws-amplify/graphql-sql-transformer": "0.4.10", + "@aws-amplify/graphql-transformer": "2.2.3", + "@aws-amplify/graphql-transformer-core": "3.3.2", + "@aws-amplify/graphql-transformer-interfaces": "4.2.1", "@aws-amplify/platform-core": "^1.0.0", "@aws-amplify/plugin-types": "^1.0.0", - "@aws-cdk/assert": "^2.68.0", - "@aws-cdk/cfnspec": "2.68.0", - "@aws-cdk/cloudformation-diff": "2.68.0", "@aws-crypto/crc32": "5.2.0", "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "^5.2.0", @@ -103,51 +100,29 @@ "@smithy/util-stream": "^3.1.3", "@smithy/util-uri-escape": "^3.0.0", "@smithy/util-utf8": "^3.0.0", - "ajv": "^8.0.1", - "ansi-regex": "^5.0.1", - "ansi-styles": "^4.1.0", - "astral-regex": "^2.0.0", - "at-least-node": "^1.0.0", "bowser": "^2.11.0", - "chalk": "^4", "charenc": "^0.0.2", "ci-info": "^3.2.0", - "color-convert": "^2.0.1", - "color-name": "~1.1.4", "crypt": "^0.0.2", - "diff": "^5.1.0", - "emoji-regex": "^8.0.0", - "fast-deep-equal": "^3.1.3", - "fast-uri": "^3.0.1", "fast-xml-parser": "4.4.1", "fs-extra": "^8.1.0", "graceful-fs": "^4.2.0", "graphql": "^15.5.0", - "graphql-mapping-template": "5.0.1", - "graphql-transformer-common": "5.1.1", - "has-flag": "^4.0.0", + "graphql-mapping-template": "5.0.2", + "graphql-transformer-common": "5.1.2", "hjson": "^3.2.2", "immer": "^9.0.12", "is-buffer": "~1.1.6", "is-ci": "^3.0.1", - "is-fullwidth-code-point": "^3.0.0", - "json-schema-traverse": "^1.0.0", "jsonfile": "^4.0.0", "libphonenumber-js": "1.9.47", "lodash": "^4.17.21", "lodash.mergewith": "^4.6.2", - "lodash.truncate": "^4.4.2", "md5": "^2.2.1", "object-hash": "^3.0.0", "pluralize": "8.0.0", - "require-from-string": "^2.0.2", "semver": "^7.6.3", - "slice-ansi": "^4.0.0", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", "strnum": "^1.0.5", - "supports-color": "^7.1.0", - "table": "^6.8.1", "ts-dedent": "^2.0.0", "tslib": "^2.6.2", "universalify": "^0.1.0", @@ -4047,7 +4022,7 @@ "stability": "stable" }, "homepage": "https://github.com/aws-amplify/amplify-category-api.git", - "jsiiVersion": "5.6.0 (build 7be6ace)", + "jsiiVersion": "5.6.4 (build a446c6c)", "keywords": [ "awscdk", "aws-cdk", @@ -9428,6 +9403,6 @@ "symbolId": "src/model-datasource-strategy-types:VpcConfig" } }, - "version": "1.18.2", - "fingerprint": "0uN/9Ct5lzlmajNFfuHjXBZPQpsDnV9/bS6+qEURCqg=" + "version": "1.18.3", + "fingerprint": "V+t+v6vsfwjiE3aMKawX1LSLlOoNPC/BQcmsS1Ns7qA=" } \ No newline at end of file diff --git a/packages/amplify-graphql-api-construct/jest.config.js b/packages/amplify-graphql-api-construct/jest.config.js index c7f76bc7f7..3207644e2b 100644 --- a/packages/amplify-graphql-api-construct/jest.config.js +++ b/packages/amplify-graphql-api-construct/jest.config.js @@ -2,11 +2,4 @@ const baseConfig = require('../../jest.config.base.js'); // eslint-disable-line module.exports = { ...baseConfig, - coverageThreshold: { - global: { - branches: 89, - functions: 89, - lines: 81, - }, - }, }; diff --git a/packages/amplify-graphql-api-construct/package.json b/packages/amplify-graphql-api-construct/package.json index 6f705a5457..3d25607a5c 100644 --- a/packages/amplify-graphql-api-construct/package.json +++ b/packages/amplify-graphql-api-construct/package.json @@ -56,9 +56,6 @@ "@aws-amplify/graphql-transformer-interfaces", "@aws-amplify/platform-core", "@aws-amplify/plugin-types", - "@aws-cdk/assert", - "@aws-cdk/cfnspec", - "@aws-cdk/cloudformation-diff", "@aws-crypto/crc32", "@aws-crypto/sha256-browser", "@aws-crypto/sha256-js", @@ -131,51 +128,29 @@ "@smithy/util-stream", "@smithy/util-uri-escape", "@smithy/util-utf8", - "ajv", - "ansi-regex", - "ansi-styles", - "astral-regex", - "at-least-node", "bowser", - "chalk", "charenc", "ci-info", - "color-convert", - "color-name", "crypt", - "diff", - "emoji-regex", - "fast-deep-equal", - "fast-uri", "fast-xml-parser", "fs-extra", "graceful-fs", "graphql", "graphql-mapping-template", "graphql-transformer-common", - "has-flag", "hjson", "immer", "is-buffer", "is-ci", - "is-fullwidth-code-point", - "json-schema-traverse", "jsonfile", "libphonenumber-js", "lodash", "lodash.mergewith", - "lodash.truncate", "md5", "object-hash", "pluralize", - "require-from-string", "semver", - "slice-ansi", - "string-width", - "strip-ansi", "strnum", - "supports-color", - "table", "ts-dedent", "tslib", "universalify", @@ -205,9 +180,6 @@ "@aws-amplify/graphql-transformer-interfaces": "4.2.1", "@aws-amplify/platform-core": "^1.0.0", "@aws-amplify/plugin-types": "^1.0.0", - "@aws-cdk/assert": "^2.68.0", - "@aws-cdk/cfnspec": "2.68.0", - "@aws-cdk/cloudformation-diff": "2.68.0", "@aws-crypto/crc32": "5.2.0", "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "^5.2.0", @@ -280,51 +252,29 @@ "@smithy/util-stream": "^3.1.3", "@smithy/util-uri-escape": "^3.0.0", "@smithy/util-utf8": "^3.0.0", - "ajv": "^8.0.1", - "ansi-regex": "^5.0.1", - "ansi-styles": "^4.1.0", - "astral-regex": "^2.0.0", - "at-least-node": "^1.0.0", "bowser": "^2.11.0", - "chalk": "^4", "charenc": "^0.0.2", "ci-info": "^3.2.0", - "color-convert": "^2.0.1", - "color-name": "~1.1.4", "crypt": "^0.0.2", - "diff": "^5.1.0", - "emoji-regex": "^8.0.0", - "fast-deep-equal": "^3.1.3", - "fast-uri": "^3.0.1", "fast-xml-parser": "4.4.1", "fs-extra": "^8.1.0", "graceful-fs": "^4.2.0", "graphql": "^15.5.0", "graphql-mapping-template": "5.0.2", "graphql-transformer-common": "5.1.2", - "has-flag": "^4.0.0", "hjson": "^3.2.2", "immer": "^9.0.12", "is-buffer": "~1.1.6", "is-ci": "^3.0.1", - "is-fullwidth-code-point": "^3.0.0", - "json-schema-traverse": "^1.0.0", "jsonfile": "^4.0.0", "libphonenumber-js": "1.9.47", "lodash": "^4.17.21", "lodash.mergewith": "^4.6.2", - "lodash.truncate": "^4.4.2", "md5": "^2.2.1", "object-hash": "^3.0.0", "pluralize": "8.0.0", - "require-from-string": "^2.0.2", "semver": "^7.6.3", - "slice-ansi": "^4.0.0", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", "strnum": "^1.0.5", - "supports-color": "^7.1.0", - "table": "^6.8.1", "ts-dedent": "^2.0.0", "tslib": "^2.6.2", "universalify": "^0.1.0", diff --git a/packages/amplify-graphql-api-construct/src/__tests__/index-import.test.ts b/packages/amplify-graphql-api-construct/src/__tests__/index-import.test.ts index 550b94cf82..f206a79de5 100644 --- a/packages/amplify-graphql-api-construct/src/__tests__/index-import.test.ts +++ b/packages/amplify-graphql-api-construct/src/__tests__/index-import.test.ts @@ -1,4 +1,8 @@ -// This exists only to provide coverage metrics for various export files +// ############################################################################ +// This exists only to provide coverage metrics for various export files. If +// you include executable code in any of the referenced files, you must test it +// separately in a dedicated *.test.ts file. +// ############################################################################ import * as src from '../index'; import * as types from '../types'; diff --git a/packages/amplify-graphql-api-construct/src/index.ts b/packages/amplify-graphql-api-construct/src/index.ts index aa8be66def..dd577ab547 100644 --- a/packages/amplify-graphql-api-construct/src/index.ts +++ b/packages/amplify-graphql-api-construct/src/index.ts @@ -1,7 +1,18 @@ +// ############################################################################ +// Note that sections of this file are excluded from test coverage metrics with +// 'c8 ignore' comments. If you add code to this file, suppress non-executable +// code from coverage metrics by using a `c8 ignore`. If the code is +// executable, you MUST NOT suppress it from coverage metrics. +// +// `ignore` statements must only span a single block of code. Do not apply an +// `ignore` statement to multiple blocks, or the entire file. +// ############################################################################ + /* ATTENTION * * If you modify this file you must also modify packages/amplify-data-construct/src/index.ts to have the same exports */ +/* c8 ignore start */ export type { IAMAuthorizationConfig, IdentityPoolAuthorizationConfig, @@ -34,8 +45,17 @@ export type { IBackendOutputEntry, AddFunctionProps, } from './types'; +/* c8 ignore stop */ + +/* c8 ignore start */ export { AmplifyGraphqlApi } from './amplify-graphql-api'; +/* c8 ignore stop */ + +/* c8 ignore start */ export { AmplifyGraphqlDefinition } from './amplify-graphql-definition'; +/* c8 ignore stop */ + +/* c8 ignore start */ export { AmplifyDynamoDbTableWrapper, TimeToLiveSpecification, @@ -44,7 +64,20 @@ export { SSEType, StreamSpecification, } from './amplify-dynamodb-table-wrapper'; +/* c8 ignore stop */ + +/* c8 ignore start */ export { SQLLambdaModelDataSourceStrategyFactory } from './sql-model-datasource-strategy'; +/* c8 ignore stop */ + +/* c8 ignore start */ export * from './model-datasource-strategy-types'; +/* c8 ignore stop */ + +/* c8 ignore start */ export type { LogConfig, Logging } from './log-config-types'; +/* c8 ignore stop */ + +/* c8 ignore start */ export { FieldLogLevel, RetentionDays } from './log-config-types'; +/* c8 ignore stop */ diff --git a/packages/amplify-graphql-api-construct/src/types.ts b/packages/amplify-graphql-api-construct/src/types.ts index 0c5a7c567f..96b31cfe9b 100644 --- a/packages/amplify-graphql-api-construct/src/types.ts +++ b/packages/amplify-graphql-api-construct/src/types.ts @@ -1,4 +1,18 @@ +// ############################################################################ +// Note that sections of this file are excluded from test coverage metrics with +// 'c8 ignore' comments. If you add code to this file, suppress non-executable +// code from coverage metrics by using a `c8 ignore`. If the code is +// executable, you MUST NOT suppress it from coverage metrics. +// +// `ignore` statements must only span a single block of code. Do not apply an +// `ignore` statement to multiple blocks, or the entire file. +// ############################################################################ + +/* c8 ignore start */ import { Duration, CfnResource, NestedStack } from 'aws-cdk-lib'; +/* c8 ignore stop */ + +/* c8 ignore start */ import { CfnGraphQLApi, CfnGraphQLSchema, @@ -12,18 +26,45 @@ import { Code, FunctionRuntime, } from 'aws-cdk-lib/aws-appsync'; +/* c8 ignore stop */ + +/* c8 ignore start */ import { CfnTable, ITable } from 'aws-cdk-lib/aws-dynamodb'; +/* c8 ignore stop */ + +/* c8 ignore start */ import { IRole, CfnRole } from 'aws-cdk-lib/aws-iam'; +/* c8 ignore stop */ + +/* c8 ignore start */ import { IUserPool } from 'aws-cdk-lib/aws-cognito'; +/* c8 ignore stop */ + +/* c8 ignore start */ import { IFunction, CfnFunction } from 'aws-cdk-lib/aws-lambda'; +/* c8 ignore stop */ + +/* c8 ignore start */ import { IBucket } from 'aws-cdk-lib/aws-s3'; +/* c8 ignore stop */ + +/* c8 ignore start */ import { AmplifyDynamoDbTableWrapper } from './amplify-dynamodb-table-wrapper'; +/* c8 ignore stop */ + +/* c8 ignore start */ import { CustomSqlDataSourceStrategy, ModelDataSourceStrategy } from './model-datasource-strategy-types'; +/* c8 ignore stop */ + +/* c8 ignore start */ import { Logging } from './log-config-types'; +/* c8 ignore stop */ + /** * Configuration for IAM Authorization on the Graphql Api. * @struct - required since this interface begins with an 'I' */ +/* c8 ignore start */ export interface IAMAuthorizationConfig { /** * ID for the Cognito Identity Pool vending auth and unauth roles. @@ -69,11 +110,13 @@ export interface IAMAuthorizationConfig { */ readonly enableIamAuthorizationMode?: boolean; } +/* c8 ignore stop */ /** * Configuration for Cognito Identity Pool Authorization on the Graphql Api. * @struct - required since this interface begins with an 'I' */ +/* c8 ignore start */ export interface IdentityPoolAuthorizationConfig { /** * ID for the Cognito Identity Pool vending auth and unauth roles. @@ -91,20 +134,24 @@ export interface IdentityPoolAuthorizationConfig { */ readonly unauthenticatedUserRole: IRole; } +/* c8 ignore stop */ /** * Configuration for Cognito UserPool Authorization on the Graphql Api. */ +/* c8 ignore start */ export interface UserPoolAuthorizationConfig { /** * The Cognito User Pool which is used to authenticated JWT tokens, and vends group and user information. */ readonly userPool: IUserPool; } +/* c8 ignore stop */ /** * Configuration for OpenId Connect Authorization on the Graphql Api. */ +/* c8 ignore start */ export interface OIDCAuthorizationConfig { /** * The issuer for the OIDC configuration. @@ -134,10 +181,12 @@ export interface OIDCAuthorizationConfig { */ readonly tokenExpiryFromIssue: Duration; } +/* c8 ignore stop */ /** * Configuration for Api Keys on the Graphql Api. */ +/* c8 ignore start */ export interface ApiKeyAuthorizationConfig { /** * Optional description for the Api Key to attach to the Api. @@ -149,10 +198,12 @@ export interface ApiKeyAuthorizationConfig { */ readonly expires: Duration; } +/* c8 ignore stop */ /** * Configuration for Custom Lambda authorization on the Graphql Api. */ +/* c8 ignore start */ export interface LambdaAuthorizationConfig { /** * The authorizer lambda function. @@ -164,12 +215,14 @@ export interface LambdaAuthorizationConfig { */ readonly ttl: Duration; } +/* c8 ignore stop */ /** * Authorization Modes to apply to the Api. * At least one modes must be provided, and if more than one are provided a defaultAuthorizationMode must be specified. * For more information on Amplify Api auth, refer to https://docs.amplify.aws/cli/graphql/authorization-rules/#authorization-strategies */ +/* c8 ignore start */ export interface AuthorizationModes { /** * Default auth mode to provide to the Api, required if more than one config type is specified. @@ -220,25 +273,31 @@ export interface AuthorizationModes { */ readonly adminRoles?: IRole[]; } +/* c8 ignore stop */ /** * Whether or not to use a version field to track conflict detection. */ +/* c8 ignore start */ export type ConflictDetectionType = 'VERSION' | 'NONE'; +/* c8 ignore stop */ /** * Common parameters for conflict resolution. */ +/* c8 ignore start */ export interface ConflictResolutionStrategyBase { /** * The conflict detection type used for resolution. */ readonly detectionType: ConflictDetectionType; } +/* c8 ignore stop */ /** * Enable optimistic concurrency on the project. */ +/* c8 ignore start */ export interface AutomergeConflictResolutionStrategy extends ConflictResolutionStrategyBase { /** * This conflict resolution strategy executes an auto-merge. @@ -246,10 +305,12 @@ export interface AutomergeConflictResolutionStrategy extends ConflictResolutionS */ readonly handlerType: 'AUTOMERGE'; } +/* c8 ignore stop */ /** * Enable automerge on the project. */ +/* c8 ignore start */ export interface OptimisticConflictResolutionStrategy extends ConflictResolutionStrategyBase { /** * This conflict resolution strategy the _version to perform optimistic concurrency. @@ -257,10 +318,12 @@ export interface OptimisticConflictResolutionStrategy extends ConflictResolution */ readonly handlerType: 'OPTIMISTIC_CONCURRENCY'; } +/* c8 ignore stop */ /** * Enable custom sync on the project, powered by a lambda. */ +/* c8 ignore start */ export interface CustomConflictResolutionStrategy extends ConflictResolutionStrategyBase { /** * This conflict resolution strategy uses a lambda handler type. @@ -278,20 +341,26 @@ export interface CustomConflictResolutionStrategy extends ConflictResolutionStra /** * Conflict Resolution Strategy to apply to the project or a particular model. */ +/* c8 ignore start */ export type ConflictResolutionStrategy = | AutomergeConflictResolutionStrategy | OptimisticConflictResolutionStrategy | CustomConflictResolutionStrategy; +/* c8 ignore stop */ /** * Project level configuration for conflict resolution. * @deprecated use DataStoreConfiguration instead. */ +/* c8 ignore start */ +// eslint-disable-next-line @typescript-eslint/no-empty-interface export interface ConflictResolution extends DataStoreConfiguration {} +/* c8 ignore stop */ /** * Project level configuration for DataStore */ +/* c8 ignore start */ export interface DataStoreConfiguration { /** * Project-wide config for conflict resolution. Applies to all non-overridden models. @@ -303,11 +372,13 @@ export interface DataStoreConfiguration { */ readonly models?: Record; } +/* c8 ignore stop */ /** * Params exposed to support configuring and overriding pipelined slots. This allows configuration of the underlying function, * including the request and response mapping templates. */ +/* c8 ignore start */ export interface FunctionSlotOverride { /** * Override request mapping template for the function slot. Executed before the datasource is invoked. @@ -319,10 +390,12 @@ export interface FunctionSlotOverride { */ readonly responseMappingTemplate?: MappingTemplate; } +/* c8 ignore stop */ /** * Common slot parameters. */ +/* c8 ignore start */ export interface FunctionSlotBase { /** * The field to attach this function to on the Api definition. @@ -340,10 +413,12 @@ export interface FunctionSlotBase { */ readonly function: FunctionSlotOverride; } +/* c8 ignore stop */ /** * Slot types for Mutation Resolvers. */ +/* c8 ignore start */ export interface MutationFunctionSlot extends FunctionSlotBase { /** * This slot type applies to the Mutation type on the Api definition. @@ -356,10 +431,12 @@ export interface MutationFunctionSlot extends FunctionSlotBase { */ readonly slotName: 'init' | 'preAuth' | 'auth' | 'postAuth' | 'preUpdate' | 'postUpdate' | 'finish'; } +/* c8 ignore stop */ /** * Slot types for Query Resolvers. */ +/* c8 ignore start */ export interface QueryFunctionSlot extends FunctionSlotBase { /** * This slot type applies to the Query type on the Api definition. @@ -372,10 +449,12 @@ export interface QueryFunctionSlot extends FunctionSlotBase { */ readonly slotName: 'init' | 'preAuth' | 'auth' | 'postAuth' | 'preDataLoad' | 'postDataLoad' | 'finish'; } +/* c8 ignore stop */ /** * Slot types for Subscription Resolvers. */ +/* c8 ignore start */ export interface SubscriptionFunctionSlot extends FunctionSlotBase { /** * This slot type applies to the Subscription type on the Api definition. @@ -388,11 +467,14 @@ export interface SubscriptionFunctionSlot extends FunctionSlotBase { */ readonly slotName: 'init' | 'preAuth' | 'auth' | 'postAuth' | 'preSubscribe'; } +/* c8 ignore stop */ /** * Input params to uniquely identify the slot which is being overridden. */ +/* c8 ignore start */ export type FunctionSlot = MutationFunctionSlot | QueryFunctionSlot | SubscriptionFunctionSlot; +/* c8 ignore stop */ /** * Strongly typed set of shared parameters for all transformers, and core layer. @@ -400,6 +482,7 @@ export type FunctionSlot = MutationFunctionSlot | QueryFunctionSlot | Subscripti * a single location, and isn't spread around the transformers, where they can * have different default behaviors. */ +/* c8 ignore start */ export interface TranslationBehavior { /** * Restore parity w/ GQLv1 @model parameter behavior, where setting a single field doesn't implicitly set the other fields to null. @@ -497,10 +580,12 @@ export interface TranslationBehavior { */ readonly replaceTableUponGsiUpdate: boolean; } +/* c8 ignore stop */ /** * A utility interface equivalent to Partial. */ +/* c8 ignore start */ export interface PartialTranslationBehavior { /** * Restore parity w/ GQLv1 @model parameter behavior, where setting a single field doesn't implicitly set the other fields to null. @@ -615,10 +700,12 @@ export interface PartialTranslationBehavior { */ readonly _provisionHotswapFriendlyResources?: boolean; } +/* c8 ignore stop */ /** * Graphql Api definition, which can be implemented in multiple ways. */ +/* c8 ignore start */ export interface IAmplifyGraphqlDefinition { /** * Return the schema definition as a graphql string, with amplify directives allowed. @@ -652,10 +739,12 @@ export interface IAmplifyGraphqlDefinition { */ readonly customSqlDataSourceStrategies?: CustomSqlDataSourceStrategy[]; } +/* c8 ignore stop */ /** * Entry representing the required output from the backend for codegen generate commands to work. */ +/* c8 ignore start */ export interface IBackendOutputEntry { /** * The protocol version for this backend output. @@ -667,10 +756,12 @@ export interface IBackendOutputEntry { */ readonly payload: Record; } +/* c8 ignore stop */ /** * Backend output strategy used to write config required for codegen tasks. */ +/* c8 ignore start */ export interface IBackendOutputStorageStrategy { /** * Add an entry to backend output. @@ -680,11 +771,13 @@ export interface IBackendOutputStorageStrategy { // eslint-disable-next-line @typescript-eslint/method-signature-style addBackendOutputEntry(keyName: string, backendOutputEntry: IBackendOutputEntry): void; } +/* c8 ignore stop */ /** * Input props for the AmplifyGraphqlApi construct. Specifies what the input to transform into an Api, and configurations for * the transformation process. */ +/* c8 ignore start */ export interface AmplifyGraphqlApiProps { /** * The definition to transform in a full Api. @@ -768,11 +861,13 @@ export interface AmplifyGraphqlApiProps { */ readonly logging?: Logging; } +/* c8 ignore stop */ /** * L1 CDK resources from the Api which were generated as part of the transform. * These are potentially stored under nested stacks, but presented organized by type instead. */ +/* c8 ignore start */ export interface AmplifyGraphqlApiCfnResources { /** * The Generated AppSync Api L1 Resource @@ -829,11 +924,13 @@ export interface AmplifyGraphqlApiCfnResources { */ readonly additionalCfnResources: Record; } +/* c8 ignore stop */ /** * Accessible resources from the Api which were generated as part of the transform. * These are potentially stored under nested stacks, but presented organized by type instead. */ +/* c8 ignore start */ export interface AmplifyGraphqlApiResources { /** * The Generated AppSync Api L2 Resource, includes the Schema. @@ -865,11 +962,13 @@ export interface AmplifyGraphqlApiResources { */ readonly nestedStacks: Record; } +/* c8 ignore stop */ /** * Input type properties when adding a new appsync.AppsyncFunction to the generated API. * This is equivalent to the Omit. */ +/* c8 ignore start */ export interface AddFunctionProps { /** * the data source linked to this AppSync Function @@ -916,3 +1015,4 @@ export interface AddFunctionProps { */ readonly code?: Code; } +/* c8 ignore stop */ diff --git a/packages/amplify-graphql-transformer-core/package.json b/packages/amplify-graphql-transformer-core/package.json index 4f5481a89c..a3fbbf28ce 100644 --- a/packages/amplify-graphql-transformer-core/package.json +++ b/packages/amplify-graphql-transformer-core/package.json @@ -31,7 +31,6 @@ "dependencies": { "@aws-amplify/graphql-directives": "2.6.1", "@aws-amplify/graphql-transformer-interfaces": "4.2.1", - "@aws-cdk/assert": "^2.68.0", "fs-extra": "^8.1.0", "graphql": "^15.5.0", "graphql-mapping-template": "5.0.2", diff --git a/yarn.lock b/yarn.lock index db080b8404..a68116b558 100644 --- a/yarn.lock +++ b/yarn.lock @@ -410,13 +410,6 @@ dependencies: "@aws-amplify/core" "4.7.15" -"@aws-cdk/assert@^2.68.0": - version "2.68.0" - resolved "https://registry.npmjs.org/@aws-cdk/assert/-/assert-2.68.0.tgz#d83b44ba278d3e3a32c13f372c697f26c6061b64" - integrity sha512-bEztvoYdVp17I/ClYRGZa4wlEP/qNNq4Q+Z7EKwRL0cLDmvq4EI1m1N8LhUPAH7B6YXp5d1164gC6Nr0lV8bbA== - dependencies: - "@aws-cdk/cloudformation-diff" "2.68.0" - "@aws-cdk/asset-awscli-v1@^2.2.208": version "2.2.214" resolved "https://registry.npmjs.org/@aws-cdk/asset-awscli-v1/-/asset-awscli-v1-2.2.214.tgz#7d3554aae08f5b51fc1373bb39e5b4549b4c25c7" @@ -437,14 +430,6 @@ resolved "https://registry.npmjs.org/@aws-cdk/aws-cognito-identitypool-alpha/-/aws-cognito-identitypool-alpha-2.152.0-alpha.0.tgz#5d29345675171afd1eaa594da59561b38ff0ea9d" integrity sha512-6KbF4jog139kAARMBNDbbGQYSon+ggG4peQgv3hDFH49l6r6w+SbrW+jFzgfTGhQLDrlQEB4rPh7EW64xxtfVg== -"@aws-cdk/cfnspec@2.68.0": - version "2.68.0" - resolved "https://registry.npmjs.org/@aws-cdk/cfnspec/-/cfnspec-2.68.0.tgz#e678c62d92ca76f8513a23c3c78f00ae49a7ab2e" - integrity sha512-g062ljKOvMaeEgp2GR2ewoF3BzeGYpu+AA7UvN/SN+2S0detSwU+qHlxSFeTe0DLyCFaMttNEh81VmYCfiHtpg== - dependencies: - fs-extra "^9.1.0" - md5 "^2.3.0" - "@aws-cdk/cloud-assembly-schema@^38.0.1": version "38.0.1" resolved "https://registry.npmjs.org/@aws-cdk/cloud-assembly-schema/-/cloud-assembly-schema-38.0.1.tgz#cdf4684ae8778459e039cd44082ea644a3504ca9" @@ -453,18 +438,6 @@ jsonschema "^1.4.1" semver "^7.6.3" -"@aws-cdk/cloudformation-diff@2.68.0": - version "2.68.0" - resolved "https://registry.npmjs.org/@aws-cdk/cloudformation-diff/-/cloudformation-diff-2.68.0.tgz#e5c69c9419472e3dd56bde418b3fabbca85d4005" - integrity sha512-JnX0sygxNHWU3aKdzSus25B1TuKYWDwnNL2tw3svZvfHcw3Nwz857JTOn/yNOJxT7cZbCbOqNPrOT6Xv+LrxTQ== - dependencies: - "@aws-cdk/cfnspec" "2.68.0" - chalk "^4" - diff "^5.1.0" - fast-deep-equal "^3.1.3" - string-width "^4.2.3" - table "^6.8.1" - "@aws-crypto/crc32@2.0.0": version "2.0.0" resolved "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-2.0.0.tgz#4ad432a3c03ec3087c5540ff6e41e6565d2dc153" @@ -5676,10 +5649,18 @@ chalk "^4.1.2" semver "^7.6.3" -"@jsii/spec@^1.104.0", "@jsii/spec@^1.105.0", "@jsii/spec@^1.85.0": - version "1.105.0" - resolved "https://registry.npmjs.org/@jsii/spec/-/spec-1.105.0.tgz#500dcffc0e2258932c5b71b4a342ce4a8dfab641" - integrity sha512-pLy8JyPT9Vv5UTxtM4ZHm/iisWzU62m3/dn9TPW2oANI5TLiBpjLlJw/iF+KRjYAeQnFASUfXtWTXgbN4xp9Rw== +"@jsii/check-node@1.106.0": + version "1.106.0" + resolved "https://registry.yarnpkg.com/@jsii/check-node/-/check-node-1.106.0.tgz#5deb20b0bbe0a506c4bd9edf60b17b0a93f83834" + integrity sha512-/T/TUsbHdEbZRFR4Rem9+UXVvgMYncEkrIeC52oIHJ8BDSgqlDsIARio/Eu5DOftF4avSLV/sshR6n19mpK1oA== + dependencies: + chalk "^4.1.2" + semver "^7.6.3" + +"@jsii/spec@^1.104.0", "@jsii/spec@^1.105.0", "@jsii/spec@^1.106.0", "@jsii/spec@^1.85.0": + version "1.106.0" + resolved "https://registry.yarnpkg.com/@jsii/spec/-/spec-1.106.0.tgz#f40010ec8cde14b7a003dd5b6a46480d9d7e222f" + integrity sha512-pAIvqEGf0YLmtzFtUKWNEGkCmXMHENy7k+rzCD147wnM4jHhvEL1mEvxi99aA2VcmvLYaAYNOs/XozT+s+kLqQ== dependencies: ajv "^8.17.1" @@ -8547,7 +8528,7 @@ astral-regex@^2.0.0: async@^2.6.4: version "2.6.4" - resolved "https://registry.npmjs.org/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== dependencies: lodash "^4.17.14" @@ -8644,9 +8625,9 @@ aws-appsync@^4.1.1: uuid "3.x" aws-cdk-lib@2.168.0, aws-cdk-lib@^2.168.0, aws-cdk-lib@~2.129.0: - version "2.173.0" - resolved "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.173.0.tgz#5dddde721cc1218eb38366b84bc105ebab39b58f" - integrity sha512-Da1JUwG8eL+chRSB+c2I4dRf54DWe/wmWKj9CBthNdsE9XCB8odyEcMpmgBC+R160o7ioYY2DBsAaKIIRa9XQw== + version "2.173.2" + resolved "https://registry.yarnpkg.com/aws-cdk-lib/-/aws-cdk-lib-2.173.2.tgz#9e51332973163eb0d0a89cb67973a89b75c5f0b1" + integrity sha512-cL9+z8Pl3VZGoO7BwdsrFAOeud/vSl3at7OvmhihbNprMN15XuFUx/rViAU5OI1m92NbV4NBzYSLbSeCwYLNyw== dependencies: "@aws-cdk/asset-awscli-v1" "^2.2.208" "@aws-cdk/asset-kubectl-v20" "^2.1.3" @@ -8665,9 +8646,9 @@ aws-cdk-lib@2.168.0, aws-cdk-lib@^2.168.0, aws-cdk-lib@~2.129.0: yaml "1.10.2" aws-sdk@2.518.0, aws-sdk@^2.1113.0, aws-sdk@^2.1141.0, aws-sdk@^2.1464.0: - version "2.1691.0" - resolved "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1691.0.tgz#9d6ccdcbae03c806fc62667b76eb3e33e5294dcc" - integrity sha512-/F2YC+DlsY3UBM2Bdnh5RLHOPNibS/+IcjUuhP8XuctyrN+MlL+fWDAiela32LTDk7hMy4rx8MTgvbJ+0blO5g== + version "2.1692.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1692.0.tgz#9dac5f7bfcc5ab45825cc8591b12753aa7d2902c" + integrity sha512-x511uiJ/57FIsbgUe5csJ13k3uzu25uWQE+XqfBis/sB0SFoiElJWXRkgEAUh0U6n40eT3ay5Ue4oPkRMu1LYw== dependencies: buffer "4.9.2" events "1.1.1" @@ -8686,9 +8667,9 @@ axe-core@^4.10.0: integrity sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w== axios@0.26.0, axios@^0.21.1, axios@^1.0.0, axios@^1.6.0, axios@^1.7.4: - version "1.7.7" - resolved "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz#2f554296f9892a72ac8d8e4c5b79c14a91d0a47f" - integrity sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q== + version "1.7.9" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.9.tgz#d7d071380c132a24accda1b2cfc1535b79ec650a" + integrity sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw== dependencies: follow-redirects "^1.15.6" form-data "^4.0.0" @@ -8883,7 +8864,7 @@ body-parser@1.20.3: boolbase@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" + resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww== bowser@^2.11.0: @@ -9694,7 +9675,7 @@ cookie-signature@1.0.6: cookie@0.7.1, cookie@^0.4.0, cookie@^0.7.0: version "0.7.2" - resolved "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz#556369c472a2ba910f2979891b526b3436237ed7" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.2.tgz#556369c472a2ba910f2979891b526b3436237ed7" integrity sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w== copyfiles@^2.2.0: @@ -9775,7 +9756,7 @@ create-require@^1.1.0: cross-fetch@2.2.2, cross-fetch@^2.2.6: version "2.2.6" - resolved "https://registry.npmjs.org/cross-fetch/-/cross-fetch-2.2.6.tgz#2ef0bb39a24ac034787965c457368a28730e220a" + resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-2.2.6.tgz#2ef0bb39a24ac034787965c457368a28730e220a" integrity sha512-9JZz+vXCmfKUZ68zAptS7k4Nu8e2qcibe7WVZYps7sAgk5R8GYTc+T1WR0v1rlP9HxgARmOX1UTIJZFytajpNA== dependencies: node-fetch "^2.6.7" @@ -10081,11 +10062,6 @@ diff@^4.0.1: resolved "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== -diff@^5.1.0: - version "5.2.0" - resolved "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz#26ded047cd1179b78b9537d5ef725503ce1ae531" - integrity sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A== - dir-glob@^3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" @@ -10916,9 +10892,9 @@ fast-url-parser@^1.1.3: punycode "^1.3.2" fast-xml-parser@3.19.0, fast-xml-parser@^3.16.0, fast-xml-parser@^4.4.1: - version "4.5.0" - resolved "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.0.tgz#2882b7d01a6825dfdf909638f2de0256351def37" - integrity sha512-/PlTQCI96+fZMAOLMZK4CWG1ItCbfZ/0jx7UIJFChPNrx7tcEgerUgWbeieCM9MfHInUDyK8DWYZ+YrywDJuTg== + version "4.5.1" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.5.1.tgz#a7e665ff79b7919100a5202f23984b6150f9b31e" + integrity sha512-y655CeyUQ+jj7KBbYMc4FG01V8ZQqjN+gDYGJ50RtfsUB8iG9AmwmwoAgeKLJdmueKKMrH1RJ7yXHTSoczdv5w== dependencies: strnum "^1.0.5" @@ -13057,12 +13033,12 @@ jsii-rosetta@^5.4.23: yargs "^17.7.2" jsii@^5.4.23, jsii@~5.6.0: - version "5.6.0" - resolved "https://registry.npmjs.org/jsii/-/jsii-5.6.0.tgz#f41b5f57f9637bebd3e274c672b270f5332a9074" - integrity sha512-XBXAF9a4UF2HE+LMSa+WDuYRNpmZlBxHrXaTVIFumo0oAuKb9eauPd4slwgQnCftyP5iyk8zX/Z2y4I3yQVcfA== + version "5.6.4" + resolved "https://registry.yarnpkg.com/jsii/-/jsii-5.6.4.tgz#105774013380a51469528aad127bc3508df41e9c" + integrity sha512-ZfrnPJeuIQJscs3NN8jAYy246DByFcgTIRomoAOM0PY9nfRx/8qXLkWI2LZ49Zmh7WNzqVt8dBCJ6+z1CUqdpQ== dependencies: - "@jsii/check-node" "1.104.0" - "@jsii/spec" "^1.104.0" + "@jsii/check-node" "1.106.0" + "@jsii/spec" "^1.106.0" case "^1.6.3" chalk "^4" fast-deep-equal "^3.1.3" @@ -13990,14 +13966,14 @@ moment-jdateformatparser@^1.2.1: moment-timezone@0.5.35, moment-timezone@^0.5.35: version "0.5.46" - resolved "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.46.tgz#a21aa6392b3c6b3ed916cd5e95858a28d893704a" + resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.46.tgz#a21aa6392b3c6b3ed916cd5e95858a28d893704a" integrity sha512-ZXm9b36esbe7OmdABqIWJuBBiLLwAjrN7CE+7sYdCCx82Nabt1wHDj8TVseS59QIlfFPbOoiBPm6ca9BioG4hw== dependencies: moment "^2.29.4" moment@^2.24.0, moment@^2.29.1, moment@^2.29.4: version "2.30.1" - resolved "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae" integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how== ms@2.0.0: @@ -14449,7 +14425,7 @@ npmlog@^6.0.0, npmlog@^6.0.2: nth-check@^2.0.1: version "2.1.1" - resolved "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d" + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d" integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w== dependencies: boolbase "^1.0.0" @@ -14961,7 +14937,7 @@ parse-json@^5.0.0, parse-json@^5.2.0: parse-path@^5.0.0, parse-path@^7.0.0: version "5.0.0" - resolved "https://registry.npmjs.org/parse-path/-/parse-path-5.0.0.tgz#f933152f3c6d34f4cf36cfc3d07b138ac113649d" + resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-5.0.0.tgz#f933152f3c6d34f4cf36cfc3d07b138ac113649d" integrity sha512-qOpH55/+ZJ4jUu/oLO+ifUKjFPNZGfnPJtzvGzKN/4oLMil5m9OH4VpOj6++9/ytJcfks4kzH2hhi87GL/OU9A== dependencies: protocols "^2.0.0" @@ -16703,7 +16679,7 @@ synckit@^0.9.1: "@pkgr/core" "^0.1.0" tslib "^2.6.2" -table@^6.8.1, table@^6.8.2: +table@^6.8.2: version "6.8.2" resolved "https://registry.npmjs.org/table/-/table-6.8.2.tgz#c5504ccf201213fa227248bdc8c5569716ac6c58" integrity sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA== @@ -16868,7 +16844,7 @@ treeverse@^2.0.0: trim-newlines@^3.0.0, trim-newlines@^3.0.1: version "3.0.1" - resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" + resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== triple-beam@^1.3.0: @@ -17433,7 +17409,7 @@ webidl-conversions@^3.0.0: whatwg-fetch@^2.0.4: version "2.0.4" - resolved "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" + resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng== whatwg-fetch@^3.4.1: