Merge pull request #297 from aws-amplify/e2e-test-api-flow-change

fix(amplify-codegen-e2e-core): API walkthrough changes

Author: mikepschneider

packages/amplify-codegen-e2e-core/src/categories/api.ts

@@ -1,6 +1,7 @@
 import { nspawn as spawn, getCLIPath, singleSelect, addCircleCITags } from '..';
 import { KEY_DOWN_ARROW, AmplifyFrontend } from '../utils';
 import { amplifyRegions } from '../configure';
+import { v4 as uuid } from 'uuid';
 
 const defaultSettings = {
   name: '\r',
@@ -430,3 +431,9 @@ export async function initProjectWithProfile(cwd: string, settings: any) : Promi
       throw Error(`${settings.frontendType} is an invalid frontend type`);
   }
 }
+
+export function createRandomName() {
+  const length = 20;
+  const regExp = new RegExp('-', 'g');
+  return uuid().replace(regExp, '').substring(0, length);
+}

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

@@ -1,8 +1,10 @@
 import {
     initProjectWithProfile,
-    addApiWithSchema,
+    addApiWithoutSchema,
+    updateApiSchema,
     addCodegen,
-    AmplifyFrontendConfig
+    AmplifyFrontendConfig,
+    createRandomName
 } from "amplify-codegen-e2e-core";
 import { existsSync } from "fs";
 import path from 'path';
@@ -12,7 +14,9 @@ import { testSetupBeforeAddCodegen, testValidGraphQLConfig } from "./test-setup"
 export async function testAddCodegen(config: AmplifyFrontendConfig, projectRoot: string, schema: string) {
     // init project and add API category
     await initProjectWithProfile(projectRoot, { ...config });
-    await addApiWithSchema(projectRoot, schema);
+    const projectName = createRandomName();
+    await addApiWithoutSchema(projectRoot, { apiName: projectName });
+    await updateApiSchema(projectRoot, projectName, schema);
 
     const userSourceCodePath = testSetupBeforeAddCodegen(projectRoot, config);
 

packages/amplify-codegen-e2e-tests/src/codegen-tests-base/add-codegen.ts

@@ -1,9 +1,11 @@
 import {
     initProjectWithProfile,
-    addApiWithSchema,
+    addApiWithoutSchema,
     addCodegen,
+    updateApiSchema,
     configureCodegen,
-    AmplifyFrontendConfig
+    AmplifyFrontendConfig,
+    createRandomName
 } from "amplify-codegen-e2e-core";
 import { existsSync, readFileSync } from "fs";
 import path from 'path';
@@ -13,7 +15,9 @@ import { testSetupBeforeAddCodegen, testValidGraphQLConfig, getGraphQLConfigFile
 export async function testConfigureCodegen(config: AmplifyFrontendConfig, projectRoot: string, schema: string) {
     // init project and add API category
     await initProjectWithProfile(projectRoot, { ...config });
-    await addApiWithSchema(projectRoot, schema);
+    const projectName = createRandomName();
+    await addApiWithoutSchema(projectRoot, { apiName: projectName });
+    await updateApiSchema(projectRoot, projectName, schema);
 
     const userSourceCodePath = testSetupBeforeAddCodegen(projectRoot, config);
 

packages/amplify-codegen-e2e-tests/src/codegen-tests-base/configure-codegen.ts

@@ -1,8 +1,10 @@
 import {
     initProjectWithProfile,
-    addApiWithSchemaAndConflictDetection,
+    addApiWithBlankSchemaAndConflictDetection,
     generateModels,
-    AmplifyFrontendConfig
+    AmplifyFrontendConfig,
+    createRandomName,
+    updateApiSchema
 } from "amplify-codegen-e2e-core";
 import { existsSync } from "fs";
 import path from 'path';
@@ -13,7 +15,9 @@ export async function testCodegenModels(config: AmplifyFrontendConfig, projectRo
     await initProjectWithProfile(projectRoot, { ...config });
 
     //enable datastore
-    await addApiWithSchemaAndConflictDetection(projectRoot, schema);
+    const projectName = createRandomName();
+    await addApiWithBlankSchemaAndConflictDetection(projectRoot);
+    await updateApiSchema(projectRoot, projectName, schema);
 
     //generate pre existing user file
     const userSourceCodePath = generateSourceCode(projectRoot, config.srcDir);

packages/amplify-codegen-e2e-tests/src/codegen-tests-base/datastore-modelgen.ts

@@ -1,9 +1,11 @@
 import {
     initProjectWithProfile,
-    addApiWithSchema,
+    addApiWithoutSchema,
+    updateApiSchema,
     addCodegen,
     AmplifyFrontendConfig,
-    generateStatementsAndTypes
+    generateStatementsAndTypes,
+    createRandomName
 } from "amplify-codegen-e2e-core";
 import { existsSync } from "fs";
 import path from 'path';
@@ -12,7 +14,9 @@ import { isNotEmptyDir, generateSourceCode } from '../utils';
 export async function testGraphQLCodegen(config: AmplifyFrontendConfig, projectRoot: string, schema: string) {
     // init project and add API category
     await initProjectWithProfile(projectRoot, { ...config });
-    await addApiWithSchema(projectRoot, schema);
+    const projectName = createRandomName();
+    await addApiWithoutSchema(projectRoot, { apiName: projectName });
+    await updateApiSchema(projectRoot, projectName, schema);
 
     // generate pre-existing user file
     const userSourceCodePath = generateSourceCode(projectRoot, config.srcDir);

packages/amplify-codegen-e2e-tests/src/codegen-tests-base/graphql-codegen.ts

@@ -1,6 +1,8 @@
 import {
     initProjectWithProfile,
-    addApiWithSchema,
+    addApiWithoutSchema,
+    updateApiSchema,
+    createRandomName,
     amplifyPushWithCodegenAdd,
     AmplifyFrontendConfig,
     apiUpdateToggleDataStore,
@@ -14,7 +16,9 @@ import { testSetupBeforeAddCodegen } from "./test-setup";
 export async function testPushCodegen(config: AmplifyFrontendConfig, projectRoot: string, schema: string) {
     // init project and add API category
     await initProjectWithProfile(projectRoot, { ...config });
-    await addApiWithSchema(projectRoot, schema);
+    const projectName = createRandomName();
+    await addApiWithoutSchema(projectRoot, { apiName: projectName });
+    await updateApiSchema(projectRoot, projectName, schema);
 
     const userSourceCodePath = testSetupBeforeAddCodegen(projectRoot, config);
 

packages/amplify-codegen-e2e-tests/src/codegen-tests-base/push-codegen.ts

@@ -1,6 +1,8 @@
 import {
     initProjectWithProfile,
-    addApiWithSchema,
+    addApiWithoutSchema,
+    updateApiSchema,
+    createRandomName,
     addCodegen,
     removeCodegen,
     AmplifyFrontendConfig
@@ -14,7 +16,9 @@ import { load } from 'js-yaml';
 export async function testRemoveCodegen(config: AmplifyFrontendConfig, projectRoot: string, schema: string) {
     // init project and add API category
     await initProjectWithProfile(projectRoot, { ...config });
-    await addApiWithSchema(projectRoot, schema);
+    const projectName = createRandomName();
+    await addApiWithoutSchema(projectRoot, { apiName: projectName });
+    await updateApiSchema(projectRoot, projectName, schema);
 
     const userSourceCodePath = testSetupBeforeAddCodegen(projectRoot, config);