@aws-amplify/graphql-api-construct 1.9.0-gen2-release-0418-2.0 → 1.9.0

package/src/internal/asset-provider.ts

@@ -0,0 +1,64 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import { Construct } from 'constructs';
+import * as cdk from 'aws-cdk-lib';
+import { Asset } from 'aws-cdk-lib/aws-s3-assets';
+import { AssetProps, S3Asset, AssetProvider as AssetProviderInterface } from '@aws-amplify/graphql-transformer-interfaces';
+
+const TEMP_PREFIX = 'transformer-assets';
+const FUNCTION_PREFIX = 'functions';
+const RESOLVER_PREFIX = 'resolvers';
+
+/**
+ * The asset provider bridges the gap between creation of file assets in the transformer (which provide a name+contents tuple)
+ * with the path method which is used in CDK.
+ * The CDK S3 asset require the contents to be written to the file system first.
+ * The asset provider writes to a temporary directory before creating the CDK S3 asset.
+ *
+ */
+export class AssetProvider implements AssetProviderInterface {
+  private readonly tempAssetDir: string;
+  public readonly resolverAssets: Record<string, string> = {};
+
+  constructor(scope: Construct) {
+    this.tempAssetDir = cdk.FileSystem.mkdtemp(`${TEMP_PREFIX}-${scope.node.addr}`);
+  }
+
+  /**
+   * Creates a new CDK S3 asset. The file contents in assetProps is first stored in a temporary file that is referenced by the CDK S3 asset.
+   * @param assetScope the parent of the asset
+   * @param assetId unique ID for CDK S3 asset
+   * @param assetProps name and contents of file to be added to CDK S3 asset
+   * @returns the CDK S3 asset
+   */
+  public provide(assetScope: Construct, assetId: string, assetProps: AssetProps): S3Asset {
+    return new Asset(assetScope, assetId, { path: this.addAsset(assetProps.fileName, assetProps.fileContent) });
+  }
+
+  private addAsset(fileName: string, contents: string): string {
+    this.trackResolverAsset(fileName, contents);
+    const writableContents = this.isContentsAReference(fileName) ? this.dereferenceContents(contents) : contents;
+    const filePath = path.join(this.tempAssetDir, fileName);
+    const fileDirName = path.dirname(filePath);
+    if (!fs.existsSync(fileDirName)) {
+      fs.mkdirSync(fileDirName, { recursive: true });
+    }
+    fs.writeFileSync(filePath, writableContents);
+    return filePath;
+  }
+
+  private isContentsAReference(fileName: string): boolean {
+    return fileName.startsWith(FUNCTION_PREFIX);
+  }
+
+  private dereferenceContents(contents: string): Buffer {
+    return fs.readFileSync(contents);
+  }
+
+  private trackResolverAsset(fileName: string, contents: string): void {
+    if (fileName.startsWith(RESOLVER_PREFIX)) {
+      const resolverFileName = fileName.split('/')[1];
+      this.resolverAssets[resolverFileName] = contents;
+    }
+  }
+}

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

