fix: process input object, union and interface metadata in model introspection schema codegen

.codebuild/e2e_workflow.yml

@@ -145,24 +145,25 @@ batch:
       depend-on:
         - publish_to_local_registry
     - identifier: >-
-        l_build_app_ts_uninitialized_project_codegen_js_uninitialized_project_modelgen_android_uninitialized_project_modelgen_flutter
+        l_build_app_ts_push_codegen_admin_modelgen_uninitialized_project_codegen_js_uninitialized_project_modelgen_android
       buildspec: .codebuild/run_e2e_tests.yml
       env:
         compute-type: BUILD_GENERAL1_LARGE
         variables:
           TEST_SUITE: >-
-            src/__tests__/build-app-ts.test.ts|src/__tests__/uninitialized-project-codegen-js.test.ts|src/__tests__/uninitialized-project-modelgen-android.test.ts|src/__tests__/uninitialized-project-modelgen-flutter.test.ts
+            src/__tests__/build-app-ts.test.ts|src/__tests__/push-codegen-admin-modelgen.test.ts|src/__tests__/uninitialized-project-codegen-js.test.ts|src/__tests__/uninitialized-project-modelgen-android.test.ts
           CLI_REGION: ap-southeast-1
           DISABLE_ESLINT_PLUGIN: true
       depend-on:
         - publish_to_local_registry
-    - identifier: l_uninitialized_project_modelgen_ios_uninitialized_project_modelgen_js
+    - identifier: >-
+        l_uninitialized_project_modelgen_flutter_uninitialized_project_modelgen_ios_uninitialized_project_modelgen_js
       buildspec: .codebuild/run_e2e_tests.yml
       env:
         compute-type: BUILD_GENERAL1_LARGE
         variables:
           TEST_SUITE: >-
-            src/__tests__/uninitialized-project-modelgen-ios.test.ts|src/__tests__/uninitialized-project-modelgen-js.test.ts
+            src/__tests__/uninitialized-project-modelgen-flutter.test.ts|src/__tests__/uninitialized-project-modelgen-ios.test.ts|src/__tests__/uninitialized-project-modelgen-js.test.ts
           CLI_REGION: ap-southeast-2
       depend-on:
         - publish_to_local_registry
@@ -251,29 +252,30 @@ batch:
         - publish_to_local_registry
         - build_windows
     - identifier: >-
-        w_build_app_ts_uninitialized_project_codegen_js_uninitialized_project_modelgen_android_uninitialized_project_modelgen_flutter
+        w_build_app_ts_push_codegen_admin_modelgen_uninitialized_project_codegen_js_uninitialized_project_modelgen_android
       buildspec: .codebuild/run_e2e_tests_windows.yml
       env:
         compute-type: BUILD_GENERAL1_LARGE
         image: $WINDOWS_IMAGE_2019
         type: WINDOWS_SERVER_2019_CONTAINER
         variables:
           TEST_SUITE: >-
-            src/__tests__/build-app-ts.test.ts|src/__tests__/uninitialized-project-codegen-js.test.ts|src/__tests__/uninitialized-project-modelgen-android.test.ts|src/__tests__/uninitialized-project-modelgen-flutter.test.ts
+            src/__tests__/build-app-ts.test.ts|src/__tests__/push-codegen-admin-modelgen.test.ts|src/__tests__/uninitialized-project-codegen-js.test.ts|src/__tests__/uninitialized-project-modelgen-android.test.ts
           CLI_REGION: us-east-1
           DISABLE_ESLINT_PLUGIN: true
       depend-on:
         - publish_to_local_registry
         - build_windows
-    - identifier: w_uninitialized_project_modelgen_ios_uninitialized_project_modelgen_js
+    - identifier: >-
+        w_uninitialized_project_modelgen_flutter_uninitialized_project_modelgen_ios_uninitialized_project_modelgen_js
       buildspec: .codebuild/run_e2e_tests_windows.yml
       env:
         compute-type: BUILD_GENERAL1_LARGE
         image: $WINDOWS_IMAGE_2019
         type: WINDOWS_SERVER_2019_CONTAINER
         variables:
           TEST_SUITE: >-
