Sandbox e2e test

.github/workflows/health_checks.yml

@@ -60,7 +60,6 @@ jobs:
   run_e2e_tests:
     runs-on: ubuntu-latest
     needs:
-      - build
       - do_include_e2e
     permissions:
       # these permissions are required for the configure-aws-credentials action to get a JWT from GitHub
@@ -70,14 +69,17 @@ jobs:
     steps:
       - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # version 3.6.0
       - uses: ./.github/actions/setup_node
-      - uses: ./.github/actions/restore_build_cache
+        # we have to build and install in this job rather than restore from cache because the
+        # symlinks in the node_modules folder are broken if we just restore the build from the cache
+      - name: Install and build
+        run: npm run install:local
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@04b98b3f9e85f563fb061be8751a0352327246b0 # version 3.0.1
         with:
           role-to-assume: ${{ secrets.E2E_RUNNER_ROLE_ARN }}
           aws-region: us-west-2
-      - name: Verify credentials
-        run: aws sts get-caller-identity
+      - name: Run E2E tests
+        run: npm run e2e
   lint:
     runs-on: ubuntu-latest
     needs:

package.json

@@ -12,6 +12,7 @@
     "clean:npm-proxy": "npm run stop:npm-proxy && rimraf verdaccio-cache verdaccio-logs.txt",
     "diff:check": "tsx scripts/check_pr_size.ts",
     "docs": "typedoc",
+    "e2e": "tsx --test --test-reporter spec --test-name-pattern \"/^\\[E2E\\]/\" packages/integration-tests/lib/e2e",
     "install:local": "npm install && npm run build && npm run install:local --workspaces --if-present",
     "lint": "eslint --max-warnings 0 . && prettier --check .",
     "lint:fix": "eslint --cache --fix . && prettier --write .",
@@ -21,7 +22,7 @@
     "publish:local": "tsx scripts/publish_local.ts",
     "start:npm-proxy": "tsx scripts/start_npm_proxy.ts",
     "stop:npm-proxy": "tsx scripts/stop_npm_proxy.ts",
-    "test": "tsx --test --test-reporter spec",
+    "test": "tsx --test --test-reporter spec --test-name-pattern \"/^[^\\[][^E][^2][^E][^\\]].*$/\"",
     "test:coverage:generate": "NODE_V8_COVERAGE=coverage/ npm run test",
     "test:coverage:threshold": "c8 npm run test",
     "update:api": "npm run update:api --workspaces",

packages/backend-graphql/package.json

@@ -26,6 +26,6 @@
   },
   "dependencies": {
     "@aws-amplify/backend-output-schemas": "^0.1.1-alpha.0",
-    "@aws-amplify/graphql-construct-alpha": "^0.5.0"
+    "@aws-amplify/graphql-construct-alpha": "^0.6.1"
   }
 }

packages/create-amplify/src/initial_project_file_generator.test.ts

@@ -19,7 +19,7 @@ describe('InitialProjectFileGenerator', () => {
       { recursive: true },
     ]);
     assert.deepStrictEqual(fsMock.cp.mock.calls[0].arguments, [
-      new URL('../templates/basic-auth-data', import.meta.url),
+      new URL('../templates/basic-auth-data/amplify', import.meta.url),
       '/testProjectRoot/amplify',
       { recursive: true },
     ]);

packages/create-amplify/src/initial_project_file_generator.ts

@@ -20,12 +20,8 @@ export class InitialProjectFileGenerator {
   generateInitialProjectFiles = async (): Promise<void> => {
     const targetDir = path.resolve(this.projectRoot, 'amplify');
     await this.fs.mkdir(targetDir, { recursive: true });
-    /*
-      Note: Although the source code template directory contains expected-cdk-out test assets,
-      these assets are not published to npm and thus not copied when this code runs in production
-     */
     await this.fs.cp(
-      new URL('../templates/basic-auth-data', import.meta.url),
+      new URL('../templates/basic-auth-data/amplify', import.meta.url),
       targetDir,
       { recursive: true }
     );

packages/create-amplify/templates/basic-auth-data/expected-cdk-out/amplify-testAppId-testBranchName.assets.json

@@ -248,6 +248,45 @@
         }
       }
     },
