fix(relational-transformer): read related-table GSIs compatibly with aws-cdk-lib 2.260 (globalSecondaryIndexes no longer populated) [#3505]

aws-cdk-lib 2.260 renamed the private DynamoDB L2 Table field
`globalSecondaryIndexes`/`localSecondaryIndexes` to
`_globalSecondaryIndexes`/`_localSecondaryIndexes` (now ArrayBox-backed,
same `.some`/`.find`/`.length` surface and `{ indexName, keySchema }`
element shape). The transformer read the old names, yielding `undefined`
and `TypeError: Cannot read properties of undefined (reading 'some'/'find')`,
breaking 63 relational unit tests plus a conversation unit test.

Read the renamed field first, falling back to the public
`globalSecondaryIndexes` used by Amplify's managed-table construct, so the
duplicate-index-name dedupe is preserved (not disabled) for both table types.

Sites fixed:
- amplify-graphql-relational-transformer/src/resolvers.ts (3 reads)
- amplify-graphql-transformer-core/src/utils/schema-utils.ts (getKeySchema)
- amplify-graphql-conversation-transformer conversation-resolver-generator.ts

Author: Simone319

packages/amplify-graphql-conversation-transformer/src/transformer-steps/conversation-resolver-generator.ts

@@ -331,7 +331,11 @@ export class ConversationResolverGenerator {
       writeCapacity: cdk.Fn.ref(ResourceConstants.PARAMETERS.DynamoDBModelTableWriteIOPS),
     });
 
-    const gsi = table.globalSecondaryIndexes.find((g: any) => g.indexName === indexName);
+    // aws-cdk-lib 2.260 renamed the private `globalSecondaryIndexes` array on the DynamoDB L2 `Table` to
+    // `_globalSecondaryIndexes` (an `ArrayBox` exposing the same `find` surface and `{ indexName, keySchema }`
+    // element shape); Amplify's managed-table construct keeps the public `globalSecondaryIndexes` array.
+    const globalSecondaryIndexes = table['_globalSecondaryIndexes'] ?? table.globalSecondaryIndexes;
+    const gsi = globalSecondaryIndexes.find((g: any) => g.indexName === indexName);
 
     const newIndex = {
       indexName,

packages/amplify-graphql-relational-transformer/src/resolvers.ts

@@ -29,6 +29,18 @@ import { getSortKeyFields } from './schema';
 import { HasManyDirectiveConfiguration, HasOneDirectiveConfiguration } from './types';
 import { getConnectionAttributeName, getObjectPrimaryKey } from './utils';
 
+/**
+ * Reads the list of global secondary indexes tracked on a DynamoDB L2 `Table` construct.
+ *
+ * `aws-cdk-lib` 2.260 renamed the (private) `globalSecondaryIndexes` array to `_globalSecondaryIndexes`
+ * and now backs it with an `ArrayBox`, which still exposes the array-like `some`/`find`/`length` surface
+ * and the same element shape (`{ indexName, keySchema }`). Amplify's own managed-table construct
+ * (`AmplifyDynamoDBTable`) instead keeps its indexes on a public `globalSecondaryIndexes` array. Reading
+ * `_globalSecondaryIndexes` first and falling back to `globalSecondaryIndexes` works for both table types
+ * and preserves the duplicate-index-name detection rather than silently disabling it.
+ */
+const getGlobalSecondaryIndexes = (table: any): any => table['_globalSecondaryIndexes'] ?? table.globalSecondaryIndexes;
+
 /**
  * Creates a GSI on the table of the `relatedType` based on the config's `references` / `referenceNodes`
  *
@@ -54,7 +66,7 @@ export const updateTableForReferencesConnection = (
   }
 
   const relatedTable = getTable(ctx, relatedType);
-  const gsis = relatedTable.globalSecondaryIndexes;
+  const gsis = getGlobalSecondaryIndexes(relatedTable);
   if (gsis.some((gsi: any) => gsi.indexName === indexName)) {
     // We create a GSI on the Related model's table for querying
     // relationships using the format 'gsi-{PrimaryModelName}.{PrimaryModelConnectionField}'
@@ -136,7 +148,7 @@ export const updateTableForConnection = (config: HasManyDirectiveConfiguration,
   const { field, object, relatedType } = config;
   const mappedObjectName = ctx.resourceHelper.getModelNameMapping(object.name.value);
   const table = getTable(ctx, relatedType) as any;
-  const gsis = table.globalSecondaryIndexes;
+  const gsis = getGlobalSecondaryIndexes(table);
 
   const indexName = `gsi-${mappedObjectName}.${field.name.value}`;
   config.indexName = indexName;
@@ -202,7 +214,7 @@ const addGlobalSecondaryIndex = (
   // At the L2 level, the CDK does not handle the way Amplify sets GSI read and write capacity
   // very well. At the L1 level, the CDK does not create the correct IAM policy for accessing the
   // GSI. To get around these issues, keep the L1 and L2 GSI list in sync.
-  const gsi = table.globalSecondaryIndexes.find((g: any) => g.indexName === indexName);
+  const gsi = getGlobalSecondaryIndexes(table).find((g: any) => g.indexName === indexName);
 
   const newIndex = {
     indexName,

packages/amplify-graphql-transformer-core/src/utils/schema-utils.ts

@@ -9,11 +9,20 @@ import { getModelDataSourceStrategy } from './model-datasource-strategy-utils';
 /**
  * getKeySchema
  */
-export const getKeySchema = (table: any, indexName?: string): any =>
-  (
-    table.globalSecondaryIndexes.find((gsi: any) => gsi.indexName === indexName) ??
-    table.localSecondaryIndexes.find((gsi: any) => gsi.indexName === indexName)
-  )?.keySchema ?? table.keySchema;
+export const getKeySchema = (table: any, indexName?: string): any => {
+  // aws-cdk-lib 2.260 renamed the private `globalSecondaryIndexes`/`localSecondaryIndexes` arrays on the
+  // DynamoDB L2 `Table` to `_globalSecondaryIndexes`/`_localSecondaryIndexes` (now `ArrayBox`es exposing the
+  // same `find` surface and element shape). Amplify's managed-table construct keeps the public array names.
+  // Read the renamed fields first, falling back to the public ones so both table types resolve correctly.
+  const globalSecondaryIndexes = table['_globalSecondaryIndexes'] ?? table.globalSecondaryIndexes;
+  const localSecondaryIndexes = table['_localSecondaryIndexes'] ?? table.localSecondaryIndexes;
+  return (
+    (
+      globalSecondaryIndexes.find((gsi: any) => gsi.indexName === indexName) ??
+      localSecondaryIndexes.find((gsi: any) => gsi.indexName === indexName)
+    )?.keySchema ?? table.keySchema
+  );
+};
 
 /**
  * getTable