Merge pull request #484 from aws-amplify/main

Release PR

Author: alharris-at

.circleci/config.base.yml

@@ -36,10 +36,10 @@ install_cli_with_local_codegen: &install_cli
     source .circleci/local_publish_helpers.sh
     startLocalRegistry "$(pwd)/.circleci/verdaccio.yaml"
     setNpmRegistryUrlToLocal
-    sudo npm install -g @aws-amplify/cli-internal
-    sudo npm install -g amplify-app
+    changeNpmGlobalPath
+    npm install -g @aws-amplify/cli-internal
     amplify -v
-    amplify-app --version
+    npm list --global --depth=1
     unsetNpmRegistryUrl
   working_directory: ~/repo
 
@@ -154,6 +154,8 @@ jobs:
     steps:
       - attach_workspace:
           at: ./
+      - restore_cache:
+          key: amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
       - restore_cache:
           key: amplify-verdaccio-cache-{{ .Branch }}-{{ .Revision }}
       - run: *install_cli

.circleci/config.yml

@@ -34,10 +34,10 @@ install_cli_with_local_codegen: &ref_3
     source .circleci/local_publish_helpers.sh
     startLocalRegistry "$(pwd)/.circleci/verdaccio.yaml"
     setNpmRegistryUrlToLocal
-    sudo npm install -g @aws-amplify/cli-internal
-    sudo npm install -g amplify-app
+    changeNpmGlobalPath
+    npm install -g @aws-amplify/cli-internal
     amplify -v
-    amplify-app --version
+    npm list --global --depth=1
     unsetNpmRegistryUrl
   working_directory: ~/repo
 clean_up_e2e_resources: &ref_5
@@ -157,6 +157,8 @@ jobs:
     steps: &ref_4
       - attach_workspace:
           at: ./
+      - restore_cache:
+          key: 'amplify-codegen-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}'
       - restore_cache:
           key: 'amplify-verdaccio-cache-{{ .Branch }}-{{ .Revision }}'
       - run: *ref_3
@@ -241,134 +243,142 @@ jobs:
     environment:
       TEST_SUITE: src/__tests__/add-codegen-js.test.ts
       CLI_REGION: ap-southeast-1
+  model-introspection-codegen-e2e-test:
+    working_directory: ~/repo
+    parameters: *ref_0
+    executor: << parameters.os >>
+    steps: *ref_4
+    environment:
+      TEST_SUITE: src/__tests__/model-introspection-codegen.test.ts
+      CLI_REGION: ap-southeast-2
   add-codegen-ios-e2e-test:
     working_directory: ~/repo
     parameters: *ref_0
     executor: << parameters.os >>
     steps: *ref_4
     environment:
       TEST_SUITE: src/__tests__/add-codegen-ios.test.ts
-      CLI_REGION: ap-southeast-2
+      CLI_REGION: us-east-2
   add-codegen-android-e2e-test:
     working_directory: ~/repo
     parameters: *ref_0
     executor: << parameters.os >>
     steps: *ref_4
     environment:
       TEST_SUITE: src/__tests__/add-codegen-android.test.ts
-      CLI_REGION: us-east-2
+      CLI_REGION: us-west-1
   datastore-modelgen-flutter-e2e-test:
     working_directory: ~/repo
     parameters: *ref_0
     executor: << parameters.os >>
     steps: *ref_4
     environment:
       TEST_SUITE: src/__tests__/datastore-modelgen-flutter.test.ts
-      CLI_REGION: us-west-1
+      CLI_REGION: eu-west-2
   datastore-modelgen-ios-e2e-test:
     working_directory: ~/repo
     parameters: *ref_0
     executor: << parameters.os >>
     steps: *ref_4
     environment:
       TEST_SUITE: src/__tests__/datastore-modelgen-ios.test.ts
-      CLI_REGION: eu-west-2
+      CLI_REGION: eu-central-1
   datastore-modelgen-android-e2e-test:
     working_directory: ~/repo
     parameters: *ref_0
     executor: << parameters.os >>
     steps: *ref_4
     environment:
       TEST_SUITE: src/__tests__/datastore-modelgen-android.test.ts
-      CLI_REGION: eu-central-1
+      CLI_REGION: ap-northeast-1
   datastore-modelgen-js-e2e-test:
     working_directory: ~/repo
     parameters: *ref_0
     executor: << parameters.os >>
     steps: *ref_4
     environment:
       TEST_SUITE: src/__tests__/datastore-modelgen-js.test.ts
-      CLI_REGION: ap-northeast-1
+      CLI_REGION: ap-southeast-1
   remove-codegen-android-e2e-test:
     working_directory: ~/repo
     parameters: *ref_0
     executor: << parameters.os >>
     steps: *ref_4
     environment:
       TEST_SUITE: src/__tests__/remove-codegen-android.test.ts
