Merge branch 'main' into chore/datastore-multi-auth-e2e

aws-amplify · Sep 4, 2024 · 30a18d5 · 30a18d5
2 parents 29a7c48 + 6f7c254
commit 30a18d5
Show file tree

Hide file tree

Showing 37 changed files with 34 additions and 1,250 deletions.
diff --git a/packages/api/amplify_api/example/amplify/.config/project-config.json b/packages/api/amplify_api/example/amplify/.config/project-config.json
diff --git a/packages/api/amplify_api/example/amplify/README.md b/packages/api/amplify_api/example/amplify/README.md
diff --git a/packages/api/amplify_api/example/amplify/backend/api/apiintegmultiauth/cli-inputs.json b/packages/api/amplify_api/example/amplify/backend/api/apiintegmultiauth/cli-inputs.json
diff --git a/packages/api/amplify_api/example/amplify/backend/api/apiintegmultiauth/parameters.json b/packages/api/amplify_api/example/amplify/backend/api/apiintegmultiauth/parameters.json
diff --git a/...i/amplify_api/example/amplify/backend/api/apiintegmultiauth/resolvers/README.md b/...i/amplify_api/example/amplify/backend/api/apiintegmultiauth/resolvers/README.md
diff --git a/packages/api/amplify_api/example/amplify/backend/api/apiintegmultiauth/schema.graphql b/packages/api/amplify_api/example/amplify/backend/api/apiintegmultiauth/schema.graphql
diff --git a/...api/amplify_api/example/amplify/backend/api/apiintegmultiauth/stacks/CustomResources.json b/...api/amplify_api/example/amplify/backend/api/apiintegmultiauth/stacks/CustomResources.json
diff --git a/packages/api/amplify_api/example/amplify/backend/api/apiintegmultiauth/transform.conf.json b/packages/api/amplify_api/example/amplify/backend/api/apiintegmultiauth/transform.conf.json
diff --git a/packages/api/amplify_api/example/amplify/backend/api/multiAuthRest/cli-inputs.json b/packages/api/amplify_api/example/amplify/backend/api/multiAuthRest/cli-inputs.json
diff --git a/...mplify_api/example/amplify/backend/auth/apiintegmultiauth131fe55a131fe55a/cli-inputs.json b/...mplify_api/example/amplify/backend/auth/apiintegmultiauth131fe55a131fe55a/cli-inputs.json