Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Lambda custom policies not working #8415

Merged
merged 2 commits into from
Oct 21, 2021
Merged

fix: Lambda custom policies not working #8415

merged 2 commits into from
Oct 21, 2021

Conversation

osddeitf
Copy link
Contributor

Description of changes

  • fix mismatch ajv version between amplify-cli-core and amplify-provider-awscloudformation

Issue #8392

Description of how you validated changes

When I freshly install @aws-amplify/cli@6.3.0 inside node:14-bullseye-slim image, ajv package is in the following folders:

/usr/local/lib/node_modules/npm/node_modules/har-validator/node_modules/ajv
/usr/local/lib/node_modules/@aws-amplify/cli/node_modules/aws-cdk/node_modules/ajv
/usr/local/lib/node_modules/@aws-amplify/cli/node_modules/amplify-cli-core/node_modules/ajv
/usr/local/lib/node_modules/@aws-amplify/cli/node_modules/ajv
/usr/local/lib/node_modules/@aws-amplify/cli/node_modules/amplify-util-headless-input/node_modules/ajv
  • The amplify-cli-core package use ajv@^6.12.3.
  • The module packages/amplify-cli-core/src/customPoliciesUtils.ts export CustomIAMPoliciesSchema.
  • The module packages/amplify-provider-awscloudformation/src/pre-push-cfn-processor/cfn-pre-processor.ts use CustomIAMPoliciesSchema with ajv.
  • But amplify-provider-awscloudformation has no ajv dependency in its package.json.
  • Then it will resolve to use /usr/local/lib/node_modules/@aws-amplify/cli/node_modules/ajv which is in major version 8 (ajv is not a direct dependency of @aws-amplify/cli).
  • Result in the error I mentioned in Bug: Lambda custom policies not working #8392;
? Are you sure you want to continue? Yes
strict mode: missing type "object" for keyword "additionalProperties" at "#" (strictTypes)
✖ An error occurred when pushing the resources to the cloud
🛑 
strict mode: unknown keyword: "optionalProperties"
An error occurred during the push operation: strict mode: unknown keyword: "optionalProperties"
  • I tried to go to /usr/local/lib/node_modules/@aws-amplify/cli/node_modules/amplify-provider-awscloudformation, run npm install ajv@^6.12.3, then the issue is resolved.

Checklist

  • PR description included
  • yarn test passes

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

@osddeitf osddeitf requested a review from a team as a code owner October 11, 2021 03:52
@codecov-commenter
Copy link

Codecov Report

Merging #8415 (0933517) into master (bd435e2) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #8415   +/-   ##
=======================================
  Coverage   55.92%   55.92%           
=======================================
  Files         695      695           
  Lines       38881    38881           
  Branches     7871     7871           
=======================================
  Hits        21743    21743           
  Misses      16343    16343           
  Partials      795      795           

Continue to review full report at Codecov.

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

Copy link
Contributor

@jhockett jhockett left a comment

Choose a reason for hiding this comment

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

LGTM, thank you for debugging and opening the PR!

@siegerts siegerts added the first-time-contributor The contribution is the first for this user in the repo label Oct 12, 2021
@jhockett jhockett changed the title Fix Lambda custom policies not working fix: Lambda custom policies not working Oct 12, 2021
@cjihrig cjihrig merged commit 239f1ac into aws-amplify:master Oct 21, 2021
akshbhu added a commit that referenced this pull request Oct 27, 2021
* chore(release): Publish [ci skip]

 - amplify-app@3.0.13
 - amplify-category-analytics@2.21.22
 - amplify-category-api@2.32.0
 - amplify-category-auth@2.38.2
 - amplify-category-function@2.35.0
 - amplify-category-geo@1.0.1
 - amplify-category-hosting@2.7.22
 - amplify-category-interactions@2.6.6
 - amplify-category-predictions@2.9.13
 - amplify-category-storage@2.12.10
 - amplify-category-xr@2.8.22
 - amplify-cli-core@1.30.0
 - @aws-amplify/cli@6.1.0
 - amplify-console-hosting@1.9.13
 - amplify-console-integration-tests@1.8.10
 - amplify-container-hosting@1.3.24
 - amplify-dotnet-function-template-provider@1.5.22
 - amplify-dynamodb-simulator@1.19.13
 - amplify-e2e-core@1.27.0
 - amplify-e2e-tests@2.51.0
 - amplify-frontend-ios@2.20.15
 - amplify-frontend-javascript@2.24.2
 - amplify-go-function-runtime-provider@1.9.5
 - @aws-amplify/graphql-function-transformer@0.4.4
 - @aws-amplify/graphql-http-transformer@0.5.4
 - @aws-amplify/graphql-index-transformer@0.3.3
 - @aws-amplify/graphql-model-transformer@0.6.3
 - @aws-amplify/graphql-predictions-transformer@0.3.4
 - @aws-amplify/graphql-relational-transformer@0.3.0
 - @aws-amplify/graphql-searchable-transformer@0.6.1
 - @aws-amplify/graphql-transformer-core@0.9.1
 - @aws-amplify/graphql-transformer-interfaces@1.9.1
 - amplify-java-function-runtime-provider@1.8.15
 - amplify-migration-tests@3.1.10
 - amplify-nodejs-function-runtime-provider@1.6.12
 - amplify-nodejs-function-template-provider@1.6.22
 - amplify-prompts@1.2.0
 - amplify-provider-awscloudformation@4.61.0
 - amplify-python-function-runtime-provider@1.9.12
 - amplify-util-import@1.5.13
 - amplify-util-mock@3.34.6
 - graphql-auth-transformer@6.24.23
 - graphql-connection-transformer@4.21.23
 - graphql-dynamodb-transformer@6.22.23
 - graphql-elasticsearch-transformer@4.12.2
 - graphql-function-transformer@2.5.22
 - graphql-http-transformer@4.18.10
 - graphql-key-transformer@2.23.23
 - graphql-predictions-transformer@2.5.22
 - graphql-relational-schema-transformer@2.18.7
 - graphql-transformer-common@4.19.10
 - graphql-transformer-core@6.30.0
 - graphql-transformers-e2e-tests@6.27.0
 - graphql-versioned-transformer@4.17.23