-      CLI_REGION: ap-southeast-1
+      CLI_REGION: ap-southeast-2
   remove-codegen-ios-e2e-test:
     working_directory: ~/repo
     parameters: *ref_0
     executor: << parameters.os >>
     steps: *ref_4
     environment:
       TEST_SUITE: src/__tests__/remove-codegen-ios.test.ts
-      CLI_REGION: ap-southeast-2
+      CLI_REGION: us-east-2
   remove-codegen-js-e2e-test:
     working_directory: ~/repo
     parameters: *ref_0
     executor: << parameters.os >>
     steps: *ref_4
     environment:
       TEST_SUITE: src/__tests__/remove-codegen-js.test.ts
-      CLI_REGION: us-east-2
+      CLI_REGION: us-west-1
   feature-flags-e2e-test:
     working_directory: ~/repo
     parameters: *ref_0
     executor: << parameters.os >>
     steps: *ref_4
     environment:
       TEST_SUITE: src/__tests__/feature-flags.test.ts
-      CLI_REGION: us-west-1
+      CLI_REGION: eu-west-2
   configure-codegen-ios-e2e-test:
     working_directory: ~/repo
     parameters: *ref_0
     executor: << parameters.os >>
     steps: *ref_4
     environment:
       TEST_SUITE: src/__tests__/configure-codegen-ios.test.ts
-      CLI_REGION: eu-west-2
+      CLI_REGION: eu-central-1
   configure-codegen-android-e2e-test:
     working_directory: ~/repo
     parameters: *ref_0
     executor: << parameters.os >>
     steps: *ref_4
     environment:
       TEST_SUITE: src/__tests__/configure-codegen-android.test.ts
-      CLI_REGION: eu-central-1
+      CLI_REGION: ap-northeast-1
   configure-codegen-js-e2e-test:
     working_directory: ~/repo
     parameters: *ref_0
     executor: << parameters.os >>
     steps: *ref_4
     environment:
       TEST_SUITE: src/__tests__/configure-codegen-js.test.ts
-      CLI_REGION: ap-northeast-1
+      CLI_REGION: ap-southeast-1
   graphql-codegen-android-e2e-test:
     working_directory: ~/repo
     parameters: *ref_0
     executor: << parameters.os >>
     steps: *ref_4
     environment:
       TEST_SUITE: src/__tests__/graphql-codegen-android.test.ts
-      CLI_REGION: ap-southeast-1
+      CLI_REGION: ap-southeast-2
   graphql-codegen-js-e2e-test:
     working_directory: ~/repo
     parameters: *ref_0
     executor: << parameters.os >>
     steps: *ref_4
     environment:
       TEST_SUITE: src/__tests__/graphql-codegen-js.test.ts
-      CLI_REGION: ap-southeast-2
+      CLI_REGION: us-east-2
   graphql-codegen-ios-e2e-test:
     working_directory: ~/repo
     parameters: *ref_0
     executor: << parameters.os >>
     steps: *ref_4
     environment:
       TEST_SUITE: src/__tests__/graphql-codegen-ios.test.ts
-      CLI_REGION: us-east-2
+      CLI_REGION: us-west-1
 workflows:
   version: 2
   e2e_resource_cleanup:
@@ -429,27 +439,28 @@ workflows:
           os: l
           requires:
             - push-codegen-ios-e2e-test
+            - add-codegen-ios-e2e-test
+            - remove-codegen-ios-e2e-test
+            - graphql-codegen-js-e2e-test
+            - push-codegen-android-e2e-test
             - add-codegen-android-e2e-test
             - remove-codegen-js-e2e-test
             - graphql-codegen-ios-e2e-test
-            - push-codegen-android-e2e-test
+            - push-codegen-js-e2e-test
             - datastore-modelgen-flutter-e2e-test
             - feature-flags-e2e-test
-            - push-codegen-js-e2e-test
+            - pull-codegen-e2e-test
             - datastore-modelgen-ios-e2e-test
             - configure-codegen-ios-e2e-test
-            - pull-codegen-e2e-test
+            - env-codegen-e2e-test
             - datastore-modelgen-android-e2e-test
             - configure-codegen-android-e2e-test
-            - env-codegen-e2e-test
+            - add-codegen-js-e2e-test
             - datastore-modelgen-js-e2e-test
             - configure-codegen-js-e2e-test
-            - add-codegen-js-e2e-test
+            - model-introspection-codegen-e2e-test
             - remove-codegen-android-e2e-test
             - graphql-codegen-android-e2e-test
-            - add-codegen-ios-e2e-test
-            - remove-codegen-ios-e2e-test
-            - graphql-codegen-js-e2e-test
       - push-codegen-ios-e2e-test:
           context: &ref_6
             - cleanup-resources