-            src/__tests__/uninitialized-project-modelgen-ios.test.ts|src/__tests__/uninitialized-project-modelgen-js.test.ts
+            src/__tests__/uninitialized-project-modelgen-flutter.test.ts|src/__tests__/uninitialized-project-modelgen-ios.test.ts|src/__tests__/uninitialized-project-modelgen-js.test.ts
           CLI_REGION: us-east-1
       depend-on:
         - publish_to_local_registry

packages/amplify-codegen-e2e-tests/schemas/admin-modelgen.graphql

@@ -0,0 +1,15 @@
+input AMPLIFY { globalAuthRule: AuthRule = { allow: public } } # FOR TESTING ONLY!
+
+type Todo @model {
+  id: ID!
+  name: String!
+  description: String
+}
+input CustomInput {
+  customField1: String!
+  customField2: Int
+}
+
+type Query {
+  getAllTodo(msg: String, input: CustomInput): String @function(name: "echofunction-${env}")
+}

packages/amplify-codegen-e2e-tests/src/__tests__/push-codegen-admin-modelgen.test.ts

@@ -0,0 +1,19 @@
+import { DEFAULT_JS_CONFIG, createNewProjectDir } from "@aws-amplify/amplify-codegen-e2e-core";
+import { deleteAmplifyProject, testPushCodegen } from "../codegen-tests-base";
+
+const schema = 'admin-modelgen.graphql';
+
+describe('Amplify push with codegen tests - admin modelgen', () => {
+  let projectRoot: string;
+  beforeEach(async () => {
+    projectRoot = await createNewProjectDir('pushCodegenAdminModelgen');
+  });
+
+  afterEach(async () => {
+    await deleteAmplifyProject(projectRoot); 
+  });
+
+  it(`should not throw error for executing the modelgen commands (datastore modelgen & model-introspection) post push`, async () => {
+    await testPushCodegen(DEFAULT_JS_CONFIG, projectRoot, schema);
+  });
+});

packages/amplify-codegen-e2e-tests/src/cleanup-e2e-resources.ts