* ci: improve parallelism, add windows for e2e tests (#8282)

* chore: add additional instance types to @searchable directive (#8284)

* ci: support multi-account e2e cleanup (#8082)

* test: update pinpoint test region mapping (#8295)

* ci: improve parallelization (#8292)

* test: fix cci pipeline flow (#8296)

* test: remove aws cli win install step (#8299)

* fix: logic to display searchable instance warning (#8297)

* test: dont run geo e2e tests on windows (#8300)

* test: revert test timeout change (#8301)

* Automatically retry CircleCi e2e tasks (#8306)

* test: fix gql e2e split test logic, remove unnecessary inter-job requirements (#8309)

* ci: remove retry wrapper on windows tests to prevent hanging (#8312)

* ci: use powershell to run windows tests (#8314)

* ci: skip rate limited windows tests (#8319)

* chore(release): Publish [ci skip]

 - @aws-amplify/cli@6.1.1
 - amplify-console-integration-tests@1.8.11
 - amplify-e2e-core@1.27.1
 - amplify-e2e-tests@2.51.1
 - @aws-amplify/graphql-searchable-transformer@0.6.2
 - amplify-migration-tests@3.1.11
 - amplify-provider-awscloudformation@4.61.1
 - amplify-util-mock@3.34.7
 - graphql-auth-transformer@6.24.24
 - graphql-elasticsearch-transformer@4.12.3
 - graphql-transformers-e2e-tests@6.27.1

* chore: add cloud-e2e script (#8334)

* ci: add automatic retry of failed tasks (#8338)

* test: update snapshot file to match renamed test file (#8333)

* build: run circleci validator on split-e2e-tests (#8313)

* ci: fix retry function (#8343)

* ci: track flaky tests in cloudwatch (#8339)

* ci: fix cleanup script context (#8344)

* feat: Custom policies IAM Policies for Lambda and Containers (#8068)

* Custom policy implementation

* feat: add custom policies file to function and API container

add custom policies file to function and API container, merge the custom policies to CFN template,
validation for regex of resources and actions in the custom policies file

* feat: changes for first PR

* feat: Some changes according to the PR comments

1. Add Json Schema to validate the customers input 2. some minor changes related to format issue 3.
error handle

* feat: replace env to current env in the resource when checkout and add env, and push

* feat: e2e test and replacing env

* feat: Minor changes for env replacement

* feat: remove changing env between env

* feat: Add cloudform type for type safety, move validation to provider-cloudformation, validation

* feat: remove some unused function and import, change regex for resource

* feat: Some changes according to the PR comment

* feat: changes according to PR comments

* feat: remove unused import

* feat: remove previous unused code

* feat: Changes according to PR comments

* feat: some changes according to PR comments

* feat: work on PR comments

* feat: rebase for conflict

* feat: rebase for failure of hooksmanager test failed

* feat: unit test

* feat: fix fail test

* feat: change default template of custom policies

* feat: fix failed test

* feat: PR comments

* feat: pr comments

* feat: fix failed test

* feat: PR comments from ED

Co-authored-by: Lu Han <lhnamz@amazon.com>

* ci: split some migration tests, fix retry issues, remove per-job cleanup (#8340)

* fix(graphql-model-transformer): fix open search instance check for v1 and v2 transformers (#8354)

* chore(release): Publish [ci skip]

 - amplify-app@3.0.14
 - amplify-category-analytics@2.21.23
 - amplify-category-api@2.33.0
 - amplify-category-auth@2.38.3
 - amplify-category-function@2.36.0
 - amplify-category-geo@1.0.2
 - amplify-category-hosting@2.7.23
 - amplify-category-interactions@2.6.7
 - amplify-category-predictions@2.9.14
 - amplify-category-storage@2.12.11
 - amplify-category-xr@2.8.23
 - amplify-cli-core@1.31.0
 - @aws-amplify/cli@6.2.0
 - amplify-console-hosting@1.9.14
 - amplify-console-integration-tests@1.8.12
 - amplify-container-hosting@1.3.25
 - amplify-dotnet-function-template-provider@1.5.23
 - amplify-dynamodb-simulator@1.19.14
 - amplify-e2e-core@1.28.0
 - amplify-e2e-tests@2.52.0
 - amplify-frontend-ios@2.20.16
 - amplify-frontend-javascript@2.24.3
 - amplify-go-function-runtime-provider@1.9.6
 - amplify-java-function-runtime-provider@1.8.16
 - amplify-migration-tests@3.1.12
 - amplify-nodejs-function-runtime-provider@1.6.13
 - amplify-nodejs-function-template-provider@1.6.23
 - amplify-provider-awscloudformation@4.62.0
 - amplify-python-function-runtime-provider@1.9.13
 - amplify-util-import@1.5.14
 - amplify-util-mock@3.34.8
 - graphql-auth-transformer@6.24.25
 - graphql-connection-transformer@4.21.24
 - graphql-dynamodb-transformer@6.22.24
 - graphql-elasticsearch-transformer@4.12.4
 - graphql-function-transformer@2.5.23
 - graphql-http-transformer@4.18.11
 - graphql-key-transformer@2.23.24
 - graphql-predictions-transformer@2.5.23
 - graphql-transformer-core@6.30.1
 - graphql-transformers-e2e-tests@6.27.2
 - graphql-versioned-transformer@4.17.24

* fix: opensearch warning, add optional chaining to get api category (#8371)

* fix: opensearch warning, add optional chaining to get api category

* fix: opensearch warning, add test with existing categories

* chore(graphql-model-transformer): use lodash for accessing deep object property (#8374)

* fix(amplify-category-api): custom policies attached to TaskRoleArn (#8376)

* test(amplify-e2e-tests): ignore custom policies container tests for windows (#8378)

* chore(release): Publish [ci skip]

 - @aws-amplify/cli@6.2.1
 - amplify-provider-awscloudformation@4.62.1
 - amplify-util-mock@3.34.9

* feat(graphql-default-value-transformer): implemented default value directive (#8291)

* feat(graphql-model-transformer): index/primarykey datastore selective sync capability (#8240)

* feat(amplify-provider-awscloudformation): merge user config with transform generated resolvers (#8262)

* feat(amplify-provider-awscloudformation): enable custom resolvers for v2 transformer (#8332)

* feat(cli): add post env add plugin event (#8220)

* feat(cli): add post env add plugin event

* chore(cli): run post env add hook on amplify init

* chore: conditionally print update auth warning (#8207)

* Revert "fix: fixes e2e bug" (#8397)

* Revert "fix: fixes e2e bug (#7067)"

This reverts commit 18c9a31.

* Update packages/amplify-cli/src/context-manager.ts

added ? for type checking

* fix(amplify-category-api): fixed api to reference stack name and deployment bucket (#8145)

* fix(amplify-category-api): fixed api to reference stack name and deployment bucket

* fix: addressed pr comments

* revert: temporarily setup new apps with old pluralization (#8401)

* test(graphql-model-transformer): fixed plurality e2e test (#8406)

* Revert custom override resolvers (#8409)

* Revert "feat(amplify-provider-awscloudformation): enable custom resolvers for v2 transformer (#8332)"

This reverts commit 1c73042.

* Revert "feat(amplify-provider-awscloudformation): merge user config with transform generated resolvers (#8262)"

This reverts commit f25abbf.

* chore(amplify-e2e-tests): fix config.yml file (#8411)

* chore(release): Publish [ci skip]

 - amplify-app@3.0.15
 - amplify-category-analytics@2.21.24
 - amplify-category-api@2.33.1
 - amplify-category-auth@2.38.4
 - amplify-category-function@2.36.1
 - amplify-category-geo@1.0.3
 - amplify-category-hosting@2.7.24
 - amplify-category-interactions@2.6.8
 - amplify-category-predictions@2.9.15
 - amplify-category-storage@2.12.12
 - amplify-category-xr@2.8.24
 - amplify-cli-core@1.31.1
 - @aws-amplify/cli@6.3.0
 - amplify-console-hosting@1.9.15
 - amplify-console-integration-tests@1.8.13
 - amplify-container-hosting@1.3.26
 - amplify-dotnet-function-template-provider@1.5.24
 - amplify-dynamodb-simulator@1.19.15
 - amplify-e2e-core@1.29.0
 - amplify-e2e-tests@2.53.0
 - amplify-frontend-ios@2.20.17
 - amplify-frontend-javascript@2.24.4
 - amplify-go-function-runtime-provider@1.9.7
 - @aws-amplify/graphql-default-value-transformer@0.2.0
 - @aws-amplify/graphql-function-transformer@0.4.5
 - @aws-amplify/graphql-http-transformer@0.5.5
 - @aws-amplify/graphql-index-transformer@0.4.0
 - @aws-amplify/graphql-model-transformer@0.6.4
 - @aws-amplify/graphql-predictions-transformer@0.3.5
 - @aws-amplify/graphql-relational-transformer@0.3.1
 - @aws-amplify/graphql-searchable-transformer@0.6.3
 - @aws-amplify/graphql-transformer-core@0.9.2
 - @aws-amplify/graphql-transformer-interfaces@1.10.0
 - amplify-java-function-runtime-provider@1.8.17
 - amplify-migration-tests@3.1.13
 - amplify-nodejs-function-runtime-provider@1.6.14
 - amplify-nodejs-function-template-provider@1.6.24
 - amplify-provider-awscloudformation@4.63.0
 - amplify-python-function-runtime-provider@1.9.14
 - amplify-util-import@1.5.15
 - amplify-util-mock@3.34.10
 - graphql-auth-transformer@6.24.26
 - graphql-connection-transformer@4.21.25
 - graphql-dynamodb-transformer@6.22.25
 - graphql-elasticsearch-transformer@4.12.5
 - graphql-function-transformer@2.5.24
 - graphql-http-transformer@4.18.12
 - graphql-key-transformer@2.23.25
 - graphql-predictions-transformer@2.5.24
 - graphql-transformer-core@6.30.2
 - graphql-transformers-e2e-tests@6.28.0
 - graphql-versioned-transformer@4.17.25

* fix: api containers on repushing does not fail (#8416)

* fix: api containers on repushing does not fail

* feat: Geo category plugin - support for additional regions (#8373)

* feat(amplify-category-geo): use custom resource constructs
* fix(amplify-category-geo): remove pre-push hook
* fix(amplify-category-geo): move lambdas to separate files
* fix(amplify-category-geo): update stack test snapshots

* fix: null check (#8429)

* chore(release): Publish [ci skip]

 - amplify-app@3.0.16
 - amplify-category-api@2.33.2
 - amplify-category-geo@1.1.0
 - @aws-amplify/cli@6.3.1
 - amplify-console-integration-tests@1.8.14
 - amplify-container-hosting@1.3.27
 - amplify-e2e-core@1.30.0
 - amplify-e2e-tests@2.54.0
 - amplify-frontend-javascript@2.25.0
 - amplify-migration-tests@3.1.14
 - amplify-provider-awscloudformation@4.64.0
 - amplify-util-mock@3.34.11

* Merge GraphQL v-next to master (#8287)

* feat(cli-api): improve add and update api

* Delete sam.schema.json

* Delete cloudformation.schema.json

* remove auto apply authmode code from update api workflow

* remove unused import

* fix lint issues

* relative import

* fix dependencies

* fix lint comments

* remove unused code

* updated v2 templates

* remove unused import

* change to use executeProviderUtils

* fixed formatting

* several minor tweaks to add and update api workflow

* update conflict detection label

* remove app not deployed message

* auto apply auth mode

* auto apply authmode for v2 tranformer

* add type amplify_global to v2 schemas

* Update many-relationship-schema-v2.graphql

* Update single-object-auth-schema-v2.graphql

* Update single-object-schema-v2.graphql

* feat: add @auth (#1)

* feat: add @auth base package with Access Control

* feat: graphql auth v2 add schemaChanges, iam policy generation, and query/read resolvers

* feat: graphql auth v2 add auth on mutation and subscription resolvers

* feat(amplify-category-api): add global sandbox mode directive on schema generation (#8074)

* feat(amplify-category-api): add global sandbox mode directive on schema generation

* test(amplify-e2e-tests): add e2e tests for sandbox mode

* test(amplify-category-api): add unit test for generating sandbox mode directive; rm unused method

* feat(cli): add sandbox mode warning to amplify status (#8078)

* feat(amplify-category-api): prompt api key creation on amplify push (#8124)

* feat(amplify-category-api): prompt api key create when invalid with sandbox mode

* test(amplify-category-api): add unit tests for provider utils

* test(amplify-category-api): fix test for adding api key prompt

* refactor(cli): refactor api key prompt

* refactor(amplify-category-api): add api key with gql compiled

* feat: @model conflict resolution

* auth directive support for index, searchable, predictions, functions, and relational directives (#8146)

* feat: add support for index and updated unit and e2e tests

* feat: directive suport for functions, predictions, searchable, and relational

* test: updated unit tests for updated auth on directives

* @auth support for datastore and add has auth flag (#8168)

* feat: @auth v2 on datastore and updated unit tests
* feat: add hasAuthFlag

* feat(graphql-model-transformer): set up transformer for sandbox mode directive (#8138)

* feat(graphql-model-transformer): add sandbox mode support to model transformer

* refactor(graphql-transformer-core): do not persist sandbox mode meta data

* fix: add command to show access control and field auth evaluation in access control (#8174)

* fix: admin ui app state check and auth transformer index resolver name (#8175)

* fix: has auth typo and qref on field conditions for private rule (#8180)

* fix(graphql-model-transformer): use hasAuth flag when sandbox mode is disabled (#8179)

* fix: update hasMany to use join table name, sync config warning, updated unit test

* fix: add empty payload for sandbox mode

* fix: snapshot test for @searchable

* fix: udpated snapshot for index and relation directives

* fix: use same none datasource name as resolver manager

* fix: iam resolver check and relational payload (#8234)

* fix: add datastore query in config for auth (#8246)

* fix: auth filter expression (#8248)

* fix: update iam auth to include roles in before template (#8259)

* chore: rebase and update auth dependencies

* fix(graphql-model-transformer): iam role name does not exceed 64 characters

* fix: add base e2e tests with auth fixes

Co-authored-by: Danielle Adams <6271256+danielleadams@users.noreply.github.com>
Co-authored-by: lazpavel <85319655+lazpavel@users.noreply.github.com>

* fix: update dependency versions

* feat(amplify-provider-awscloudformation): match env directive field for sandbox mode (#3)

* fix(amplify-provider-awscloudformation): invoke api function from invoker plugin (#8274)

* fix(amplify-provider-awscloudformation): invoke api function from invoker plugin

* fix(graphql-index-transformer): update snapshots for tests

* test(amplify-provider-awscloudformation): fix tests for sandbox helpers

* fix(amplify-provider-awscloudformation): remove sandbox mode directive from schema before transform (#8272)

* chore(graphql-auth-transformer): update deps for auth transformer and api category

* fix(graphql-model-transformer): revert code to master version

* test(graphql-model-transformer): update the snapshot for the amplify/graphql-model-transformer test

* chore: remove showacm as that was for testing purposes only

* test(amplify-e2e-tests): update to use correct helpers

* test(graphql-transformers-e2e-tests): enable sandbox mode on v2 transforms

* test(amplify-e2e-tests): replace updateAPIResolution imports with new methods

* fix: get item query for @model and relational directives

* auto apply auth fix

* auto apply auth modes v2 fix (#4)

* test(amplify-e2e-tests): rm sandbox e2e test

* fix(amplify-provider-awscloudformation): fix api key creation when sandbox mode enable

* test(amplify-e2e-tests): create random app name generator for broken tests

* fix api e2e workflow

* test(amplify-e2e-core): add random app name generator, update snapshots and imports

* chore(graphql-auth-transformer): upgrade deps in auth transformer

* update e2e test to use new api workflow (#5)

* feat(graphql-model-transformer): fix default value e2e test (#6)

* test(amplify-e2e-tests): add missing helper

* e2e fix for auth tests using new api workflow  (#7)

* update e2e test to use new api workflow

* fix(test): update auth tests with new api workflow

* test(amplify-e2e-tests): add missing helper and fix broken test

Co-authored-by: Christopher Sundersingh <sundersc@amazon.com>
Co-authored-by: Christopher Sundersingh <83315412+sundersc@users.noreply.github.com>
Co-authored-by: Josue Ruiz <7465495+SwaySway@users.noreply.github.com>
Co-authored-by: lazpavel <85319655+lazpavel@users.noreply.github.com>
Co-authored-by: Colin Ihrig <colihrig@amazon.com>

* fix: loosen @Index validation (#8445)

Previously, the validation was too strict, and did not match
the v1 behavior. This commit updates the validationt to match v1.

Co-authored-by: Colin Ihrig <colihrig@amazon.com>

* feat(graphql-model-transformer): added transformer version feature flag (#8328)

* feat(amplify-provider-awscloudformation): merge user config with transform generated resolvers (#8447)

* fix(graphql-model-transformer): fixed schema template options check for transformer version (#8449)

* fix(amplify-appsync-simulator): fixed app sync simulator util auth type mock (#8451)

* fix: @auth fix relational auth, authv2 e2e with utils and fixes (#8450)

* feat(amplify-provider-awscloudformation): enable custom resolvers for v2 transformer (#8454)

* chore: update update-notifier dependency (#8457)

* chore: update update-notifier dependency

* Update config.yml

* fix: auth on getting related model name and searchablevNext e2e (#8455)

* test(amplify-e2e-tests): ignore resolvers tests for windows (#8458)

* fix(graphql): correct api key type on auto apply auth mode (#8459)

* test(graphql-model-transformer): added e2e test for query and mutation rename (#8461)

* fix: add @manytomany join table auth (#8460)

* fix: add @manytomany join table auth

This commit adds auth to the many to many join table.

* fix: break dependency cycle

This commit moves several tests from the @auth v2 package to the
relational v2 package to break a dependency cycle.

* fix: address lgtm bot comment

Co-authored-by: Colin Ihrig <colihrig@amazon.com>

* fix: @function vNext payload, remove unused code, and update common mapping tempalte function (#8462)

* test: fix auth configuration for test file (#8463)

Co-authored-by: Colin Ihrig <colihrig@amazon.com>

* test: fix sign in for gql clients (#8464)

* test: split up flaky test suite (#8468)

Co-authored-by: Colin Ihrig <colihrig@amazon.com>

* test: update split script for new suites (#8469)

migration-api-key-migration2 was recently split into multiple
suites. The original suite was special cased in the
split-e2e-tests.ts script. This commit updates the new suites
to have the same special casing.

Co-authored-by: Colin Ihrig <colihrig@amazon.com>

* feat(amplify-category-storage): headless support for S3 (#8423)

Co-authored-by: Attila Hajdrik <hajdrik@amazon.com>
Co-authored-by: Edward Foyle <foyleef@amazon.com>

* test: fix e2e failures for import_s3 (#8483)

* test: fix some Windows e2e tests (#8372)

* fix: use proper singleselect for windows e2e tests

* ci: prevent jest from hanging aftetr completion

* ci: do not use node for pkg binary

* ci: try running all windows to see which pass

* ci: use multi-account retries on windows

* ci: use correct env var

* ci: pare down list of failing windows tests

* chore: skip additional tests

* chore: skip necessary windows tests

* chore: fix test lint

* fix(amplify-category-storage): add auth by default (#8498)

* test: fix post-test account cleanup (#8489)

* test: fix post-test account cleanup

* test: clarify error message

* build(deps): bump vm2 from 3.9.3 to 3.9.5 (#8493)

Bumps [vm2](https://github.com/patriksimek/vm2) from 3.9.3 to 3.9.5.
- [Release notes](https://github.com/patriksimek/vm2/releases)
- [Changelog](https://github.com/patriksimek/vm2/blob/master/CHANGELOG.md)
- [Commits](patriksimek/vm2@3.9.3...3.9.5)

---
updated-dependencies:
- dependency-name: vm2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: function comments to use os.EOL constant, ref #8177 (#8327)

* test: add test for get-project-details.ts (#8390)

* test: add test for fet-project-details.ts

* chore: fixed the description

* fix: update appsync simulators ip address validation (#8375)

* fix: update appsync simulators ip address validation

fix #8359

* address review comment

* test: port @http e2e tests to v2 (#8478)

* test: port @http e2e tests to v2

* fixup! test: port @http e2e tests to v2

Co-authored-by: Colin Ihrig <colihrig@amazon.com>

* fix(import-auth): headless interface test (#8402)

Co-authored-by: Abhishek Raj <rjabhi@amazon.com>

* fix(graphql): searchable default sort direction (#8481)

* fix(graphql): searchable default sort direction

* update snapshots

* fix(graphql): change aggregate field type to enum (#8484)

* fix(graphql): change aggregate field type to enum

* update E2E test

* chore(feature-req form): remove auto label and adjust wording to reflect form type (#8434)

* fix mismatch ajv version between amplify-cli-core and amplify-provider-awscloudformation (#8415)

* fix: improve trigger update error handling, ref #8280 (#8329)

* fix(amplify-nodejs-function-runtime-provider): catch yarn 2 error on lambda build (#8263)

* fix: #8254 invalid url is shown for branches with dash (#8260)

* feat: add byValue and byValues helper functions to select pick options by value (#8253)

* test(cli): add test for compare-plugins plugin-helpers (#8064)

* fix: pinpoint feature flag read (#8496)

* feat: flag to allow destructive schema changes (#8273)

* chore: dumping table changes

* chore: drop table POC

* feat: plumb destructive-updates flag

* feat: plumb rebuild

* chore: fix rebuild prompts

* test: adding unit and e2e tests

* feat: sweet jesus it works

* fix: iterative push lambda with updates

* chore: organize code better

* test: add unit and e2e tests

* chore: fit and finish

* chore: didn't save all the files

* test: fix some tests and add a couple more

* chore: address PR comments

* test: fix e2e failures

* chore: fix prompts dep version

* test: exclude new api tests from windows

* test: update test schema

* chore: address PR comments

* fix: messed up merge

* test: fix e2e failures

* test(graphql-predictions-transformer): added e2e tests for v2 predictions transformer (#8477)

* test(graphql-predictions-transformer): added e2e tests for v2 predictions transformer

* test(graphql-predictions-transformer): added e2e tests for v2 predictions transformer

* feat: version blocking for CLI (#8512)

* feat: version blocking for CLI

* chore: run split-tests

* ci: autogen cci config (#8510)

* test: remove quotes from enum in @searchable v2 test (#8523)

Refs: #8484

Co-authored-by: Colin Ihrig <colihrig@amazon.com>

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

This reverts commit 52edf2b.

Co-authored-by: Colin Ihrig <colihrig@amazon.com>

* fix: add schema directives for sync operation when conflict resolution is enabled (#8521)

* ci: reenable nightly jobs (#8529)

* Revert "ci: reenable nightly jobs" (#8530)

This reverts commit 0bbcd9e.

* fix(cli): amplify plugin scan command print correct version of inactive hosting plugins (#8130)

* fix(cli): amplify plugin scan command print correct version of inactive hosting plugins

Fix missing plugin version case of exists multiple plugins in same category

fix #8127

* refactor(cli): using `const` instead of `let`

* fix(amplify-dynamodb-simulator):callback revoked within time-limit (#7843)

* fix(amplify-dynamodb-simulator):callback revoked within time-limit

* fix(amplify-dynamodb-simulator):merged all beforeEach()/afterEach() into one

* try...catch added to clean up

* fix(graphql): add defensive check on getTablesRequiringReplacement (#8528)

* fix(graphql): add defensive check on getTablesRequiringReplacement

* correct return statement

* feat: generate list types as non-null (#8166)

* feat: generate list types as non-null

* test: update more snapshots

* fix: make corresponding change in v2 transformer

* fix: non null lists in v2 transformer

* chore: force cci rerun

* test: update one more snapshot

* test: who knew there were so many snapshots to update

* fix: add field auth on aggregation queries (#8508)

* fix: add a validation check for aws environment variables (#7933)

* fix: Move credential validation to the top function call

getProfileCredentials isn't always pulling from a file with an access key/secret key, so validation can error out in the case of source profiles. Moving this to the top function getProfiledAwsConfig and performing the validation on the AWS config instead means we can accommodate source profiles.

* Fix: add a validation check for aws environment variables

Co-authored-by: Vandenberg <mvanden@88665a1e266e.ant.amazon.com>

* fix: broken docs link in error message (#8436)

* ci: prevent setup from timing out during yarn installation (#8542)

* ci: prevent setup from timing out during yarn installation

* ci: use new package.json inside scripts dir

* ci: extract repoRoot to variable

* ci: re-enable nightly workflows (#8543)

* Revert "Revert "ci: reenable nightly jobs" (#8530)"

This reverts commit 5fead3e.

* ci: re-enable nightly workflows

* ci: use pipeline params to trigger workflows

* ci: allow schedule to be determined by nightly-jobs branch

* feat: FF for override stacks (#8228)

* feat: root stack override (#8276)

* feat: added root stack transformation

* feat: adding root-stack-builder

* feat: added e2e and migration tests

* fix: minor fixes

* fix: fixes unit tests

* fix: address comments

* feat: adding rootstack types to overrides helper package (#8298)

* feat: ddb overrides and flow refactor

* feat: ddb overrides

* feat: add migration logic

* fix: remove older files post migration

* fix: address PR comments

* fix: remove inquirer and use amplify prompts instead

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* chore: ddb walkthrough refactor and override tests (#8364)

* chore: overrides ddb and walthrough refactor tests

* chore: address pr comments

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* feat: Auth refactor to  use cdk, eliminate EJS, overrides functionality (#8355)

* feat: add auth override

* fix: auth state unit tests working

* feat: auth e2e fixes and migration e2e included

* fix: fixes package name

* fix: unit tests fix

* fix: unit tests

* fix: fixing overwritten files

* fix: added vm2 and addressed comments

* fix: minor fixes and e2e test for overrides

* fix: cli-core unit test

* fix: userPool group unit test

* fix: minor refractor and comments

* chore: lgtm warnings

* fix: minor fixes

* fix: unit tests

* (feat) Override for S3 - ( includues refactor s3-walkthrough and migrate) (#8383)

Co-authored-by: Sachin Panemangalore <sachinrp@amazon.com>

* fix: fixes dependsOn parameter and auth migration test (#8480)

* fix: dependsOn fix

* chore: address comments

* chore: remove JSON parsing

* fix: default migration set to true

* fix: added public access to scoped packages (#8485)

* fix: adds typescript json dependency (#8487)

* fix: enable scoped packages in plugin platform (#8492)

* fix: adds userPool resourceName instead of authResource (#8497)

* fix: adds userPool resourceName instead of authResource

* fix: roleName in userPool groups

* (bug-fix/reconcile-headless) remove groupList from userInputs, fix single-group, deploy errors (#8501)

Co-authored-by: Sachin Panemangalore <sachinrp@amazon.com>

* fix: userPool group template fixes (#8515)

* fix: template and naming fixed

* fix: addressed comments

* (fix) Call Auth migration from S3 migration for all auth resources in S3 (#8511)

* (fix) Call Auth migration from S3 migration for all auth resources used by S3

* (fix) use invokePluginMethod instead of direct category calls

* (fix) unit-test for s3 migration

Co-authored-by: Sachin Panemangalore <sachinrp@amazon.com>

* (fix) s3 add with no-auth resource should succeed (#8520)

Co-authored-by: Sachin Panemangalore <sachinrp@amazon.com>

* (fix) amplify override storage fails with missing tsconfig.json (#8556)

Co-authored-by: Sachin Panemangalore <sachinrp@amazon.com>

* fix: rebase extOverrides with master

* fix: getSupportedServices function

* fix: rebase leftovers

Co-authored-by: aws-amplify-bot <aws@amazon.com>
Co-authored-by: John Corser <johnpc@umich.edu>
Co-authored-by: Yathi <511386+yuth@users.noreply.github.com>
Co-authored-by: Edward Foyle <foyleef@amazon.com>
Co-authored-by: josef <josef.aidt@gmail.com>
Co-authored-by: Ammar <56042290+ammarkarachi@users.noreply.github.com>
Co-authored-by: Lu Han <lhnamz@amazon.com>
Co-authored-by: Pavel Lazar <85319655+lazpavel@users.noreply.github.com>
Co-authored-by: Danielle Adams <6271256+danielleadams@users.noreply.github.com>
Co-authored-by: Phani Srikar Edupuganti <55896475+phani-srikar@users.noreply.github.com>
Co-authored-by: Christopher Sundersingh <sundersc@amazon.com>
Co-authored-by: Christopher Sundersingh <83315412+sundersc@users.noreply.github.com>
Co-authored-by: Josue Ruiz <7465495+SwaySway@users.noreply.github.com>
Co-authored-by: Colin Ihrig <colihrig@amazon.com>
Co-authored-by: Colin Ihrig <cjihrig@gmail.com>
Co-authored-by: Attila Hajdrik <hajdrik@amazon.com>
Co-authored-by: John Hockett <jhockett@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yoshiaki Togami <62130798+togami2864@users.noreply.github.com>
Co-authored-by: Abhishek Raj <abhi7cronaldo@gmail.com>
Co-authored-by: Abhishek Raj <rjabhi@amazon.com>
Co-authored-by: siegerts <stephen.siegert@gmail.com>
Co-authored-by: osddeitf <37999210+osddeitf@users.noreply.github.com>
Co-authored-by: MURAKAMI Masahiko <fossamagna2@gmail.com>
Co-authored-by: Stuti Prasad <43947328+studpeps@users.noreply.github.com>
Co-authored-by: Marc VandenBerg <marc.vandenberg1@gmail.com>
Co-authored-by: Vandenberg <mvanden@88665a1e266e.ant.amazon.com>
Co-authored-by: Kaustav Ghosh <kaustav.ghosh19@gmail.com>
Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>
Co-authored-by: Sachin Panemangalore <83682223+sachscode@users.noreply.github.com>
Co-authored-by: Sachin Panemangalore <sachinrp@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
first-time-contributor The contribution is the first for this user in the repo
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants