Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into lil-bobby-tables
Browse files Browse the repository at this point in the history
  • Loading branch information
@edwardfoyle
edwardfoyle committed Sep 24, 2021
2 parents a1bfc13 + cf2a56d commit 7d6a130
Show file tree
Hide file tree
Showing 42 changed files with 1,837 additions and 1,628 deletions.
84 changes: 42 additions & 42 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1018,23 +1018,23 @@ jobs:
steps: *ref_5
environment:
TEST_SUITE: src/__tests__/geo-remove.test.ts
CLI_REGION: eu-west-2
CLI_REGION: eu-central-1
geo-update-amplify_e2e_tests:
working_directory: ~/repo
docker: *ref_1
resource_class: large
steps: *ref_5
environment:
TEST_SUITE: src/__tests__/geo-update.test.ts
CLI_REGION: eu-central-1
CLI_REGION: ap-northeast-1
geo-add-amplify_e2e_tests:
working_directory: ~/repo
docker: *ref_1
resource_class: large
steps: *ref_5
environment:
TEST_SUITE: src/__tests__/geo-add.test.ts
CLI_REGION: ap-northeast-1
CLI_REGION: ap-southeast-1
hostingPROD-amplify_e2e_tests:
working_directory: ~/repo
docker: *ref_1
Expand Down Expand Up @@ -1763,7 +1763,7 @@ jobs:
AMPLIFY_DIR: /home/circleci/repo/out
AMPLIFY_PATH: /home/circleci/repo/out/amplify-pkg-linux
TEST_SUITE: src/__tests__/geo-remove.test.ts
CLI_REGION: eu-west-2
CLI_REGION: eu-central-1
steps: *ref_6
geo-update-amplify_e2e_tests_pkg_linux:
working_directory: ~/repo
Expand All @@ -1773,7 +1773,7 @@ jobs:
AMPLIFY_DIR: /home/circleci/repo/out
AMPLIFY_PATH: /home/circleci/repo/out/amplify-pkg-linux
TEST_SUITE: src/__tests__/geo-update.test.ts
CLI_REGION: eu-central-1
CLI_REGION: ap-northeast-1
steps: *ref_6
geo-add-amplify_e2e_tests_pkg_linux:
working_directory: ~/repo
Expand All @@ -1783,7 +1783,7 @@ jobs:
AMPLIFY_DIR: /home/circleci/repo/out
AMPLIFY_PATH: /home/circleci/repo/out/amplify-pkg-linux
TEST_SUITE: src/__tests__/geo-add.test.ts
CLI_REGION: ap-northeast-1
CLI_REGION: ap-southeast-1
steps: *ref_6
hostingPROD-amplify_e2e_tests_pkg_linux:
working_directory: ~/repo
Expand Down Expand Up @@ -2630,36 +2630,30 @@ workflows:
filters: *ref_10
requires:
- migration-api-connection-migration-amplify_e2e_tests
- geo-remove-amplify_e2e_tests:
context: *ref_8
post-steps: *ref_9
filters: *ref_10
requires:
- schema-auth-11-amplify_e2e_tests
- feature-flags-amplify_e2e_tests:
context: *ref_8
post-steps: *ref_9
filters: *ref_10
requires:
- import_s3_1-amplify_e2e_tests
- schema-auth-11-amplify_e2e_tests
- schema-versioned-amplify_e2e_tests:
context: *ref_8
post-steps: *ref_9
filters: *ref_10
requires:
- schema-auth-7-amplify_e2e_tests
- import_s3_1-amplify_e2e_tests
- plugin-amplify_e2e_tests:
context: *ref_8
post-steps: *ref_9
filters: *ref_10
requires:
- schema-auth-3-amplify_e2e_tests
- schema-auth-7-amplify_e2e_tests
- hooks-amplify_e2e_tests:
context: *ref_8
post-steps: *ref_9
filters: *ref_10
requires:
- geo-remove-amplify_e2e_tests
- schema-auth-3-amplify_e2e_tests
- auth_6-amplify_e2e_tests:
context: *ref_8
post-steps: *ref_9
Expand Down Expand Up @@ -2702,7 +2696,7 @@ workflows:
filters: *ref_10
requires:
- schema-model-amplify_e2e_tests
- geo-update-amplify_e2e_tests:
- geo-remove-amplify_e2e_tests:
context: *ref_8
post-steps: *ref_9
filters: *ref_10
Expand Down Expand Up @@ -2731,7 +2725,7 @@ workflows:
post-steps: *ref_9
filters: *ref_10
requires:
- geo-update-amplify_e2e_tests
- geo-remove-amplify_e2e_tests
- api_5-amplify_e2e_tests:
context: *ref_8
post-steps: *ref_9
Expand Down Expand Up @@ -2774,7 +2768,7 @@ workflows:
filters: *ref_10
requires:
- schema-function-amplify_e2e_tests
- geo-add-amplify_e2e_tests:
- geo-update-amplify_e2e_tests:
context: *ref_8
post-steps: *ref_9
filters: *ref_10
Expand Down Expand Up @@ -2803,7 +2797,7 @@ workflows:
post-steps: *ref_9
filters: *ref_10
requires:
- geo-add-amplify_e2e_tests
- geo-update-amplify_e2e_tests
- api_4-amplify_e2e_tests:
context: *ref_8
post-steps: *ref_9
Expand Down Expand Up @@ -2846,30 +2840,36 @@ workflows:
filters: *ref_10
requires:
- function_4-amplify_e2e_tests
- hostingPROD-amplify_e2e_tests:
- geo-add-amplify_e2e_tests:
context: *ref_8
post-steps: *ref_9
filters: *ref_10
requires:
- env-amplify_e2e_tests
- amplify-app-amplify_e2e_tests:
- hostingPROD-amplify_e2e_tests:
context: *ref_8
post-steps: *ref_9
filters: *ref_10
requires:
- api_3-amplify_e2e_tests
- init-amplify_e2e_tests:
- amplify-app-amplify_e2e_tests:
context: *ref_8
post-steps: *ref_9
filters: *ref_10
requires:
- layer-amplify_e2e_tests
- pull-amplify_e2e_tests:
- init-amplify_e2e_tests:
context: *ref_8
post-steps: *ref_9
filters: *ref_10
requires:
- auth_5-amplify_e2e_tests
- pull-amplify_e2e_tests:
context: *ref_8
post-steps: *ref_9
filters: *ref_10
requires:
- geo-add-amplify_e2e_tests
- function_5-amplify_e2e_tests:
context: *ref_8
post-steps: *ref_9
Expand Down Expand Up @@ -3144,36 +3144,30 @@ workflows:
filters: *ref_13
requires:
- migration-api-connection-migration-amplify_e2e_tests_pkg_linux
- geo-remove-amplify_e2e_tests_pkg_linux:
context: *ref_11
post-steps: *ref_12
filters: *ref_13
requires:
- schema-auth-11-amplify_e2e_tests_pkg_linux
- feature-flags-amplify_e2e_tests_pkg_linux:
context: *ref_11
post-steps: *ref_12
filters: *ref_13
requires:
- import_s3_1-amplify_e2e_tests_pkg_linux
- schema-auth-11-amplify_e2e_tests_pkg_linux
- schema-versioned-amplify_e2e_tests_pkg_linux:
context: *ref_11
post-steps: *ref_12
filters: *ref_13
requires:
- schema-auth-7-amplify_e2e_tests_pkg_linux
- import_s3_1-amplify_e2e_tests_pkg_linux
- plugin-amplify_e2e_tests_pkg_linux:
context: *ref_11
post-steps: *ref_12
filters: *ref_13
requires:
- schema-auth-3-amplify_e2e_tests_pkg_linux
- schema-auth-7-amplify_e2e_tests_pkg_linux
- hooks-amplify_e2e_tests_pkg_linux:
context: *ref_11
post-steps: *ref_12
filters: *ref_13
requires:
- geo-remove-amplify_e2e_tests_pkg_linux
- schema-auth-3-amplify_e2e_tests_pkg_linux
- auth_6-amplify_e2e_tests_pkg_linux:
context: *ref_11
post-steps: *ref_12
Expand Down Expand Up @@ -3220,7 +3214,7 @@ workflows:
filters: *ref_13
requires:
- schema-model-amplify_e2e_tests_pkg_linux
- geo-update-amplify_e2e_tests_pkg_linux:
- geo-remove-amplify_e2e_tests_pkg_linux:
context: *ref_11
post-steps: *ref_12
filters: *ref_13
Expand Down Expand Up @@ -3249,7 +3243,7 @@ workflows:
post-steps: *ref_12
filters: *ref_13
requires:
- geo-update-amplify_e2e_tests_pkg_linux
- geo-remove-amplify_e2e_tests_pkg_linux
- api_5-amplify_e2e_tests_pkg_linux:
context: *ref_11
post-steps: *ref_12
Expand Down Expand Up @@ -3296,7 +3290,7 @@ workflows:
filters: *ref_13
requires:
- schema-function-amplify_e2e_tests_pkg_linux
- geo-add-amplify_e2e_tests_pkg_linux:
- geo-update-amplify_e2e_tests_pkg_linux:
context: *ref_11
post-steps: *ref_12
filters: *ref_13
Expand Down Expand Up @@ -3325,7 +3319,7 @@ workflows:
post-steps: *ref_12
filters: *ref_13
requires:
- geo-add-amplify_e2e_tests_pkg_linux
- geo-update-amplify_e2e_tests_pkg_linux
- api_4-amplify_e2e_tests_pkg_linux:
context: *ref_11
post-steps: *ref_12
Expand Down Expand Up @@ -3372,30 +3366,36 @@ workflows:
filters: *ref_13
requires:
- function_4-amplify_e2e_tests_pkg_linux
- hostingPROD-amplify_e2e_tests_pkg_linux:
- geo-add-amplify_e2e_tests_pkg_linux:
context: *ref_11
post-steps: *ref_12
filters: *ref_13
requires:
- env-amplify_e2e_tests_pkg_linux
- amplify-app-amplify_e2e_tests_pkg_linux:
- hostingPROD-amplify_e2e_tests_pkg_linux:
context: *ref_11
post-steps: *ref_12
filters: *ref_13
requires:
- api_3-amplify_e2e_tests_pkg_linux
- init-amplify_e2e_tests_pkg_linux:
- amplify-app-amplify_e2e_tests_pkg_linux:
context: *ref_11
post-steps: *ref_12
filters: *ref_13
requires:
- layer-amplify_e2e_tests_pkg_linux
- pull-amplify_e2e_tests_pkg_linux:
- init-amplify_e2e_tests_pkg_linux:
context: *ref_11
post-steps: *ref_12
filters: *ref_13
requires:
- auth_5-amplify_e2e_tests_pkg_linux
- pull-amplify_e2e_tests_pkg_linux:
context: *ref_11
post-steps: *ref_12
filters: *ref_13
requires:
- geo-add-amplify_e2e_tests_pkg_linux
- function_5-amplify_e2e_tests_pkg_linux:
context: *ref_11
post-steps: *ref_12
Expand Down
88 changes: 44 additions & 44 deletions packages/amplify-category-api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,50 +17,50 @@
"test": "jest"
},
"dependencies": {
"@aws-cdk/assets": "~1.119.0",
"@aws-cdk/aws-apigateway": "~1.119.0",
"@aws-cdk/aws-apigatewayv2": "~1.119.0",
"@aws-cdk/aws-applicationautoscaling": "~1.119.0",
"@aws-cdk/aws-autoscaling": "~1.119.0",
"@aws-cdk/aws-autoscaling-common": "~1.119.0",
"@aws-cdk/aws-autoscaling-hooktargets": "~1.119.0",
"@aws-cdk/aws-certificatemanager": "~1.119.0",
"@aws-cdk/aws-cloudformation": "~1.119.0",
"@aws-cdk/aws-cloudfront": "~1.119.0",
"@aws-cdk/aws-cloudwatch": "~1.119.0",
"@aws-cdk/aws-codebuild": "~1.119.0",
"@aws-cdk/aws-codeguruprofiler": "~1.119.0",
"@aws-cdk/aws-codepipeline": "~1.119.0",
"@aws-cdk/aws-codepipeline-actions": "~1.119.0",
"@aws-cdk/aws-cognito": "~1.119.0",
"@aws-cdk/aws-ec2": "~1.119.0",
"@aws-cdk/aws-ecr": "~1.119.0",
"@aws-cdk/aws-ecr-assets": "~1.119.0",
"@aws-cdk/aws-ecs": "~1.119.0",
"@aws-cdk/aws-efs": "~1.119.0",
"@aws-cdk/aws-elasticloadbalancing": "~1.119.0",
"@aws-cdk/aws-elasticloadbalancingv2": "~1.119.0",
"@aws-cdk/aws-events": "~1.119.0",
"@aws-cdk/aws-iam": "~1.119.0",
"@aws-cdk/aws-kms": "~1.119.0",
"@aws-cdk/aws-lambda": "~1.119.0",
"@aws-cdk/aws-logs": "~1.119.0",
"@aws-cdk/aws-route53": "~1.119.0",
"@aws-cdk/aws-route53-targets": "~1.119.0",
"@aws-cdk/aws-s3": "~1.119.0",
"@aws-cdk/aws-s3-assets": "~1.119.0",
"@aws-cdk/aws-sam": "~1.119.0",
"@aws-cdk/aws-secretsmanager": "~1.119.0",
"@aws-cdk/aws-servicediscovery": "~1.119.0",
"@aws-cdk/aws-sns": "~1.119.0",
"@aws-cdk/aws-sns-subscriptions": "~1.119.0",
"@aws-cdk/aws-sqs": "~1.119.0",
"@aws-cdk/aws-ssm": "~1.119.0",
"@aws-cdk/cloud-assembly-schema": "~1.119.0",
"@aws-cdk/core": "~1.119.0",
"@aws-cdk/custom-resources": "~1.119.0",
"@aws-cdk/cx-api": "~1.119.0",
"@aws-cdk/region-info": "~1.119.0",
"@aws-cdk/assets": "~1.124.0",
"@aws-cdk/aws-apigateway": "~1.124.0",
"@aws-cdk/aws-apigatewayv2": "~1.124.0",
"@aws-cdk/aws-applicationautoscaling": "~1.124.0",
"@aws-cdk/aws-autoscaling": "~1.124.0",
"@aws-cdk/aws-autoscaling-common": "~1.124.0",
"@aws-cdk/aws-autoscaling-hooktargets": "~1.124.0",
"@aws-cdk/aws-certificatemanager": "~1.124.0",
"@aws-cdk/aws-cloudformation": "~1.124.0",
"@aws-cdk/aws-cloudfront": "~1.124.0",
"@aws-cdk/aws-cloudwatch": "~1.124.0",
"@aws-cdk/aws-codebuild": "~1.124.0",
"@aws-cdk/aws-codeguruprofiler": "~1.124.0",
"@aws-cdk/aws-codepipeline": "~1.124.0",
"@aws-cdk/aws-codepipeline-actions": "~1.124.0",
"@aws-cdk/aws-cognito": "~1.124.0",
"@aws-cdk/aws-ec2": "~1.124.0",
"@aws-cdk/aws-ecr": "~1.124.0",
"@aws-cdk/aws-ecr-assets": "~1.124.0",
"@aws-cdk/aws-ecs": "~1.124.0",
"@aws-cdk/aws-efs": "~1.124.0",
"@aws-cdk/aws-elasticloadbalancing": "~1.124.0",
"@aws-cdk/aws-elasticloadbalancingv2": "~1.124.0",
"@aws-cdk/aws-events": "~1.124.0",
"@aws-cdk/aws-iam": "~1.124.0",
"@aws-cdk/aws-kms": "~1.124.0",
"@aws-cdk/aws-lambda": "~1.124.0",
"@aws-cdk/aws-logs": "~1.124.0",
"@aws-cdk/aws-route53": "~1.124.0",
"@aws-cdk/aws-route53-targets": "~1.124.0",
"@aws-cdk/aws-s3": "~1.124.0",
"@aws-cdk/aws-s3-assets": "~1.124.0",
"@aws-cdk/aws-sam": "~1.124.0",
"@aws-cdk/aws-secretsmanager": "~1.124.0",
"@aws-cdk/aws-servicediscovery": "~1.124.0",
"@aws-cdk/aws-sns": "~1.124.0",
"@aws-cdk/aws-sns-subscriptions": "~1.124.0",
"@aws-cdk/aws-sqs": "~1.124.0",
"@aws-cdk/aws-ssm": "~1.124.0",
"@aws-cdk/cloud-assembly-schema": "~1.124.0",
"@aws-cdk/core": "~1.124.0",
"@aws-cdk/custom-resources": "~1.124.0",
"@aws-cdk/cx-api": "~1.124.0",
"@aws-cdk/region-info": "~1.124.0",
"@graphql-tools/merge": "^6.0.18",
"@octokit/rest": "^18.0.9",
"amplify-cli-core": "1.29.0",
Expand Down
Loading

0 comments on commit 7d6a130

Please sign in to comment.