@aws-amplify/graphql-api-construct 1.5.7-rds-5.0 → 1.6.0-secrets-manager.0

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

@@ -500,20 +500,6 @@ export function toUpper(word: string): string;
 // @public (undocumented)
 export const transformedArgsRef: ReferenceNode;
 
-// @public (undocumented)
-export const TYPESCRIPT_DATA_SCHEMA_CONSTANTS: {
-    SCHEMA_PACKAGE: string;
-    MODEL_METHOD: string;
-    SCHEMA_METHOD: string;
-    IDENTIFIER_METHOD: string;
-    ARRAY_METHOD: string;
-    REQUIRED_METHOD: string;
-    STRING_METHOD: string;
-    ENUM_METHOD: string;
-    REFERENCE_A: string;
-    EXPORT_VARIABLE_NAME: string;
-};
-
 // @public (undocumented)
 export function unwrapNonNull(type: TypeNode): any;
 

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

@@ -3,16 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [4.28.1-rds-5.0](https://github.com/aws-amplify/amplify-category-api/compare/graphql-transformer-common@4.28.0...graphql-transformer-common@4.28.1-rds-5.0) (2024-02-09)
-
-**Note:** Version bump only for package graphql-transformer-common
-
-# [4.28.0](https://github.com/aws-amplify/amplify-category-api/compare/graphql-transformer-common@4.27.1...graphql-transformer-common@4.28.0) (2024-02-05)
-
-### Features
-
-- **api:** generate typescript data schema from sql schema internal representation ([#2225](https://github.com/aws-amplify/amplify-category-api/issues/2225)) ([460b077](https://github.com/aws-amplify/amplify-category-api/commit/460b0776af82932d2b42a2b7720b49b91fdbd45c))
-
 ## [4.27.1](https://github.com/aws-amplify/amplify-category-api/compare/graphql-transformer-common@4.27.0...graphql-transformer-common@4.27.1) (2023-12-18)
 
 **Note:** Version bump only for package graphql-transformer-common

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

@@ -12,5 +12,4 @@ export * from './dynamodbUtils';
 export * from './SyncResourceIDs';
 export * from './PredictionsResourceIDs';
 export * from './transformedArgs';
-export * from './TypescriptSchemaConstants';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,cAAc,CAAC;AAC7B,cAAc,QAAQ,CAAC;AACvB,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,6BAA6B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,cAAc,CAAC;AAC7B,cAAc,QAAQ,CAAC;AACvB,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC"}

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

@@ -28,5 +28,4 @@ __exportStar(require("./dynamodbUtils"), exports);
 __exportStar(require("./SyncResourceIDs"), exports);
 __exportStar(require("./PredictionsResourceIDs"), exports);
 __exportStar(require("./transformedArgs"), exports);
-__exportStar(require("./TypescriptSchemaConstants"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAoC;AACpC,+CAA6B;AAC7B,yCAAuB;AACvB,wDAAsC;AACtC,qDAAmC;AACnC,0DAAwC;AACxC,8CAA4B;AAC5B,oDAAkC;AAClC,wDAAsC;AACtC,oDAAkC;AAClC,kDAAgC;AAChC,oDAAkC;AAClC,2DAAyC;AACzC,oDAAkC;AAClC,8DAA4C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAoC;AACpC,+CAA6B;AAC7B,yCAAuB;AACvB,wDAAsC;AACtC,qDAAmC;AACnC,0DAAwC;AACxC,8CAA4B;AAC5B,oDAAkC;AAClC,wDAAsC;AACtC,oDAAkC;AAClC,kDAAgC;AAChC,oDAAkC;AAClC,2DAAyC;AACzC,oDAAkC"}

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

@@ -1,6 +1,6 @@
 {
   "name": "graphql-transformer-common",
-  "version": "4.28.1-rds-5.0",
+  "version": "4.27.1",
   "description": "Common code and constants for AppSync Transformers",
   "repository": {
     "type": "git",
@@ -59,6 +59,5 @@
       "json",
       "node"
     ]
-  },
-  "gitHead": "553dbfa03d3329121143749cbb04db3f44987b5e"
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-api-construct",
-  "version": "1.5.7-rds-5.0",
+  "version": "1.6.0-secrets-manager.0",
   "description": "AppSync GraphQL Api Construct using Amplify GraphQL Transformer.",
   "repository": {
     "type": "git",
@@ -75,20 +75,20 @@
   "dependencies": {
     "@aws-amplify/backend-output-schemas": "^0.4.0",
     "@aws-amplify/backend-output-storage": "^0.2.2",
-    "@aws-amplify/graphql-auth-transformer": "3.3.7-rds-5.0",
-    "@aws-amplify/graphql-default-value-transformer": "2.2.6-rds-5.0",
-    "@aws-amplify/graphql-function-transformer": "2.1.18-rds-5.0",
-    "@aws-amplify/graphql-http-transformer": "2.1.18-rds-5.0",
-    "@aws-amplify/graphql-index-transformer": "2.3.6-rds-5.0",
-    "@aws-amplify/graphql-maps-to-transformer": "3.4.7-rds-5.0",
-    "@aws-amplify/graphql-model-transformer": "2.4.6-rds-5.0",
-    "@aws-amplify/graphql-predictions-transformer": "2.1.18-rds-5.0",
-    "@aws-amplify/graphql-relational-transformer": "2.3.7-rds-5.0",
-    "@aws-amplify/graphql-searchable-transformer": "2.5.3-rds-5.0",
-    "@aws-amplify/graphql-sql-transformer": "0.2.6-rds-5.0",
-    "@aws-amplify/graphql-transformer": "1.3.11-rds-5.0",
-    "@aws-amplify/graphql-transformer-core": "2.4.6-rds-5.0",
-    "@aws-amplify/graphql-transformer-interfaces": "3.3.3",
+    "@aws-amplify/graphql-auth-transformer": "3.3.6-secrets-manager.0",
+    "@aws-amplify/graphql-default-value-transformer": "2.2.5-secrets-manager.0",
+    "@aws-amplify/graphql-function-transformer": "2.1.17-secrets-manager.0",
+    "@aws-amplify/graphql-http-transformer": "2.1.17-secrets-manager.0",
+    "@aws-amplify/graphql-index-transformer": "2.3.5-secrets-manager.0",
+    "@aws-amplify/graphql-maps-to-transformer": "3.4.6-secrets-manager.0",
+    "@aws-amplify/graphql-model-transformer": "2.5.0-secrets-manager.0",
+    "@aws-amplify/graphql-predictions-transformer": "2.1.17-secrets-manager.0",
+    "@aws-amplify/graphql-relational-transformer": "2.3.6-secrets-manager.0",
+    "@aws-amplify/graphql-searchable-transformer": "2.5.2-secrets-manager.0",
+    "@aws-amplify/graphql-sql-transformer": "0.2.5-secrets-manager.0",
+    "@aws-amplify/graphql-transformer": "1.4.0-secrets-manager.0",
+    "@aws-amplify/graphql-transformer-core": "2.4.5-secrets-manager.0",
+    "@aws-amplify/graphql-transformer-interfaces": "3.4.0-secrets-manager.0",
     "@aws-amplify/platform-core": "^0.2.0",
     "@aws-amplify/plugin-types": "^0.4.1",
     "charenc": "^0.0.2",
@@ -97,7 +97,7 @@
     "graceful-fs": "^4.2.11",
     "graphql": "^15.5.0",
     "graphql-mapping-template": "4.20.14",
-    "graphql-transformer-common": "4.28.1-rds-5.0",
+    "graphql-transformer-common": "4.27.1",
     "hjson": "^3.2.2",
     "immer": "^9.0.12",
     "is-buffer": "^2.0.5",
@@ -112,7 +112,7 @@
     "zod": "^3.22.3"
   },
   "devDependencies": {
-    "@aws-amplify/graphql-transformer-test-utils": "0.4.6-rds-5.0",
+    "@aws-amplify/graphql-transformer-test-utils": "0.4.5-secrets-manager.0",
     "@types/fs-extra": "^8.0.1",
     "@types/node": "^12.12.6",
     "aws-cdk-lib": "2.80.0",
@@ -171,5 +171,5 @@
     ],
     "testEnvironment": "../../FixJestEnvironment.js"
   },
-  "gitHead": "553dbfa03d3329121143749cbb04db3f44987b5e"
+  "gitHead": "1b45d39e2064522f7bce51bd8bf5135742d4ce14"
 }

package/src/internal/data-source-config.ts

@@ -6,7 +6,12 @@ import {
   isMutationNode,
   fieldsWithSqlDirective,
 } from '@aws-amplify/graphql-transformer-core';
-import { DataSourceStrategiesProvider } from '@aws-amplify/graphql-transformer-interfaces';
+import {
+  DataSourceStrategiesProvider,
+  isSqlModelDataSourceSsmDbConnectionConfig,
+  isSqlModelDataSourceSecretsManagerDbConnectionConfig,
+} from '@aws-amplify/graphql-transformer-interfaces';
+import { Token, Arn, ArnFormat } from 'aws-cdk-lib';
 import {
   CustomSqlDataSourceStrategy as ConstructCustomSqlDataSourceStrategy,
   ModelDataSourceStrategy as ConstructModelDataSourceStrategy,
@@ -184,19 +189,47 @@ export const schemaByMergingDefinitions = (definitions: IAmplifyGraphqlDefinitio
  * @param strategy user provided model data source strategy
  * @returns validates and throws an error if the strategy is invalid
  */
-export const validateDataSourceStrategy = (strategy: ConstructModelDataSourceStrategy) => {
+export const validateDataSourceStrategy = (strategy: ConstructModelDataSourceStrategy): void => {
   if (!isSqlStrategy(strategy)) {
     return;
   }
 
   const dbConnectionConfig = strategy.dbConnectionConfig;
-  const invalidSSMPaths = Object.values(dbConnectionConfig).filter((value) => typeof value === 'string' && !isValidSSMPath(value));
-  if (invalidSSMPaths.length > 0) {
-    throw new Error(
-      `Invalid data source strategy "${
-        strategy.name
-      }". Following SSM paths must start with '/' in dbConnectionConfig: ${invalidSSMPaths.join(', ')}.`,
-    );
+  if (isSqlModelDataSourceSsmDbConnectionConfig(dbConnectionConfig)) {
+    const invalidSSMPaths = Object.values(dbConnectionConfig).filter((value) => typeof value === 'string' && !isValidSSMPath(value));
+    if (invalidSSMPaths.length > 0) {
+      throw new Error(
+        `Invalid data source strategy "${
+          strategy.name
+        }". Following SSM paths must start with '/' in dbConnectionConfig: ${invalidSSMPaths.join(', ')}.`,
+      );
+    }
+  } else if (isSqlModelDataSourceSecretsManagerDbConnectionConfig(dbConnectionConfig)) {
+    if (!Token.isUnresolved(dbConnectionConfig.secretArn)) {
+      try {
+        const arnComponents = Arn.split(dbConnectionConfig.secretArn, ArnFormat.COLON_RESOURCE_NAME);
+        if (arnComponents.service !== 'secretsmanager' || arnComponents.resource !== 'secret') {
+          // error message does not matter because it inside try/catch
+          throw new Error();
+        }
+      } catch {
+        throw new Error(`Invalid data source strategy "${strategy.name}". The value of secretArn is not a valid Secrets Manager ARN.`);
+      }
+    }
+
+    if (dbConnectionConfig.keyArn && !Token.isUnresolved(dbConnectionConfig.keyArn)) {
+      try {
+        const arnComponents = Arn.split(dbConnectionConfig.keyArn, ArnFormat.SLASH_RESOURCE_NAME);
+        if (arnComponents.service !== 'kms' || arnComponents.resource !== 'key') {
+          // error message does not matter because it inside try/catch
+          throw new Error();
+        }
+      } catch {
+        throw new Error(`Invalid data source strategy "${strategy.name}". The value of keyArn is not a valid KMS ARN.`);
+      }
+    }
+  } else {
+    throw new Error(`Invalid data source strategy "${strategy.name}". dbConnectionConfig does not include SSM paths or Secret ARN.`);
   }
 };
 

package/src/model-datasource-strategy-types.ts

@@ -116,12 +116,44 @@ export interface SubnetAvailabilityZone {
   readonly availabilityZone: string;
 }
 
+/**
+ * The credentials the lambda data source will use to connect to the database.
+ *
+ * @experimental
+ */
+export type SqlModelDataSourceDbConnectionConfig =
+  | SqlModelDataSourceSecretsManagerDbConnectionConfig
+  | SqlModelDataSourceSsmDbConnectionConfig;
+
+/**
+ * The credentials stored in Secrets Manager that the lambda data source will use to connect to the database.
+ *
+ * The managed secret should be in the same region as the lambda.
+ * @experimental
+ */
+export interface SqlModelDataSourceSecretsManagerDbConnectionConfig {
+  /** The ARN of the managed secret with username, password, and hostname to use when connecting to the database. **/
+  readonly secretArn: string;
+
+  /** The ARN of the customer managed encryption key for the secret. If not supplied, the secret is expected to be encrypted with the default AWS-managed key. **/
+  readonly keyArn?: string;
+
+  /** The port number of the database proxy, cluster, or instance. */
+  readonly port: number;
+
+  /** The database name. */
+  readonly databaseName: string;
+
+  /** The hostame of the database. */
+  readonly hostname: string;
+}
+
 /**
  * The Secure Systems Manager parameter paths the Lambda data source will use to connect to the database.
  *
  * These parameters are retrieved from Secure Systems Manager in the same region as the Lambda.
  */
-export interface SqlModelDataSourceDbConnectionConfig {
+export interface SqlModelDataSourceSsmDbConnectionConfig {
   /** The Secure Systems Manager parameter containing the hostname of the database. For RDS-based SQL data sources, this can be the hostname
    * of a database proxy, cluster, or instance.
    */

package/src/sql-model-datasource-strategy.ts

@@ -1,7 +1,12 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { isSqlDbType } from '@aws-amplify/graphql-transformer-core';
-import { SQLLambdaModelDataSourceStrategy, SqlModelDataSourceDbConnectionConfig } from './model-datasource-strategy-types';
+import {
+  SQLLambdaModelDataSourceStrategy,
+  SqlModelDataSourceDbConnectionConfig,
+  SqlModelDataSourceSsmDbConnectionConfig,
+  SqlModelDataSourceSecretsManagerDbConnectionConfig,
+} from './model-datasource-strategy-types';
 
 /**
  * Type predicate that returns true if the object is a SQLLambdaModelDataSourceStrategy.
@@ -24,6 +29,15 @@ export const isSQLLambdaModelDataSourceStrategy = (obj: any): obj is SQLLambdaMo
  * @returns true if the object is shaped like a SqlModelDataSourceDbConnectionConfig
  */
 export const isSqlModelDataSourceDbConnectionConfig = (obj: any): obj is SqlModelDataSourceDbConnectionConfig => {
+  return isSqlModelDataSourceSsmDbConnectionConfig(obj) || isSqlModelDataSourceSecretsManagerDbConnectionConfig(obj);
+};
+
+/**
+ * Type predicate that returns true if the object is a SqlModelDataSourceSsmDbConnectionConfig.
+ * @param obj the object to inspect
+ * @returns true if the object is shaped like a SqlModelDataSourceSsmDbConnectionConfig
+ */
+export const isSqlModelDataSourceSsmDbConnectionConfig = (obj: any): obj is SqlModelDataSourceSsmDbConnectionConfig => {
   return (
     (typeof obj === 'object' || typeof obj === 'function') &&
     typeof obj.hostnameSsmPath === 'string' &&
@@ -34,6 +48,23 @@ export const isSqlModelDataSourceDbConnectionConfig = (obj: any): obj is SqlMode
   );
 };
 
+/**
+ * Type predicate that returns true if the object is a SqlModelDataSourceSecretsManagerDbConnectionConfig.
+ * @param obj the object to inspect
+ * @returns true if the object is shaped like a SqlModelDataSourceSecretsManagerDbConnectionConfig
+ */
+export const isSqlModelDataSourceSecretsManagerDbConnectionConfig = (
+  obj: any,
+): obj is SqlModelDataSourceSecretsManagerDbConnectionConfig => {
+  return (
+    (typeof obj === 'object' || typeof obj === 'function') &&
+    typeof obj.secretArn === 'string' &&
+    typeof obj.port === 'number' &&
+    typeof obj.databaseName === 'string' &&
+    typeof obj.hostname == 'string'
+  );
+};
+
 /**
  * Class exposing utilities to produce SQLLambdaModelDataSourceStrategy objects given various inputs.
  */

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

@@ -1,13 +0,0 @@
-export declare const TYPESCRIPT_DATA_SCHEMA_CONSTANTS: {
-    SCHEMA_PACKAGE: string;
-    MODEL_METHOD: string;
-    SCHEMA_METHOD: string;
-    IDENTIFIER_METHOD: string;
-    ARRAY_METHOD: string;
-    REQUIRED_METHOD: string;
-    STRING_METHOD: string;
-    ENUM_METHOD: string;
-    REFERENCE_A: string;
-    EXPORT_VARIABLE_NAME: string;
-};
-//# sourceMappingURL=TypescriptSchemaConstants.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"TypescriptSchemaConstants.d.ts","sourceRoot":"","sources":["../src/TypescriptSchemaConstants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gCAAgC;;;;;;;;;;;CAW5C,CAAC"}

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

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TYPESCRIPT_DATA_SCHEMA_CONSTANTS = void 0;
-exports.TYPESCRIPT_DATA_SCHEMA_CONSTANTS = {
-    SCHEMA_PACKAGE: '@aws-amplify/data-schema',
-    MODEL_METHOD: 'model',
-    SCHEMA_METHOD: 'schema',
-    IDENTIFIER_METHOD: 'identifier',
-    ARRAY_METHOD: 'array',
-    REQUIRED_METHOD: 'required',
-    STRING_METHOD: 'string',
-    ENUM_METHOD: 'enum',
-    REFERENCE_A: 'a',
-    EXPORT_VARIABLE_NAME: 'schema',
-};
-//# sourceMappingURL=TypescriptSchemaConstants.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"TypescriptSchemaConstants.js","sourceRoot":"","sources":["../src/TypescriptSchemaConstants.ts"],"names":[],"mappings":";;;AAAa,QAAA,gCAAgC,GAAG;IAC9C,cAAc,EAAE,0BAA0B;IAC1C,YAAY,EAAE,OAAO;IACrB,aAAa,EAAE,QAAQ;IACvB,iBAAiB,EAAE,YAAY;IAC/B,YAAY,EAAE,OAAO;IACrB,eAAe,EAAE,UAAU;IAC3B,aAAa,EAAE,QAAQ;IACvB,WAAW,EAAE,MAAM;IACnB,WAAW,EAAE,GAAG;IAChB,oBAAoB,EAAE,QAAQ;CAC/B,CAAC"}