@aws-amplify/graphql-api-construct 1.8.0-sql-gen2-1.0 → 1.8.0-z-data-schema-generator.0

package/node_modules/graphql-transformer-common/API.md

@@ -407,11 +407,10 @@ export class ResourceConstants {
         OpenSearchStreamingLambdaIAMRoleLogicalID: string;
         OpenSearchStreamingLambdaFunctionLogicalID: string;
         OpenSearchDataSourceLogicalID: string;
-        AmplifySQLLayerNotificationTopicName: string;
-        AmplifySQLLayerNotificationTopicAccount: string;
-        SQLLayerVersionManifestBucket: string;
-        SQLLayerVersionManifestBucketRegion: string;
+        SQLLayerManifestBucket: string;
+        SQLLayerManifestBucketRegion: string;
         SQLLayerVersionManifestKeyPrefix: string;
+        SQLSNSTopicARNManifestKeyPrefix: string;
         NoneDataSource: string;
         AuthCognitoUserPoolLogicalID: string;
         AuthCognitoUserPoolNativeClientLogicalID: string;

package/node_modules/graphql-transformer-common/CHANGELOG.md

@@ -3,9 +3,11 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [4.29.1-sql-gen2-1.0](https://github.com/aws-amplify/amplify-category-api/compare/graphql-transformer-common@4.29.0...graphql-transformer-common@4.29.1-sql-gen2-1.0) (2024-04-02)
+# [4.30.0-z-data-schema-generator.0](https://github.com/aws-amplify/amplify-category-api/compare/graphql-transformer-common@4.29.0...graphql-transformer-common@4.30.0-z-data-schema-generator.0) (2024-04-05)
 
-**Note:** Version bump only for package graphql-transformer-common
+### Features
+
+- Fetch SNS topic ARN from SQL manifest ([#2345](https://github.com/aws-amplify/amplify-category-api/issues/2345)) ([fca256e](https://github.com/aws-amplify/amplify-category-api/commit/fca256e7cabf5af838b28b26c4ae0c3c8b1583eb))
 
 # [4.29.0](https://github.com/aws-amplify/amplify-category-api/compare/graphql-transformer-common@4.28.1...graphql-transformer-common@4.29.0) (2024-03-28)
 

package/node_modules/graphql-transformer-common/lib/ResourceConstants.d.ts

@@ -19,11 +19,10 @@ export declare class ResourceConstants {
         OpenSearchStreamingLambdaIAMRoleLogicalID: string;
         OpenSearchStreamingLambdaFunctionLogicalID: string;
         OpenSearchDataSourceLogicalID: string;
-        AmplifySQLLayerNotificationTopicName: string;
-        AmplifySQLLayerNotificationTopicAccount: string;
-        SQLLayerVersionManifestBucket: string;
-        SQLLayerVersionManifestBucketRegion: string;
+        SQLLayerManifestBucket: string;
+        SQLLayerManifestBucketRegion: string;
         SQLLayerVersionManifestKeyPrefix: string;
+        SQLSNSTopicARNManifestKeyPrefix: string;
         NoneDataSource: string;
         AuthCognitoUserPoolLogicalID: string;
         AuthCognitoUserPoolNativeClientLogicalID: string;

package/node_modules/graphql-transformer-common/lib/ResourceConstants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ResourceConstants.d.ts","sourceRoot":"","sources":["../src/ResourceConstants.ts"],"names":[],"mappings":"AAAA,qBAAa,iBAAiB;IAC5B,OAAc,IAAI,SAAU;IAE5B,OAAc,kBAAkB,SAAO;IAEvC,OAAc,6BAA6B,SAAO;IAElD,OAAc,6BAA6B,SAAO;IAElD,gBAAuB,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;MA2E9B;IAEF,OAAc,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAiDtB;IAEF,OAAc,QAAQ,KAAM;IAE5B,OAAc,UAAU;;;;;;;MAYtB;IAEF,OAAc,OAAO;;;;;;;;;;;;;;;MAsBnB;IAEF,OAAc,QAAQ,KAAM;IAE5B,gBAAuB,QAAQ;;;;;;;;;;;;;;;MAe7B;CACH"}
+{"version":3,"file":"ResourceConstants.d.ts","sourceRoot":"","sources":["../src/ResourceConstants.ts"],"names":[],"mappings":"AAAA,qBAAa,iBAAiB;IAC5B,OAAc,IAAI,SAAU;IAE5B,OAAc,kBAAkB,SAAO;IAEvC,OAAc,6BAA6B,SAAO;IAElD,OAAc,6BAA6B,SAAO;IAElD,gBAAuB,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;MAkE9B;IAEF,OAAc,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAiDtB;IAEF,OAAc,QAAQ,KAAM;IAE5B,OAAc,UAAU;;;;;;;MAYtB;IAEF,OAAc,OAAO;;;;;;;;;;;;;;;MAsBnB;IAEF,OAAc,QAAQ,KAAM;IAE5B,gBAAuB,QAAQ;;;;;;;;;;;;;;;MAe7B;CACH"}

package/node_modules/graphql-transformer-common/lib/ResourceConstants.js

@@ -24,11 +24,10 @@ ResourceConstants.RESOURCES = {
     OpenSearchStreamingLambdaIAMRoleLogicalID: 'OpenSearchStreamingLambdaIAMRole',
     OpenSearchStreamingLambdaFunctionLogicalID: 'OpenSearchStreamingLambdaFunction',
     OpenSearchDataSourceLogicalID: 'OpenSearchDataSource',
-    AmplifySQLLayerNotificationTopicName: 'AmplifySQLLayerNotification',
-    AmplifySQLLayerNotificationTopicAccount: '582037449441',
-    SQLLayerVersionManifestBucket: 'amplify-rds-layer-resources',
-    SQLLayerVersionManifestBucketRegion: 'us-east-1',
+    SQLLayerManifestBucket: 'amplify-rds-layer-resources',
+    SQLLayerManifestBucketRegion: 'us-east-1',
     SQLLayerVersionManifestKeyPrefix: 'sql-layer-versions/',
+    SQLSNSTopicARNManifestKeyPrefix: 'sql-sns-topic-versions/',
     NoneDataSource: 'NoneDataSource',
     AuthCognitoUserPoolLogicalID: 'AuthCognitoUserPool',
     AuthCognitoUserPoolNativeClientLogicalID: 'AuthCognitoUserPoolNativeClient',

package/node_modules/graphql-transformer-common/lib/ResourceConstants.js.map

@@ -1 +1 @@
-{"version":3,"file":"ResourceConstants.js","sourceRoot":"","sources":["../src/ResourceConstants.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ResourceConstants.js","sourceRoot":"","sources":["../src/ResourceConstants.ts"],"names":[],"mappings":"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"}

package/node_modules/graphql-transformer-common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-transformer-common",
-  "version": "4.29.1-sql-gen2-1.0",
+  "version": "4.30.0-z-data-schema-generator.0",
   "description": "Common code and constants for AppSync Transformers",
   "repository": {
     "type": "git",
@@ -66,5 +66,5 @@
       "/__tests__/"
     ]
   },
-  "gitHead": "6b20fe9d8698030b08f97f0ac49cd1cba3aa63c9"
+  "gitHead": "fedc7c8d8dad7969950662507dfe2f6b07a8aee0"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-api-construct",
-  "version": "1.8.0-sql-gen2-1.0",
+  "version": "1.8.0-z-data-schema-generator.0",
   "description": "AppSync GraphQL Api Construct using Amplify GraphQL Transformer.",
   "repository": {
     "type": "git",
@@ -76,21 +76,21 @@
   "dependencies": {
     "@aws-amplify/backend-output-schemas": "^0.4.0",
     "@aws-amplify/backend-output-storage": "^0.2.2",
-    "@aws-amplify/graphql-auth-transformer": "3.5.0-sql-gen2-1.0",
-    "@aws-amplify/graphql-default-value-transformer": "2.3.3-sql-gen2-1.0",
-    "@aws-amplify/graphql-directives": "1.1.0-sql-gen2-1.0",
-    "@aws-amplify/graphql-function-transformer": "2.1.20-sql-gen2-1.0",
-    "@aws-amplify/graphql-http-transformer": "2.1.20-sql-gen2-1.0",
-    "@aws-amplify/graphql-index-transformer": "2.4.0-sql-gen2-1.0",
-    "@aws-amplify/graphql-maps-to-transformer": "3.4.10-sql-gen2-1.0",
-    "@aws-amplify/graphql-model-transformer": "2.8.0-sql-gen2-1.0",
-    "@aws-amplify/graphql-predictions-transformer": "2.1.20-sql-gen2-1.0",
-    "@aws-amplify/graphql-relational-transformer": "2.5.0-sql-gen2-1.0",
-    "@aws-amplify/graphql-searchable-transformer": "2.7.0-sql-gen2-1.0",
-    "@aws-amplify/graphql-sql-transformer": "0.3.0-sql-gen2-1.0",
-    "@aws-amplify/graphql-transformer": "1.4.1-sql-gen2-1.0",
-    "@aws-amplify/graphql-transformer-core": "2.5.2-sql-gen2-1.0",
-    "@aws-amplify/graphql-transformer-interfaces": "3.6.0-sql-gen2-1.0",
+    "@aws-amplify/graphql-auth-transformer": "3.4.3-z-data-schema-generator.0",
+    "@aws-amplify/graphql-default-value-transformer": "2.3.3-z-data-schema-generator.0",
+    "@aws-amplify/graphql-directives": "1.0.1",
+    "@aws-amplify/graphql-function-transformer": "2.1.20-z-data-schema-generator.0",
+    "@aws-amplify/graphql-http-transformer": "2.1.20-z-data-schema-generator.0",
+    "@aws-amplify/graphql-index-transformer": "2.3.9-z-data-schema-generator.0",
+    "@aws-amplify/graphql-maps-to-transformer": "3.4.10-z-data-schema-generator.0",
+    "@aws-amplify/graphql-model-transformer": "2.8.0-z-data-schema-generator.0",
+    "@aws-amplify/graphql-predictions-transformer": "2.1.20-z-data-schema-generator.0",
+    "@aws-amplify/graphql-relational-transformer": "2.4.3-z-data-schema-generator.0",
+    "@aws-amplify/graphql-searchable-transformer": "2.6.3-z-data-schema-generator.0",
+    "@aws-amplify/graphql-sql-transformer": "0.2.9-z-data-schema-generator.0",
+    "@aws-amplify/graphql-transformer": "1.5.0-z-data-schema-generator.0",
+    "@aws-amplify/graphql-transformer-core": "2.6.0-z-data-schema-generator.0",
+    "@aws-amplify/graphql-transformer-interfaces": "3.6.0-z-data-schema-generator.0",
     "@aws-amplify/platform-core": "^0.2.0",
     "@aws-amplify/plugin-types": "^0.4.1",
     "charenc": "^0.0.2",
@@ -99,7 +99,7 @@
     "graceful-fs": "^4.2.11",
     "graphql": "^15.5.0",
     "graphql-mapping-template": "4.20.15",
-    "graphql-transformer-common": "4.29.1-sql-gen2-1.0",
+    "graphql-transformer-common": "4.30.0-z-data-schema-generator.0",
     "hjson": "^3.2.2",
     "immer": "^9.0.12",
     "is-buffer": "^2.0.5",
@@ -114,7 +114,7 @@
     "zod": "^3.22.3"
   },
   "devDependencies": {
-    "@aws-amplify/graphql-transformer-test-utils": "0.4.8-sql-gen2-1.0",
+    "@aws-amplify/graphql-transformer-test-utils": "0.5.0-z-data-schema-generator.0",
     "@types/fs-extra": "^8.0.1",
     "@types/node": "^12.12.6",
     "aws-cdk-lib": "2.80.0",
@@ -179,5 +179,5 @@
       "/__tests__/"
     ]
   },
-  "gitHead": "6b20fe9d8698030b08f97f0ac49cd1cba3aa63c9"
+  "gitHead": "fedc7c8d8dad7969950662507dfe2f6b07a8aee0"
 }

package/src/amplify-graphql-api.ts

@@ -48,7 +48,6 @@ import {
   getGeneratedFunctionSlots,
   CodegenAssets,
   getAdditionalAuthenticationTypes,
-  validateAuthorizationModes,
 } from './internal';
 import { getStackForScope, walkAndProcessNodes } from './internal/construct-tree';
 import { getDataSourceStrategiesProvider } from './internal/data-source-config';
@@ -170,7 +169,6 @@ export class AmplifyGraphqlApi extends Construct {
       dataSources,
     });
 
-    validateAuthorizationModes(authorizationModes);
     const { authConfig, authSynthParameters } = convertAuthorizationModesToTransformerAuthConfig(authorizationModes);
 
     validateFunctionSlots(functionSlots ?? []);
@@ -220,6 +218,7 @@ export class AmplifyGraphqlApi extends Construct {
       // CDK construct uses a custom resource. We'll define this explicitly here to remind ourselves that this value is unused in the CDK
       // construct flow
       rdsLayerMapping: undefined,
+      rdsSnsTopicMapping: undefined,
       ...getDataSourceStrategiesProvider(definition),
     };
 

package/src/index.ts

@@ -4,7 +4,6 @@
  */
 export type {
   IAMAuthorizationConfig,
-  IdentityPoolAuthorizationConfig,
   UserPoolAuthorizationConfig,
   OIDCAuthorizationConfig,
   ApiKeyAuthorizationConfig,

package/src/internal/authorization-modes.ts

@@ -5,61 +5,19 @@ import { IRole, ServicePrincipal } from 'aws-cdk-lib/aws-iam';
 import {
   AuthorizationModes,
   ApiKeyAuthorizationConfig,
+  IAMAuthorizationConfig,
   LambdaAuthorizationConfig,
   OIDCAuthorizationConfig,
   UserPoolAuthorizationConfig,
 } from '../types';
 
 type AuthorizationConfigMode =
-  | { type: 'AWS_IAM' }
+  | (IAMAuthorizationConfig & { type: 'AWS_IAM' })
   | (UserPoolAuthorizationConfig & { type: 'AMAZON_COGNITO_USER_POOLS' })
   | (OIDCAuthorizationConfig & { type: 'OPENID_CONNECT' })
   | (ApiKeyAuthorizationConfig & { type: 'API_KEY' })
   | (LambdaAuthorizationConfig & { type: 'AWS_LAMBDA' });
 
-/**
- * Validates authorization modes.
- *
- * Rules:
- * 1. Validates that deprecated settings ('iamConfig.authenticatedUserRole', 'iamConfig.unauthenticatedUserRole',
- *    'iamConfig.identityPoolId', 'iamConfig.allowListedRoles' and 'adminRoles') are mutually exclusive with new settings that
- *    replaced them ('iamConfig.enableIamAuthorizationMode' and any of 'authorizationModes.identityPoolConfig')
- * 2. If deprecated identity pool settings are used ('iamConfig.authenticatedUserRole', 'iamConfig.unauthenticatedUserRole',
- *    and 'iamConfig.identityPoolId') validate that all are provided.
- */
-export const validateAuthorizationModes = (authorizationModes: AuthorizationModes): void => {
-  const hasAnyDeprecatedIdentityPoolSetting =
-    authorizationModes.iamConfig?.authenticatedUserRole ||
-    authorizationModes.iamConfig?.unauthenticatedUserRole ||
-    authorizationModes.iamConfig?.identityPoolId;
-  const hasAllDeprecatedIdentityPoolSettings =
-    authorizationModes.iamConfig?.authenticatedUserRole &&
-    authorizationModes.iamConfig?.unauthenticatedUserRole &&
-    authorizationModes.iamConfig?.identityPoolId;
-  const hasDeprecatedIamSettings =
-    authorizationModes.iamConfig?.authenticatedUserRole ||
-    authorizationModes.iamConfig?.unauthenticatedUserRole ||
-    authorizationModes.iamConfig?.identityPoolId ||
-    authorizationModes.iamConfig?.allowListedRoles ||
-    authorizationModes.adminRoles;
-  const hasUnDeprecatedIamSettings =
-    typeof authorizationModes.iamConfig?.enableIamAuthorizationMode !== 'undefined' || authorizationModes.identityPoolConfig;
-
-  if (hasDeprecatedIamSettings && hasUnDeprecatedIamSettings) {
-    throw new Error(
-      'Invalid authorization modes configuration provided. ' +
-        "Deprecated IAM configuration cannot be used with identity pool configuration or when 'enableIamAuthorizationMode' is specified.",
-    );
-  }
-
-  if (hasAnyDeprecatedIdentityPoolSetting && !hasAllDeprecatedIdentityPoolSettings) {
-    throw new Error(
-      "'authorizationModes.iamConfig.authenticatedUserRole', 'authorizationModes.iamConfig.unauthenticatedUserRole' and" +
-        " 'authorizationModes.iamConfig.identityPoolId' must be provided.",
-    );
-  }
-};
-
 /**
  * Converts a single auth mode config into the amplify-internal representation.
  * @param authMode the auth mode to convert into the Appsync CDK representation.
@@ -121,7 +79,7 @@ const convertAuthConfigToAppSyncAuth = (authModes: AuthorizationModes): AppSyncA
     authModes.lambdaConfig ? { type: 'AWS_LAMBDA', ...authModes.lambdaConfig } : null,
     authModes.oidcConfig ? { type: 'OPENID_CONNECT', ...authModes.oidcConfig } : null,
     authModes.userPoolConfig ? { type: 'AMAZON_COGNITO_USER_POOLS', ...authModes.userPoolConfig } : null,
-    authModes.iamConfig || authModes.identityPoolConfig ? { type: 'AWS_IAM' } : null,
+    authModes.iamConfig ? { type: 'AWS_IAM', ...authModes.iamConfig } : null,
   ].filter((mode) => mode) as AuthorizationConfigMode[];
   const authProviders = authConfig.map(convertAuthModeToAuthProvider);
 
@@ -158,7 +116,7 @@ const convertAuthConfigToAppSyncAuth = (authModes: AuthorizationModes): AppSyncA
 
 type AuthSynthParameters = Pick<
   SynthParameters,
-  'userPoolId' | 'authenticatedUserRoleName' | 'unauthenticatedUserRoleName' | 'identityPoolId' | 'adminRoles' | 'enableIamAccess'
+  'userPoolId' | 'authenticatedUserRoleName' | 'unauthenticatedUserRoleName' | 'identityPoolId' | 'adminRoles'
 >;
 
 interface AuthConfig {
@@ -219,19 +177,12 @@ const getAllowListedRoles = (authModes: AuthorizationModes): string[] =>
  */
 const getSynthParameters = (authModes: AuthorizationModes): AuthSynthParameters => ({
   adminRoles: getAllowListedRoles(authModes),
-  identityPoolId: authModes.identityPoolConfig?.identityPoolId ?? authModes.iamConfig?.identityPoolId,
-  enableIamAccess: authModes.iamConfig?.enableIamAuthorizationMode,
+  identityPoolId: authModes.iamConfig?.identityPoolId,
   ...(authModes.userPoolConfig ? { userPoolId: authModes.userPoolConfig.userPool.userPoolId } : {}),
-  ...(authModes?.identityPoolConfig
-    ? {
-        authenticatedUserRoleName: authModes.identityPoolConfig.authenticatedUserRole.roleName,
-        unauthenticatedUserRoleName: authModes.identityPoolConfig.unauthenticatedUserRole.roleName,
-      }
-    : {}),
-  ...(authModes?.iamConfig && authModes?.iamConfig.authenticatedUserRole && authModes?.iamConfig.unauthenticatedUserRole
+  ...(authModes?.iamConfig
     ? {
-        authenticatedUserRoleName: authModes.iamConfig.authenticatedUserRole?.roleName,
-        unauthenticatedUserRoleName: authModes.iamConfig.unauthenticatedUserRole?.roleName,
+        authenticatedUserRoleName: authModes.iamConfig.authenticatedUserRole.roleName,
+        unauthenticatedUserRoleName: authModes.iamConfig.unauthenticatedUserRole.roleName,
       }
     : {}),
 });

package/src/internal/codegen-assets.ts

@@ -1,5 +1,5 @@
-import { RemovalPolicy, Fn } from 'aws-cdk-lib';
-import { Bucket, HttpMethods, IBucket } from 'aws-cdk-lib/aws-s3';
+import { RemovalPolicy } from 'aws-cdk-lib';
+import { Bucket, IBucket } from 'aws-cdk-lib/aws-s3';
 import { BucketDeployment, Source } from 'aws-cdk-lib/aws-s3-deployment';
 import { Construct } from 'constructs';
 
@@ -8,7 +8,6 @@ export type CodegenAssetsProps = {
 };
 
 const MODEL_SCHEMA_KEY = 'model-schema.graphql';
-const CONSOLE_SERVICE_ENDPOINT = Fn.join('', ['https://', Fn.ref('AWS::Region'), '.console.aws.amazon.com/amplify']);
 
 /**
  * Construct an S3 URI string for a given bucket and key.
@@ -31,14 +30,6 @@ export class CodegenAssets extends Construct {
     const bucket = new Bucket(this, `${id}Bucket`, {
       removalPolicy: RemovalPolicy.DESTROY,
       autoDeleteObjects: true,
-      // Enabling CORS to allow console to access the codegen assets.
-      cors: [
-        {
-          allowedMethods: [HttpMethods.GET, HttpMethods.HEAD],
-          allowedHeaders: ['*'],
-          allowedOrigins: [CONSOLE_SERVICE_ENDPOINT],
-        },
-      ],
     });
 
     const deployment = new BucketDeployment(this, `${id}Deployment`, {

package/src/types.ts

@@ -28,68 +28,25 @@ export interface IAMAuthorizationConfig {
   /**
    * ID for the Cognito Identity Pool vending auth and unauth roles.
    * Format: `<region>:<id string>`
-   *
-   * @deprecated Use 'IdentityPoolAuthorizationConfig.identityPoolId' instead.
-   * See https://docs.amplify.aws/cli/react/tools/cli/migration/iam-auth-updates-for-cdk-construct for details.
    */
-  readonly identityPoolId?: string;
+  readonly identityPoolId: string;
 
   /**
    * Authenticated user role, applies to { provider: iam, allow: private } access.
-   *
-   * @deprecated Use 'IdentityPoolAuthorizationConfig.authenticatedUserRole' instead.
-   * See https://docs.amplify.aws/cli/react/tools/cli/migration/iam-auth-updates-for-cdk-construct for details.
    */
-  readonly authenticatedUserRole?: IRole;
+  readonly authenticatedUserRole: IRole;
 
   /**
    * Unauthenticated user role, applies to { provider: iam, allow: public } access.
-   *
-   * @deprecated Use 'IdentityPoolAuthorizationConfig.unauthenticatedUserRole' instead.
-   * See https://docs.amplify.aws/cli/react/tools/cli/migration/iam-auth-updates-for-cdk-construct for details.
    */
-  readonly unauthenticatedUserRole?: IRole;
+  readonly unauthenticatedUserRole: IRole;
 
   /**
    * A list of IAM roles which will be granted full read/write access to the generated model if IAM auth is enabled.
    * If an IRole is provided, the role `name` will be used for matching.
    * If a string is provided, the raw value will be used for matching.
-   *
-   * @deprecated Use 'enableIamAuthorizationMode' and IAM Policy to control access for IAM principals.
-   * See https://docs.amplify.aws/cli/react/tools/cli/migration/iam-auth-updates-for-cdk-construct for details.
    */
   readonly allowListedRoles?: (IRole | string)[];
-
-  /**
-   * Enables access for IAM principals. If enabled @auth directive rules are not applied.
-   * Instead, access should be defined by IAM Policy, see https://docs.aws.amazon.com/service-authorization/latest/reference/list_awsappsync.html.
-   *
-   * Does not apply to authenticated and unauthenticated IAM Roles attached to Cognito Identity Pool.
-   * Use IdentityPoolAuthorizationConfig to configure their access.
-   */
-  readonly enableIamAuthorizationMode?: boolean;
-}
-
-/**
- * Configuration for Cognito Identity Pool Authorization on the Graphql Api.
- * @struct - required since this interface begins with an 'I'
- */
-export interface IdentityPoolAuthorizationConfig {
-  /**
-   * ID for the Cognito Identity Pool vending auth and unauth roles.
-   * Format: `<region>:<id string>`
-   */
-  readonly identityPoolId: string;
-
-  /**
-   * Authenticated user role, applies to { provider: iam, allow: private } access.
-   */
-  readonly authenticatedUserRole: IRole;
-
-  /**
-   * Unauthenticated user role, applies to { provider: iam, allow: public } access.
-   */
-  readonly unauthenticatedUserRole: IRole;
 }
 
 /**
@@ -177,18 +134,10 @@ export interface AuthorizationModes {
   readonly defaultAuthorizationMode?: 'AWS_IAM' | 'AMAZON_COGNITO_USER_POOLS' | 'OPENID_CONNECT' | 'API_KEY' | 'AWS_LAMBDA';
 
   /**
-   * IAM Auth config, required to allow IAM-based access to this API.
-   * This applies to any IAM principal except Amazon Cognito identity pool's authenticated and unauthenticated roles.
-   * This behavior was has recently been improved.
-   * See https://docs.amplify.aws/cli/react/tools/cli/migration/iam-auth-updates-for-cdk-construct for details.
-   */
-  readonly iamConfig?: IAMAuthorizationConfig;
-
-  /**
-   * Cognito Identity Pool config, required if an 'identityPool' auth provider is specified in the Api.
+   * IAM Auth config, required if an 'iam' auth provider is specified in the Api.
    * Applies to 'public' and 'private' auth strategies.
    */
-  readonly identityPoolConfig?: IdentityPoolAuthorizationConfig;
+  readonly iamConfig?: IAMAuthorizationConfig;
 
   /**
    * Cognito UserPool config, required if a 'userPools' auth provider is specified in the Api.

package/node_modules/@aws-amplify/graphql-auth-transformer/lib/vtl-generator/common.d.ts

@@ -1,4 +0,0 @@
-import { Expression } from 'graphql-mapping-template';
-export declare const setHasAuthExpression: Expression;
-export declare const isNonCognitoIAMPrincipal: import("graphql-mapping-template").AndNode;
-//# sourceMappingURL=common.d.ts.map

package/node_modules/@aws-amplify/graphql-auth-transformer/lib/vtl-generator/common.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/vtl-generator/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,UAAU,EAA8B,MAAM,0BAA0B,CAAC;AAIrG,eAAO,MAAM,oBAAoB,EAAE,UAA+E,CAAC;AAGnH,eAAO,MAAM,wBAAwB,4CAInC,CAAC"}

package/node_modules/@aws-amplify/graphql-auth-transformer/lib/vtl-generator/common.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNonCognitoIAMPrincipal = exports.setHasAuthExpression = void 0;
-const graphql_mapping_template_1 = require("graphql-mapping-template");
-const utils_1 = require("../utils");
-exports.setHasAuthExpression = (0, graphql_mapping_template_1.qref)((0, graphql_mapping_template_1.methodCall)((0, graphql_mapping_template_1.ref)('ctx.stash.put'), (0, graphql_mapping_template_1.str)('hasAuth'), (0, graphql_mapping_template_1.bool)(true)));
-exports.isNonCognitoIAMPrincipal = (0, graphql_mapping_template_1.and)([
-    (0, graphql_mapping_template_1.equals)((0, graphql_mapping_template_1.ref)('util.authType()'), (0, graphql_mapping_template_1.str)(utils_1.IAM_AUTH_TYPE)),
-    (0, graphql_mapping_template_1.methodCall)((0, graphql_mapping_template_1.ref)('util.isNull'), (0, graphql_mapping_template_1.ref)('ctx.identity.cognitoIdentityPoolId')),
-    (0, graphql_mapping_template_1.methodCall)((0, graphql_mapping_template_1.ref)('util.isNull'), (0, graphql_mapping_template_1.ref)('ctx.identity.cognitoIdentityId')),
-]);
-//# sourceMappingURL=common.js.map

package/node_modules/@aws-amplify/graphql-auth-transformer/lib/vtl-generator/common.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/vtl-generator/common.ts"],"names":[],"mappings":";;;AAAA,uEAAqG;AACrG,oCAAyC;AAG5B,QAAA,oBAAoB,GAAe,IAAA,+BAAI,EAAC,IAAA,qCAAU,EAAC,IAAA,8BAAG,EAAC,eAAe,CAAC,EAAE,IAAA,8BAAG,EAAC,SAAS,CAAC,EAAE,IAAA,+BAAI,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAGtG,QAAA,wBAAwB,GAAG,IAAA,8BAAG,EAAC;IAC1C,IAAA,iCAAM,EAAC,IAAA,8BAAG,EAAC,iBAAiB,CAAC,EAAE,IAAA,8BAAG,EAAC,qBAAa,CAAC,CAAC;IAClD,IAAA,qCAAU,EAAC,IAAA,8BAAG,EAAC,aAAa,CAAC,EAAE,IAAA,8BAAG,EAAC,oCAAoC,CAAC,CAAC;IACzE,IAAA,qCAAU,EAAC,IAAA,8BAAG,EAAC,aAAa,CAAC,EAAE,IAAA,8BAAG,EAAC,gCAAgC,CAAC,CAAC;CACtE,CAAC,CAAC"}