@@ -464,21 +475,21 @@ workflows:
                 - main
                 - e2e-testing
                 - /tagged-release\/.*/
-      - add-codegen-android-e2e-test:
+      - add-codegen-ios-e2e-test:
           context: *ref_6
           os: l
           requires:
             - publish_to_local_registry
           post-steps: *ref_7
           filters: *ref_8
-      - remove-codegen-js-e2e-test:
+      - remove-codegen-ios-e2e-test:
           context: *ref_6
           os: l
           requires:
             - publish_to_local_registry
           post-steps: *ref_7
           filters: *ref_8
-      - graphql-codegen-ios-e2e-test:
+      - graphql-codegen-js-e2e-test:
           context: *ref_6
           os: l
           requires:
@@ -492,14 +503,21 @@ workflows:
             - publish_to_local_registry
           post-steps: *ref_7
           filters: *ref_8
-      - datastore-modelgen-flutter-e2e-test:
+      - add-codegen-android-e2e-test:
           context: *ref_6
           os: l
           requires:
             - publish_to_local_registry
           post-steps: *ref_7
           filters: *ref_8
-      - feature-flags-e2e-test:
+      - remove-codegen-js-e2e-test:
+          context: *ref_6
+          os: l
+          requires:
+            - publish_to_local_registry
+          post-steps: *ref_7
+          filters: *ref_8
+      - graphql-codegen-ios-e2e-test:
           context: *ref_6
           os: l
           requires:
@@ -513,14 +531,14 @@ workflows:
             - publish_to_local_registry
           post-steps: *ref_7
           filters: *ref_8
-      - datastore-modelgen-ios-e2e-test:
+      - datastore-modelgen-flutter-e2e-test:
           context: *ref_6
           os: l
           requires:
             - publish_to_local_registry
           post-steps: *ref_7
           filters: *ref_8
-      - configure-codegen-ios-e2e-test:
+      - feature-flags-e2e-test:
           context: *ref_6
           os: l
           requires:
@@ -534,14 +552,14 @@ workflows:
             - publish_to_local_registry
           post-steps: *ref_7
           filters: *ref_8
-      - datastore-modelgen-android-e2e-test:
+      - datastore-modelgen-ios-e2e-test:
           context: *ref_6
           os: l
           requires:
             - publish_to_local_registry
           post-steps: *ref_7
           filters: *ref_8
-      - configure-codegen-android-e2e-test:
+      - configure-codegen-ios-e2e-test:
           context: *ref_6
           os: l
           requires:
@@ -555,14 +573,14 @@ workflows:
             - publish_to_local_registry
           post-steps: *ref_7
           filters: *ref_8
-      - datastore-modelgen-js-e2e-test:
+      - datastore-modelgen-android-e2e-test:
           context: *ref_6
           os: l
           requires:
             - publish_to_local_registry
           post-steps: *ref_7
           filters: *ref_8
-      - configure-codegen-js-e2e-test:
+      - configure-codegen-android-e2e-test:
           context: *ref_6
           os: l
           requires:
@@ -576,35 +594,35 @@ workflows:
             - publish_to_local_registry
           post-steps: *ref_7
           filters: *ref_8
-      - remove-codegen-android-e2e-test:
+      - datastore-modelgen-js-e2e-test:
           context: *ref_6
           os: l
           requires:
             - publish_to_local_registry
           post-steps: *ref_7
           filters: *ref_8
-      - graphql-codegen-android-e2e-test:
+      - configure-codegen-js-e2e-test:
           context: *ref_6
           os: l
           requires:
             - publish_to_local_registry
           post-steps: *ref_7
           filters: *ref_8
-      - add-codegen-ios-e2e-test:
+      - model-introspection-codegen-e2e-test:
           context: *ref_6
           os: l
           requires:
             - publish_to_local_registry
           post-steps: *ref_7
           filters: *ref_8
-      - remove-codegen-ios-e2e-test:
+      - remove-codegen-android-e2e-test:
           context: *ref_6
           os: l
           requires:
             - publish_to_local_registry
           post-steps: *ref_7
           filters: *ref_8
-      - graphql-codegen-js-e2e-test:
+      - graphql-codegen-android-e2e-test:
           context: *ref_6
           os: l
           requires:

.circleci/local_publish_helpers.sh

@@ -28,3 +28,9 @@ function setNpmRegistryUrlToLocal {
   npm set registry "$custom_registry_url"
   yarn config set registry "$custom_registry_url"
 }
+
+function changeNpmGlobalPath {
+  mkdir -p ~/.npm-global
+  npm config set prefix '~/.npm-global'
+  export PATH=~/.npm-global/bin:$PATH
+}