Merge pull request #246 from aws-amplify/master

Release Amplify Codegen v2.26.6

Author: AaronZyLee

.circleci/config.base.yml

@@ -118,13 +118,7 @@ jobs:
       - run:
           name: Publish Amplify Codegen
           command: |
-            if [ -z "$CIRCLE_PULL_REQUEST" ]; then
-              git config --global user.email $GITHUB_EMAIL
-              git config --global user.name $GITHUB_USER
-              npm run publish:$CIRCLE_BRANCH
-            else
-              echo "Skipping deploy."
-            fi
+            bash ./.circleci/publish.sh
 
   publish_to_local_registry:
     <<: *defaults
@@ -235,7 +229,7 @@ workflows:
               only:
                 - master
                 - e2e-testing
-                - dart-modelgen-null-safety
+                - /tagged-release\/.*/
       - e2e-test:
           context:
             - cleanup-resources
@@ -249,7 +243,7 @@ workflows:
               only:
                 - master
                 - e2e-testing
-                - dart-modelgen-null-safety
+                - /tagged-release\/.*/
       - deploy:
           os: linux_node12
           requires:
@@ -261,7 +255,8 @@ workflows:
               only:
                 - release
                 - master
-                - dart-modelgen-null-safety
+                - /tagged-release\/.*/
+                - /tagged-release-without-e2e-tests\/.*/
       - done_with_node_e2e_tests:
           os: linux_node12
           requires:

.circleci/config.yml

@@ -126,13 +126,7 @@ jobs:
       - run:
           name: Publish Amplify Codegen
           command: |
-            if [ -z "$CIRCLE_PULL_REQUEST" ]; then
-              git config --global user.email $GITHUB_EMAIL
-              git config --global user.name $GITHUB_USER
-              npm run publish:$CIRCLE_BRANCH
-            else
-              echo "Skipping deploy."
-            fi
+            bash ./.circleci/publish.sh
   publish_to_local_registry:
     working_directory: ~/repo
     parameters: *ref_0
@@ -420,7 +414,7 @@ workflows:
               only:
                 - master
                 - e2e-testing
-                - dart-modelgen-null-safety
+                - /tagged-release\/.*/
       - deploy:
           os: linux_node12
           requires:
@@ -432,7 +426,8 @@ workflows:
               only:
                 - release
                 - master
-                - dart-modelgen-null-safety
+                - /tagged-release\/.*/
+                - /tagged-release-without-e2e-tests\/.*/
       - done_with_node_e2e_tests:
           os: linux_node12
           requires:
@@ -471,7 +466,7 @@ workflows:
               only:
                 - master
                 - e2e-testing
-                - dart-modelgen-null-safety
+                - /tagged-release\/.*/
       - add-codegen-android-e2e-test:
           context: *ref_8
           os: linux_node12

.circleci/publish.sh

@@ -0,0 +1,24 @@
+#!/bin/bash -e
+if [ -z "$CIRCLE_PULL_REQUEST" ]; then
+  git config --global user.email $GITHUB_EMAIL
+  git config --global user.name $GITHUB_USER
+  if [[ "$CIRCLE_BRANCH" =~ ^tagged-release ]]; then
+    if [[ "$CIRCLE_BRANCH" =~ ^tagged-release-without-e2e-tests\/.* ]]; then
+        # Remove tagged-release-without-e2e-tests/
+      export NPM_TAG="${CIRCLE_BRANCH/tagged-release-without-e2e-tests\//}"
+    elif [[ "$CIRCLE_BRANCH" =~ ^tagged-release\/.* ]]; then
+      # Remove tagged-release/
+      export NPM_TAG="${CIRCLE_BRANCH/tagged-release\//}"
+    fi
+    if [ -z "$NPM_TAG" ]; then
+        echo "Tag name is missing. Name your branch with either tagged-release/<tag-name> or tagged-release-without-e2e-tests/<tag-name>"
+        exit 1
+      fi
+      echo "Publishing to NPM with tag $NPM_TAG"
+      yarn publish:tag
+  else
+    yarn publish:$CIRCLE_BRANCH
+  fi
+else
+  echo "Skipping deploy."
+fi

package.json

