Merge pull request #301 from aws-amplify/master

mikepschneider · web-flow · commit 5ee4897ecc77 · 2021-11-12T14:19:07.000-08:00
fix(amplify-codegen-e2e-core): API walkthrough changes #299
diff --git a/packages/amplify-codegen-e2e-core/src/categories/api.ts b/packages/amplify-codegen-e2e-core/src/categories/api.ts
diff --git a/packages/amplify-codegen-e2e-core/src/init/initProjectHelper.ts b/packages/amplify-codegen-e2e-core/src/init/initProjectHelper.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);
+}
diff --git a/packages/amplify-codegen-e2e-tests/src/__tests__/add-codegen-js.test.ts b/packages/amplify-codegen-e2e-tests/src/__tests__/add-codegen-js.test.ts
@@ -1,9 +1,11 @@
 import { 
     createNewProjectDir,
     initProjectWithProfile,
-    addApiWithSchema,
     addCodegen,
-    DEFAULT_JS_CONFIG
+    DEFAULT_JS_CONFIG,
+    createRandomName,
+    addApiWithoutSchema,
+    updateApiSchema
 } from "amplify-codegen-e2e-core";
 import { existsSync } from "fs";
 import path from 'path';
@@ -46,7 +48,9 @@ describe('codegen add tests - JS', () => {
     it(`Adding codegen twice gives appropriate message`, async () => {
         // 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);
 
diff --git a/packages/amplify-codegen-e2e-tests/src/__tests__/env-codegen.test.ts b/packages/amplify-codegen-e2e-tests/src/__tests__/env-codegen.test.ts
@@ -2,10 +2,10 @@ import {
   createNewProjectDir, 
   deleteProjectDir,
   deleteProject,
-  addApiWithSchema,
   initJSProjectWithProfile,
   amplifyPush,
   generateModels,
+  addApiWithoutSchema,
   updateApiSchema
 } from "amplify-codegen-e2e-core";
 import { addEnvironment, checkoutEnvironment } from "../environment/env";
@@ -27,7 +27,9 @@ describe('env codegen tests', () => {
   it('should generate models in different environments', async () => {
     //create amplify project with enva
     await initJSProjectWithProfile(projectRoot, { envName: 'enva' });
-    await addApiWithSchema(projectRoot, schema, { apiName });
+    await addApiWithoutSchema(projectRoot, { apiName: apiName });
+    await updateApiSchema(projectRoot, apiName, schema);
+
     await amplifyPush(projectRoot);
     //create new envb
     await addEnvironment(projectRoot, { envName: 'envb' });
diff --git a/packages/amplify-codegen-e2e-tests/src/__tests__/pull-codegen.test.ts b/packages/amplify-codegen-e2e-tests/src/__tests__/pull-codegen.test.ts
@@ -3,7 +3,9 @@ import {
   deleteProjectDir,
   deleteProject,
   initJSProjectWithProfile,
-  addApiWithSchemaAndConflictDetection,
+  addApiWithBlankSchemaAndConflictDetection,
+  updateApiSchema,
+  createRandomName,
   amplifyPush,
   amplifyPull,
   getAppId,
@@ -37,9 +39,11 @@ describe('Amplify pull in amplify app with codegen tests', () => {
   let projectRoot: string;
   let appId: string;
   beforeAll(async () => {
+    const name = createRandomName();
     projectRoot = await createNewProjectDir('pullCodegen');
-    await initJSProjectWithProfile(projectRoot, { envName, disableAmplifyAppCreation: false });
-    await addApiWithSchemaAndConflictDetection(projectRoot, schema);
+    await initJSProjectWithProfile(projectRoot, { name, envName, disableAmplifyAppCreation: false });
+    await addApiWithBlankSchemaAndConflictDetection(projectRoot);
+    await updateApiSchema(projectRoot, name, schema);
     await amplifyPush(projectRoot);
     appId = getAppId(projectRoot);
     expect(appId).toBeDefined();
diff --git a/packages/amplify-codegen-e2e-tests/src/__tests__/remove-codegen-js.test.ts b/packages/amplify-codegen-e2e-tests/src/__tests__/remove-codegen-js.test.ts
@@ -3,7 +3,9 @@ import {
     DEFAULT_JS_CONFIG, 
     removeCodegen,
     initProjectWithProfile,
-    addApiWithSchema
+    addApiWithoutSchema,
+    updateApiSchema,
+    createRandomName
 } from "amplify-codegen-e2e-core";
 import { deleteAmplifyProject, testRemoveCodegen } from '../codegen-tests-base';
 
@@ -23,7 +25,9 @@ describe('codegen remove tests - JS', () => {
     it(`Give appropriate message during remove when codegen is not added in JS project`, async () => {
         // init project and add API category
         await initProjectWithProfile(projectRoot, DEFAULT_JS_CONFIG);
-        await addApiWithSchema(projectRoot, schema);
+        const projectName = createRandomName();
+        await addApiWithoutSchema(projectRoot, { apiName: projectName });
+        await updateApiSchema(projectRoot, projectName, schema);
         
         // remove command should give expected message
         await expect(removeCodegen(projectRoot, false)).resolves.not.toThrow();
diff --git a/packages/amplify-codegen-e2e-tests/src/codegen-tests-base/add-codegen.ts b/packages/amplify-codegen-e2e-tests/src/codegen-tests-base/add-codegen.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);
 
diff --git a/packages/amplify-codegen-e2e-tests/src/codegen-tests-base/configure-codegen.ts b/packages/amplify-codegen-e2e-tests/src/codegen-tests-base/configure-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);
 
diff --git a/packages/amplify-codegen-e2e-tests/src/codegen-tests-base/datastore-modelgen.ts b/packages/amplify-codegen-e2e-tests/src/codegen-tests-base/datastore-modelgen.ts
@@ -1,6 +1,8 @@
 import {
     initProjectWithProfile,
-    addApiWithSchemaAndConflictDetection,
+    addApiWithBlankSchemaAndConflictDetection,
+    updateApiSchema,
+    createRandomName,
     generateModels,
     AmplifyFrontendConfig
 } from "amplify-codegen-e2e-core";
@@ -9,11 +11,14 @@ import path from 'path';
 import { isNotEmptyDir, generateSourceCode } from '../utils';
 
 export async function testCodegenModels(config: AmplifyFrontendConfig, projectRoot: string, schema: string) {
+    const name = createRandomName();
+
     // init project and add API category
-    await initProjectWithProfile(projectRoot, { ...config });
+    await initProjectWithProfile(projectRoot, { name, ...config });
 
     //enable datastore
-    await addApiWithSchemaAndConflictDetection(projectRoot, schema);
+    await addApiWithBlankSchemaAndConflictDetection(projectRoot);
+    await updateApiSchema(projectRoot, name, schema);
 
     //generate pre existing user file
     const userSourceCodePath = generateSourceCode(projectRoot, config.srcDir);
diff --git a/packages/amplify-codegen-e2e-tests/src/codegen-tests-base/graphql-codegen.ts b/packages/amplify-codegen-e2e-tests/src/codegen-tests-base/graphql-codegen.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);
diff --git a/packages/amplify-codegen-e2e-tests/src/codegen-tests-base/push-codegen.ts b/packages/amplify-codegen-e2e-tests/src/codegen-tests-base/push-codegen.ts
@@ -1,10 +1,12 @@
 import {
     initProjectWithProfile,
-    addApiWithSchema,
+    addApiWithoutSchema,
+    updateApiSchema,
+    createRandomName,
     amplifyPushWithCodegenAdd,
     AmplifyFrontendConfig,
-    apiUpdateToggleDataStore,
-    amplifyPushWithCodegenUpdate
+    amplifyPushWithCodegenUpdate,
+    updateAPIWithResolutionStrategyWithModels
 } from "amplify-codegen-e2e-core";
 import { existsSync } from "fs";
 import path from 'path';
@@ -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);
 
@@ -28,7 +32,7 @@ export async function testPushCodegen(config: AmplifyFrontendConfig, projectRoot
     expect(isNotEmptyDir(path.join(projectRoot, config.graphqlCodegenDir))).toBe(true);
 
     //enable datastore
-    await apiUpdateToggleDataStore(projectRoot);
+    await updateAPIWithResolutionStrategyWithModels(projectRoot, {});
     //push with codegen update
     await amplifyPushWithCodegenUpdate(projectRoot);
     expect(existsSync(userSourceCodePath)).toBe(true);
diff --git a/packages/amplify-codegen-e2e-tests/src/codegen-tests-base/remove-codegen.ts b/packages/amplify-codegen-e2e-tests/src/codegen-tests-base/remove-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);
 
diff --git a/packages/amplify-codegen-e2e-tests/src/schema-api-directives/tests/key-howTo4.ts b/packages/amplify-codegen-e2e-tests/src/schema-api-directives/tests/key-howTo4.ts
@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { addApiWithSchemaAndConflictDetection, amplifyPush } from 'amplify-codegen-e2e-core';
+import { addApiWithBlankSchemaAndConflictDetection, updateApiSchema, amplifyPush } from 'amplify-codegen-e2e-core';
 import { getApiKey, configureAmplify, getConfiguredAppsyncClientAPIKeyAuth } from '../authHelper';
 import { testQueries, testMutations } from '../common';
 
@@ -269,8 +269,9 @@ export const expected_result_query5 = {
   },
 };
 
-export async function runTest(projectDir: string, testModule: any) {
-  await addApiWithSchemaAndConflictDetection(projectDir, testModule.schemaName);
+export async function runTest(projectDir: string, testModule: any, appName: string) {
+  await addApiWithBlankSchemaAndConflictDetection(projectDir);
+  await updateApiSchema(projectDir, appName, testModule.schemaName);
   await amplifyPush(projectDir);
 
   const awsconfig = configureAmplify(projectDir);
diff --git a/packages/appsync-modelgen-plugin/src/__tests__/visitors/appsync-visitor.test.ts b/packages/appsync-modelgen-plugin/src/__tests__/visitors/appsync-visitor.test.ts
@@ -339,8 +339,9 @@ describe('AppSyncModelVisitor', () => {
       );
       visit(ast, { leave: visitor });
       visitor.generate();
-      const projectFields = visitor.models.Project.fields.map(field => field.name);
-      expect(projectFields).toContain('projectTeamId');
+      const projectTeamIdField = visitor.models.Project.fields.find(field => { return field.name === 'projectTeamId'; });
+      expect(projectTeamIdField).toBeDefined();
+      expect(projectTeamIdField.isNullable).toBeTruthy();
     });
   });
 
diff --git a/packages/appsync-modelgen-plugin/src/visitors/appsync-visitor.ts b/packages/appsync-modelgen-plugin/src/visitors/appsync-visitor.ts
@@ -691,7 +691,7 @@ export class AppSyncModelVisitor<
               directives: [],
               type: 'ID',
               isList: false,
-              isNullable: connectionInfo.associatedWith.isNullable,
+              isNullable: field.isNullable,
             });
           } else if (connectionInfo.targetName !== 'id') {
             // Need to remove the field that is targetName
@@ -708,7 +708,7 @@ export class AppSyncModelVisitor<
         const connectionInfo = field.connectionInfo;
         if (modelTypes.includes(fieldType) && connectionInfo === undefined) {
           printWarning(
-            `Model ${model.name} has field ${field.name} of type ${field.type} but its not connected. Add a @connection directive if want to connect them.`,
+            `Model ${model.name} has field ${field.name} of type ${field.type} but its not connected. Add the appropriate ${field.isList ? '@hasMany' : '@hasOne'}/@belongsTo directive if you want to connect them.`,
           );
           return false;
         }
diff --git a/packages/graphql-types-generator/src/flow-modern/__tests__/__snapshots__/codeGeneration.ts.snap b/packages/graphql-types-generator/src/flow-modern/__tests__/__snapshots__/codeGeneration.ts.snap
diff --git a/packages/graphql-types-generator/test/compiler/legacyIR.js b/packages/graphql-types-generator/test/compiler/legacyIR.js
diff --git a/packages/graphql-types-generator/test/compiler/visitors/generateOperationId.ts b/packages/graphql-types-generator/test/compiler/visitors/generateOperationId.ts
diff --git a/packages/graphql-types-generator/test/scala/language.js b/packages/graphql-types-generator/test/scala/language.js
diff --git a/packages/graphql-types-generator/test/swift/language.ts b/packages/graphql-types-generator/test/swift/language.ts