@@ -45,6 +45,7 @@ type AmplifyAppInfo = {
 
 type S3BucketInfo = {
   name: string;
+  region: string;
   jobId?: string;
   cbInfo?: CodeBuild.Build;
 };
@@ -118,7 +119,16 @@ const getOrphanS3TestBuckets = async (account: AWSAccountInfo): Promise<S3Bucket
   const s3Client = new aws.S3(getAWSConfig(account));
   const listBucketResponse = await s3Client.listBuckets().promise();
   const staleBuckets = listBucketResponse.Buckets.filter(testBucketStalenessFilter);
-  return staleBuckets.map(it => ({ name: it.Name }));
+  const bucketInfos = await Promise.all(
+    staleBuckets.map(async (staleBucket): Promise<S3BucketInfo> => {
+      const region = await getBucketRegion(account, staleBucket.Name);
+      return {
+        name: staleBucket.Name,
+        region,
+      };
+    }),
+  );
+  return bucketInfos;
 };
 
 /**
@@ -276,27 +286,52 @@ const getJobCodeBuildDetails = async (jobIds: string[]): Promise<CodeBuild.Build
   }
 };
 
+const getBucketRegion = async (account: AWSAccountInfo, bucketName: string): Promise<string> => {
+  const awsConfig = getAWSConfig(account);
+  const s3Client = new aws.S3(awsConfig);
+  const location = await s3Client.getBucketLocation({ Bucket: bucketName }).promise();
+  const region = location.LocationConstraint ?? 'us-east-1';
+  return region;
+};
+
 const getS3Buckets = async (account: AWSAccountInfo): Promise<S3BucketInfo[]> => {
-  const s3Client = new aws.S3(getAWSConfig(account));
+  const awsConfig = getAWSConfig(account);
+  const s3Client = new aws.S3(awsConfig);
   const buckets = await s3Client.listBuckets().promise();
   const result: S3BucketInfo[] = [];
   for (const bucket of buckets.Buckets) {
+    let region: string | undefined;
     try {
-      const bucketDetails = await s3Client.getBucketTagging({ Bucket: bucket.Name }).promise();
+      region = await getBucketRegion(account, bucket.Name);
+      // Operations on buckets created in opt-in regions appear to require region-specific clients
+      const regionalizedClient = new aws.S3({
+        region,
+        ...(awsConfig as object),
+      });
+      const bucketDetails = await regionalizedClient.getBucketTagging({ Bucket: bucket.Name }).promise();
       const jobId = getJobId(bucketDetails.TagSet);
       if (jobId) {
         result.push({
           name: bucket.Name,
+          region,
           jobId
         });
       }
     } catch (e) {
-      if (e.code !== 'NoSuchTagSet' && e.code !== 'NoSuchBucket') {
+      // TODO: Why do we process the bucket even with these particular errors?
+      if (e.code === 'NoSuchTagSet' || e.code === 'NoSuchBucket') {
+        result.push({
+          name: bucket.Name,
+          region: region ?? 'us-east-1',
+        });
+      } else if (e.code === 'InvalidToken') {
+        // We see some buckets in some accounts that were somehow created in an opt-in region different from the one to which the account is
+        // actually opted in. We don't quite know how this happened, but for now, we'll make a note of the inconsistency and continue
+        // processing the rest of the buckets.
+        console.error(`Skipping processing ${account.accountId}, bucket ${bucket.Name}`, e);
+      } else {
         throw e;
       }
-      result.push({
-        name: bucket.Name,
-      });
     }
   }
   return result;
@@ -516,8 +551,12 @@ const deleteBucket = async (account: AWSAccountInfo, accountIndex: number, bucke
   const { name } = bucket;
   try {
     console.log(`${generateAccountInfo(account, accountIndex)} Deleting S3 Bucket ${name}`);
-    const s3 = new aws.S3(getAWSConfig(account));
-    await deleteS3Bucket(name, s3);
+    const awsConfig = getAWSConfig(account);
+    const regionalizedS3Client = new aws.S3({
+      region: bucket.region,
+      ...(awsConfig as object),
+    });
+    await deleteS3Bucket(name, regionalizedS3Client);
   } catch (e) {
     console.log(`${generateAccountInfo(account, accountIndex)} Deleting bucket ${name} failed with error ${e.message}`);
     if (e.code === 'ExpiredTokenException') {

packages/appsync-modelgen-plugin/API.md

@@ -100,6 +100,14 @@ export type FieldType = 'ID' | 'String' | 'Int' | 'Float' | 'AWSDate' | 'AWSTime
     model: string;
 } | {
     nonModel: string;
+} | {
+    input: string;
+};
+
+// @public (undocumented)
+export type Input = {
+    name: string;
+    arguments: Arguments;
 };
 
 // @public (undocumented)
@@ -119,6 +127,7 @@ export type ModelIntrospectionSchema = {
     queries?: SchemaQueries;
     mutations?: SchemaMutations;
     subscriptions?: SchemaSubscriptions;
+    inputs?: SchemaInputs;
 };
 
 // Warning: (ae-forgotten-export) The symbol "RawAppSyncModelConfig" needs to be exported by the entry point index.d.ts
@@ -145,6 +154,9 @@ export type SchemaEnum = {
 // @public (undocumented)
 export type SchemaEnums = Record<string, SchemaEnum>;
 
+// @public (undocumented)
+export type SchemaInputs = Record<string, Input>;
+
 // @public (undocumented)
 export type SchemaModel = {
     name: string;

packages/appsync-modelgen-plugin/schemas/introspection/1/ModelIntrospectionSchema.json

@@ -23,6 +23,9 @@
         },
         "subscriptions": {
             "$ref": "#/definitions/SchemaSubscriptions"
+        },
+        "inputs": {
+            "$ref": "#/definitions/SchemaInputs"
         }
     },
     "required": [
@@ -237,6 +240,18 @@
                         "nonModel"
                     ],
                     "additionalProperties": false
+                },
+                {
+                    "type": "object",
+                    "properties": {
+                        "input": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "input"
+                    ],
+                    "additionalProperties": false
                 }
             ]
         },
@@ -506,6 +521,32 @@
         },
         "SchemaSubscription": {
             "$ref": "#/definitions/SchemaQuery"
+        },
+        "SchemaInputs": {
+            "$ref": "#/definitions/Record%3Cstring%2CInput%3E"
+        },
+        "Record<string,Input>": {
+            "type": "object",
+            "additionalProperties": {
+                "$ref": "#/definitions/Input"
+            }
+        },
+        "Input": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "arguments": {
+                    "$ref": "#/definitions/Arguments"
+                }
+            },
+            "required": [
+                "name",
+                "arguments"
+            ],
+            "additionalProperties": false,
+            "description": "Input Definition"
         }
     }
 }