@@ -13,7 +13,7 @@
     "production-build": "yarn && lerna run build --concurrency 3 --stream",
     "publish:master": "lerna publish --canary --exact --force-publish --preid=dev --dist-tag=dev --include-merged-tags --conventional-prerelease --yes",
     "publish:release": "lerna publish --exact --conventional-commits --message 'chore(release): Publish [ci skip]' --yes",
-    "publish:dart-modelgen-null-safety": "lerna publish --canary --exact --force-publish --preid=flutter-preview --dist-tag=flutter-preview --include-merged-tags --conventional-prerelease --yes",
+    "publish:tag": "lerna publish --exact --dist-tag=$NPM_TAG --preid=$NPM_TAG --conventional-commits --conventional-prerelease --message 'chore(release): Publish tagged release $NPM_TAG [ci skip]' --no-verify-access --yes",
     "postpublish:release": "git fetch . release:master && git push origin master",
     "yarn-use-bash": "yarn config set script-shell /bin/bash",
     "verdaccio-start": "yarn yarn-use-bash && source .circleci/local_publish_helpers.sh && startLocalRegistry \"$(pwd)/.circleci/verdaccio.yaml\"",

packages/amplify-codegen-e2e-core/src/configure/index.ts

@@ -13,18 +13,24 @@ const defaultSettings = {
   userName: '\r',
 };
 
-const regionOptions = [
+export const amplifyRegions = [
   'us-east-1',
   'us-east-2',
+  'us-west-1',
   'us-west-2',
+  'eu-north-1',
   'eu-west-1',
   'eu-west-2',
+  'eu-west-3',
   'eu-central-1',
   'ap-northeast-1',
   'ap-northeast-2',
   'ap-southeast-1',
   'ap-southeast-2',
   'ap-south-1',
+  'ca-central-1',
+  'me-south-1',
+  'sa-east-1',
 ];
 
 const configurationOptions = ['project', 'profile', 'containers'];
@@ -46,7 +52,7 @@ export function amplifyConfigure(settings: AmplifyConfiguration): Promise<void>
       .sendCarriageReturn()
       .wait('Specify the AWS Region');
 
-    singleSelect(chain, s.region, regionOptions);
+    singleSelect(chain, s.region, amplifyRegions);
 
     chain
       .wait('user name:')

packages/amplify-codegen-e2e-core/src/init/initProjectHelper.ts

@@ -1,5 +1,6 @@
 import { nspawn as spawn, getCLIPath, singleSelect, addCircleCITags } from '..';
 import { KEY_DOWN_ARROW, AmplifyFrontend } from '../utils';
+import { amplifyRegions } from '../configure';
 
 const defaultSettings = {
   name: '\r',
@@ -20,21 +21,6 @@ const defaultSettings = {
   providerConfig: undefined
 };
 
-export const amplifyRegions = [
-  'us-east-1',
-  'us-east-2',
-  'us-west-2',
-  'eu-west-1',
-  'eu-west-2',
-  'eu-central-1',
-  'ap-northeast-1',
-  'ap-northeast-2',
-  'ap-southeast-1',
-  'ap-southeast-2',
-  'ap-south-1',
-  'ca-central-1',
-];
-
 export function initJSProjectWithProfile(cwd: string, settings: Object = {}): Promise<void> {
   const s = { ...defaultSettings, ...settings };
   let env;

packages/appsync-modelgen-plugin/src/__tests__/utils/process-connections.test.ts

@@ -1,13 +1,12 @@
 import {
   processConnections,
   CodeGenConnectionType,
-  CodeGenFieldConnection,
   CodeGenFieldConnectionHasMany,
   CodeGenFieldConnectionBelongsTo,
   CodeGenFieldConnectionHasOne,
   getConnectedField,
 } from '../../utils/process-connections';
-import { CodeGenModelMap, CodeGenModel } from '../../visitors/appsync-visitor';
+import { CodeGenModelMap } from '../../visitors/appsync-visitor';
 import { processConnectionsV2 } from '../../utils/process-connections-v2';
 
 describe('process connection', () => {
@@ -772,5 +771,6 @@ describe('process connection', () => {
         expect(connectionInfo.isConnectingFieldAutoCreated).toEqual(false);
       });
     });
+
   });
 });