+    "e2277687077a2abf9ae1af1cc9565e6715e2ebb62f79ec53aa75a1af9298f642": {
+      "source": {
+        "path": "asset.e2277687077a2abf9ae1af1cc9565e6715e2ebb62f79ec53aa75a1af9298f642.zip",
+        "packaging": "file"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "e2277687077a2abf9ae1af1cc9565e6715e2ebb62f79ec53aa75a1af9298f642.zip",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    },
+    "9eb41a5505d37607ac419321497a4f8c21cf0ee1f9b4a6b29aa04301aea5c7fd": {
+      "source": {
+        "path": "asset.9eb41a5505d37607ac419321497a4f8c21cf0ee1f9b4a6b29aa04301aea5c7fd",
+        "packaging": "zip"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "9eb41a5505d37607ac419321497a4f8c21cf0ee1f9b4a6b29aa04301aea5c7fd.zip",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    },
+    "ebcebf048afca40fc46da2b2a56e4c0bac61ce9168b91d78fe4ab3e358eb8a7c": {
+      "source": {
+        "path": "asset.ebcebf048afca40fc46da2b2a56e4c0bac61ce9168b91d78fe4ab3e358eb8a7c",
+        "packaging": "zip"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "ebcebf048afca40fc46da2b2a56e4c0bac61ce9168b91d78fe4ab3e358eb8a7c.zip",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    },
     "7e502ba5303800830c46c6acd7cc27c4f49bfc8330e0c512159fd4f09db5ea4a": {
       "source": {
         "path": "asset.7e502ba5303800830c46c6acd7cc27c4f49bfc8330e0c512159fd4f09db5ea4a.graphql",
@@ -287,28 +326,28 @@
         }
       }
     },
-    "d0b4f4d046ae1f182e7cb26c942ae4a7b1990b640110fa6eabb4c72e4f4d640b": {
+    "d30f87e63d0607c552c9561779fdd489870341f9da9aadcf3fabef85aaf96570": {
       "source": {
         "path": "amplifytestAppIdtestBranchNamedata9EF5D4B6.nested.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "d0b4f4d046ae1f182e7cb26c942ae4a7b1990b640110fa6eabb4c72e4f4d640b.json",
+          "objectKey": "d30f87e63d0607c552c9561779fdd489870341f9da9aadcf3fabef85aaf96570.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }
     },
-    "f6fe9e9ae1d10aff22ef8dfc789f72df78ee12f6847ae489c1f61adab1b646d9": {
+    "386b1529eac923548efaf02ac1c71494f9d83b04d8706fb6382a8b4b3525bcea": {
       "source": {
         "path": "amplify-testAppId-testBranchName.template.json",
         "packaging": "file"
       },
       "destinations": {
         "current_account-current_region": {
           "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
-          "objectKey": "f6fe9e9ae1d10aff22ef8dfc789f72df78ee12f6847ae489c1f61adab1b646d9.json",
+          "objectKey": "386b1529eac923548efaf02ac1c71494f9d83b04d8706fb6382a8b4b3525bcea.json",
           "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
         }
       }

packages/create-amplify/templates/basic-auth-data/expected-cdk-out/amplify-testAppId-testBranchName.template.json

@@ -12,9 +12,11 @@
    "graphqlOutput": {
     "version": "1",
     "stackOutputs": [
+     "awsAppsyncApiId",
      "awsAppsyncApiEndpoint",
      "awsAppsyncAuthenticationType",
-     "awsAppsyncRegion"
+     "awsAppsyncRegion",
+     "amplifyApiModelSchemaS3Uri"
     ]
    }
   }
@@ -66,7 +68,7 @@
        {
         "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
        },
-       "/d0b4f4d046ae1f182e7cb26c942ae4a7b1990b640110fa6eabb4c72e4f4d640b.json"
+       "/d30f87e63d0607c552c9561779fdd489870341f9da9aadcf3fabef85aaf96570.json"
       ]
      ]
     },
@@ -117,6 +119,14 @@
     "Ref": "AWS::Region"
    }
   },
+  "awsAppsyncApiId": {
+   "Value": {
+    "Fn::GetAtt": [
+     "data7552DF31",
+     "Outputs.amplifytestAppIdtestBranchNamedataamplifyDataGraphQLAPI93E95D03ApiId"
+    ]
+   }
+  },
   "awsAppsyncApiEndpoint": {
    "Value": {
     "Fn::GetAtt": [
@@ -132,6 +142,23 @@
    "Value": {
     "Ref": "AWS::Region"
    }
+  },
+  "amplifyApiModelSchemaS3Uri": {
+   "Value": {
+    "Fn::Join": [
+     "",
+     [
+      "s3://",
+      {
+       "Fn::GetAtt": [
+        "data7552DF31",
+        "Outputs.amplifytestAppIdtestBranchNamedataamplifyDataCodegenAssetsCodegenAssetsBucketC42FF1E2Ref"
+       ]
+      },
+      "/model-schema.graphql"
+     ]
+    ]
+   }
   }
  },
  "Parameters": {