@@ -200,7 +200,18 @@ export const validateDataSourceStrategy = (strategy: ConstructModelDataSourceStr
     isSqlModelDataSourceSsmDbConnectionConfig(dbConnectionConfig) ||
     isSqlModelDataSourceSsmDbConnectionStringConfig(dbConnectionConfig)
   ) {
-    const invalidSSMPaths = Object.values(dbConnectionConfig).filter((value) => typeof value === 'string' && !isValidSSMPath(value));
+    const ssmPaths = Object.values(dbConnectionConfig).filter((value) => typeof value === 'string');
+    if (isSqlModelDataSourceSsmDbConnectionStringConfig(dbConnectionConfig)) {
+      const hasMultipleSSMPaths = Array.isArray(dbConnectionConfig?.connectionUriSsmPath);
+      if (hasMultipleSSMPaths) {
+        if (dbConnectionConfig?.connectionUriSsmPath?.length < 1) {
+          throw new Error(`Invalid data source strategy "${strategy.name}". connectionUriSsmPath must be a string or non-empty array.`);
+        }
+        ssmPaths.push(...dbConnectionConfig.connectionUriSsmPath);
+      }
+    }
+
+    const invalidSSMPaths = ssmPaths.filter((value) => !isValidSSMPath(value));
     if (invalidSSMPaths.length > 0) {
       throw new Error(
         `Invalid data source strategy "${

package/src/internal/index.ts

@@ -2,6 +2,6 @@ export * from './authorization-modes';
 export * from './construct-exports';
 export * from './default-parameters';
 export * from './conflict-resolution';
-export * from './asset-manager';
+export * from './asset-provider';
 export * from './codegen-assets';
 export * from './model-type-name';

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

@@ -131,8 +131,13 @@ export type SqlModelDataSourceDbConnectionConfig =
  * @experimental
  */
 export interface SqlModelDataSourceSsmDbConnectionStringConfig {
-  /** The SSM Path to the secure connection string used for connecting to the database. **/
-  readonly connectionUriSsmPath: string;
+  /**
+   * The SSM Path to the secure connection string used for connecting to the database. If more than one path is provided,
+   * the SQL Lambda will attempt to retrieve connection information from each path in order until it finds a valid
+   * path entry, then stop. If the connection information contained in that path is invalid, the SQL Lambda will not
+   * attempt to retrieve connection information from subsequent paths in the array.
+   **/
+  readonly connectionUriSsmPath: string | string[];
 }
 
 /**

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

@@ -76,7 +76,10 @@ export const isSqlModelDataSourceSecretsManagerDbConnectionConfig = (
  * @returns true if the object is shaped like a SqlModelDataSourceSsmDbConnectionStringConfig
  */
 export const isSqlModelDataSourceSsmDbConnectionStringConfig = (obj: any): obj is SqlModelDataSourceSsmDbConnectionStringConfig => {
-  return (typeof obj === 'object' || typeof obj === 'function') && typeof obj.connectionUriSsmPath === 'string';
+  return (
+    (typeof obj === 'object' || typeof obj === 'function') &&
+    (typeof obj.connectionUriSsmPath === 'string' || Array.isArray(obj.connectionUriSsmPath))
+  );
 };
 
 /**

package/lib/internal/asset-manager.d.ts

@@ -1,12 +0,0 @@
-/**
- * The asset manager bridges the gap between creation of file assets in the transformer (which provide a name+contents tuple)
- * with the path method which is used in CDK.
- */
-export declare class AssetManager {
-    private readonly tempAssetDir;
-    readonly resolverAssets: Record<string, string>;
-    addAsset(fileName: string, contents: string): string;
-    private isContentsAReference;
-    private dereferenceContents;
-    private trackResolverAsset;
-}

package/lib/internal/asset-manager.js

@@ -1,44 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AssetManager = void 0;
-const fs = require("fs");
-const path = require("path");
-const cdk = require("aws-cdk-lib");
-const TEMP_PREFIX = 'transformer-assets';
-const FUNCTION_PREFIX = 'functions';
-const RESOLVER_PREFIX = 'resolvers';
-/**
- * The asset manager bridges the gap between creation of file assets in the transformer (which provide a name+contents tuple)
- * with the path method which is used in CDK.
- */
-class AssetManager {
-    constructor() {
-        this.tempAssetDir = cdk.FileSystem.mkdtemp(TEMP_PREFIX);
-        this.resolverAssets = {};
-    }
-    addAsset(fileName, contents) {
-        this.trackResolverAsset(fileName, contents);
-        const writableContents = this.isContentsAReference(fileName) ? this.dereferenceContents(contents) : contents;
-        const filePath = path.join(this.tempAssetDir, fileName);
-        const fileDirName = path.dirname(filePath);
-        if (!fs.existsSync(fileDirName)) {
-            fs.mkdirSync(fileDirName, { recursive: true });
-        }
-        fs.writeFileSync(filePath, writableContents);
-        return filePath;
-    }
-    isContentsAReference(fileName) {
-        return fileName.startsWith(FUNCTION_PREFIX);
-    }
-    dereferenceContents(contents) {
-        return fs.readFileSync(contents);
-    }
-    trackResolverAsset(fileName, contents) {
-        if (fileName.startsWith(RESOLVER_PREFIX)) {
-            const resolverFileName = fileName.split('/')[1];
-            this.resolverAssets[resolverFileName] = contents;
-        }
-    }
-}
-exports.AssetManager = AssetManager;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXNzZXQtbWFuYWdlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9pbnRlcm5hbC9hc3NldC1tYW5hZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHlCQUF5QjtBQUN6Qiw2QkFBNkI7QUFDN0IsbUNBQW1DO0FBRW5DLE1BQU0sV0FBVyxHQUFHLG9CQUFvQixDQUFDO0FBQ3pDLE1BQU0sZUFBZSxHQUFHLFdBQVcsQ0FBQztBQUNwQyxNQUFNLGVBQWUsR0FBRyxXQUFXLENBQUM7QUFFcEM7OztHQUdHO0FBQ0gsTUFBYSxZQUFZO0lBQXpCO1FBQ21CLGlCQUFZLEdBQVcsR0FBRyxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDNUQsbUJBQWMsR0FBMkIsRUFBRSxDQUFDO0lBNEI5RCxDQUFDO0lBMUJRLFFBQVEsQ0FBQyxRQUFnQixFQUFFLFFBQWdCO1FBQ2hELElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxRQUFRLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFDNUMsTUFBTSxnQkFBZ0IsR0FBRyxJQUFJLENBQUMsb0JBQW9CLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDO1FBQzdHLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFlBQVksRUFBRSxRQUFRLENBQUMsQ0FBQztRQUN4RCxNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQzNDLElBQUksQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxFQUFFO1lBQy9CLEVBQUUsQ0FBQyxTQUFTLENBQUMsV0FBVyxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7U0FDaEQ7UUFDRCxFQUFFLENBQUMsYUFBYSxDQUFDLFFBQVEsRUFBRSxnQkFBZ0IsQ0FBQyxDQUFDO1FBQzdDLE9BQU8sUUFBUSxDQUFDO0lBQ2xCLENBQUM7SUFFTyxvQkFBb0IsQ0FBQyxRQUFnQjtRQUMzQyxPQUFPLFFBQVEsQ0FBQyxVQUFVLENBQUMsZUFBZSxDQUFDLENBQUM7SUFDOUMsQ0FBQztJQUVPLG1CQUFtQixDQUFDLFFBQWdCO1FBQzFDLE9BQU8sRUFBRSxDQUFDLFlBQVksQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUNuQyxDQUFDO0lBRU8sa0JBQWtCLENBQUMsUUFBZ0IsRUFBRSxRQUFnQjtRQUMzRCxJQUFJLFFBQVEsQ0FBQyxVQUFVLENBQUMsZUFBZSxDQUFDLEVBQUU7WUFDeEMsTUFBTSxnQkFBZ0IsR0FBRyxRQUFRLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ2hELElBQUksQ0FBQyxjQUFjLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxRQUFRLENBQUM7U0FDbEQ7SUFDSCxDQUFDO0NBQ0Y7QUE5QkQsb0NBOEJDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0ICogYXMgZnMgZnJvbSAnZnMnO1xuaW1wb3J0ICogYXMgcGF0aCBmcm9tICdwYXRoJztcbmltcG9ydCAqIGFzIGNkayBmcm9tICdhd3MtY2RrLWxpYic7XG5cbmNvbnN0IFRFTVBfUFJFRklYID0gJ3RyYW5zZm9ybWVyLWFzc2V0cyc7XG5jb25zdCBGVU5DVElPTl9QUkVGSVggPSAnZnVuY3Rpb25zJztcbmNvbnN0IFJFU09MVkVSX1BSRUZJWCA9ICdyZXNvbHZlcnMnO1xuXG4vKipcbiAqIFRoZSBhc3NldCBtYW5hZ2VyIGJyaWRnZXMgdGhlIGdhcCBiZXR3ZWVuIGNyZWF0aW9uIG9mIGZpbGUgYXNzZXRzIGluIHRoZSB0cmFuc2Zvcm1lciAod2hpY2ggcHJvdmlkZSBhIG5hbWUrY29udGVudHMgdHVwbGUpXG4gKiB3aXRoIHRoZSBwYXRoIG1ldGhvZCB3aGljaCBpcyB1c2VkIGluIENESy5cbiAqL1xuZXhwb3J0IGNsYXNzIEFzc2V0TWFuYWdlciB7XG4gIHByaXZhdGUgcmVhZG9ubHkgdGVtcEFzc2V0RGlyOiBzdHJpbmcgPSBjZGsuRmlsZVN5c3RlbS5ta2R0ZW1wKFRFTVBfUFJFRklYKTtcbiAgcHVibGljIHJlYWRvbmx5IHJlc29sdmVyQXNzZXRzOiBSZWNvcmQ8c3RyaW5nLCBzdHJpbmc+ID0ge307XG5cbiAgcHVibGljIGFkZEFzc2V0KGZpbGVOYW1lOiBzdHJpbmcsIGNvbnRlbnRzOiBzdHJpbmcpOiBzdHJpbmcge1xuICAgIHRoaXMudHJhY2tSZXNvbHZlckFzc2V0KGZpbGVOYW1lLCBjb250ZW50cyk7XG4gICAgY29uc3Qgd3JpdGFibGVDb250ZW50cyA9IHRoaXMuaXNDb250ZW50c0FSZWZlcmVuY2UoZmlsZU5hbWUpID8gdGhpcy5kZXJlZmVyZW5jZUNvbnRlbnRzKGNvbnRlbnRzKSA6IGNvbnRlbnRzO1xuICAgIGNvbnN0IGZpbGVQYXRoID0gcGF0aC5qb2luKHRoaXMudGVtcEFzc2V0RGlyLCBmaWxlTmFtZSk7XG4gICAgY29uc3QgZmlsZURpck5hbWUgPSBwYXRoLmRpcm5hbWUoZmlsZVBhdGgpO1xuICAgIGlmICghZnMuZXhpc3RzU3luYyhmaWxlRGlyTmFtZSkpIHtcbiAgICAgIGZzLm1rZGlyU3luYyhmaWxlRGlyTmFtZSwgeyByZWN1cnNpdmU6IHRydWUgfSk7XG4gICAgfVxuICAgIGZzLndyaXRlRmlsZVN5bmMoZmlsZVBhdGgsIHdyaXRhYmxlQ29udGVudHMpO1xuICAgIHJldHVybiBmaWxlUGF0aDtcbiAgfVxuXG4gIHByaXZhdGUgaXNDb250ZW50c0FSZWZlcmVuY2UoZmlsZU5hbWU6IHN0cmluZyk6IGJvb2xlYW4ge1xuICAgIHJldHVybiBmaWxlTmFtZS5zdGFydHNXaXRoKEZVTkNUSU9OX1BSRUZJWCk7XG4gIH1cblxuICBwcml2YXRlIGRlcmVmZXJlbmNlQ29udGVudHMoY29udGVudHM6IHN0cmluZyk6IEJ1ZmZlciB7XG4gICAgcmV0dXJuIGZzLnJlYWRGaWxlU3luYyhjb250ZW50cyk7XG4gIH1cblxuICBwcml2YXRlIHRyYWNrUmVzb2x2ZXJBc3NldChmaWxlTmFtZTogc3RyaW5nLCBjb250ZW50czogc3RyaW5nKTogdm9pZCB7XG4gICAgaWYgKGZpbGVOYW1lLnN0YXJ0c1dpdGgoUkVTT0xWRVJfUFJFRklYKSkge1xuICAgICAgY29uc3QgcmVzb2x2ZXJGaWxlTmFtZSA9IGZpbGVOYW1lLnNwbGl0KCcvJylbMV07XG4gICAgICB0aGlzLnJlc29sdmVyQXNzZXRzW3Jlc29sdmVyRmlsZU5hbWVdID0gY29udGVudHM7XG4gICAgfVxuICB9XG59XG4iXX0=

package/node_modules/@aws-amplify/graphql-transformer-core/lib/transformer-context/asset-manager.d.ts

@@ -1,10 +0,0 @@
-import { AssetProvider, S3Asset, AssetProps } from '@aws-amplify/graphql-transformer-interfaces';
-import { Construct } from 'constructs';
-export declare class AssetManager {
-    private assetProvider;
-    createAsset(scope: Construct, name: string, props: AssetProps): S3Asset;
-    private getAssetProvider;
-    setAssetProvider(provider: AssetProvider): void;
-}
-export declare const assetManager: AssetManager;
-//# sourceMappingURL=asset-manager.d.ts.map

package/node_modules/@aws-amplify/graphql-transformer-core/lib/transformer-context/asset-manager.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"asset-manager.d.ts","sourceRoot":"","sources":["../../src/transformer-context/asset-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAC;AACjG,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,qBAAa,YAAY;IACvB,OAAO,CAAC,aAAa,CAA4B;IAE1C,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO;IAI9E,OAAO,CAAC,gBAAgB;IAOjB,gBAAgB,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI;CAGvD;AAED,eAAO,MAAM,YAAY,cAAqB,CAAC"}

package/node_modules/@aws-amplify/graphql-transformer-core/lib/transformer-context/asset-manager.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assetManager = exports.AssetManager = void 0;
-class AssetManager {
-    createAsset(scope, name, props) {
-        return this.getAssetProvider().provide(scope, name, props);
-    }
-    getAssetProvider() {
-        if (!this.assetProvider) {
-            throw new Error('AssetProvider not initialized');
-        }
-        return this.assetProvider;
-    }
-    setAssetProvider(provider) {
-        this.assetProvider = provider;
-    }
-}
-exports.AssetManager = AssetManager;
-exports.assetManager = new AssetManager();
-//# sourceMappingURL=asset-manager.js.map

package/node_modules/@aws-amplify/graphql-transformer-core/lib/transformer-context/asset-manager.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"asset-manager.js","sourceRoot":"","sources":["../../src/transformer-context/asset-manager.ts"],"names":[],"mappings":";;;AAGA,MAAa,YAAY;IAGhB,WAAW,CAAC,KAAgB,EAAE,IAAY,EAAE,KAAiB;QAClE,OAAO,IAAI,CAAC,gBAAgB,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAC7D,CAAC;IAEO,gBAAgB;QACtB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;SAClD;QACD,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAEM,gBAAgB,CAAC,QAAuB;QAC7C,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC;IAChC,CAAC;CACF;AAjBD,oCAiBC;AAEY,QAAA,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC"}

package/src/internal/asset-manager.ts

@@ -1,43 +0,0 @@
-import * as fs from 'fs';
-import * as path from 'path';
-import * as cdk from 'aws-cdk-lib';
-
-const TEMP_PREFIX = 'transformer-assets';
-const FUNCTION_PREFIX = 'functions';
-const RESOLVER_PREFIX = 'resolvers';
-
-/**
- * The asset manager bridges the gap between creation of file assets in the transformer (which provide a name+contents tuple)
- * with the path method which is used in CDK.
- */
-export class AssetManager {
-  private readonly tempAssetDir: string = cdk.FileSystem.mkdtemp(TEMP_PREFIX);
-  public readonly resolverAssets: Record<string, string> = {};
-
-  public addAsset(fileName: string, contents: string): string {
-    this.trackResolverAsset(fileName, contents);
-    const writableContents = this.isContentsAReference(fileName) ? this.dereferenceContents(contents) : contents;
-    const filePath = path.join(this.tempAssetDir, fileName);
-    const fileDirName = path.dirname(filePath);
-    if (!fs.existsSync(fileDirName)) {
-      fs.mkdirSync(fileDirName, { recursive: true });
-    }
-    fs.writeFileSync(filePath, writableContents);
-    return filePath;
-  }
-
-  private isContentsAReference(fileName: string): boolean {
-    return fileName.startsWith(FUNCTION_PREFIX);
-  }
-
-  private dereferenceContents(contents: string): Buffer {
-    return fs.readFileSync(contents);
-  }
-
-  private trackResolverAsset(fileName: string, contents: string): void {
-    if (fileName.startsWith(RESOLVER_PREFIX)) {
-      const resolverFileName = fileName.split('/')[1];
-      this.resolverAssets[resolverFileName] = contents;
-    }
-  }
-}