@aws-amplify/graphql-api-construct 1.9.5 → 1.11.0

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

@@ -523,6 +523,7 @@ export const TYPESCRIPT_DATA_SCHEMA_CONSTANTS: {
     PROPERTY_AZ: string;
     PROPERTY_DATABASE: string;
     PROPERTY_CONNECTION_URI: string;
+    PROPERTY_SSL_CERTIFICATE: string;
     PROPERTY_ENGINE: string;
     PROPERTY_IDENTIFIER: string;
 };

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

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.31.0](https://github.com/aws-amplify/amplify-category-api/compare/graphql-transformer-common@4.30.1...graphql-transformer-common@4.31.0) (2024-06-25)
+
+### Features
+
+- **generate-schema:** custom ssl cert support to generate schema command ([#2615](https://github.com/aws-amplify/amplify-category-api/issues/2615)) ([390887f](https://github.com/aws-amplify/amplify-category-api/commit/390887ff4467baca9dad8f70071442b95bb04cf9))
+
 ## [4.30.1](https://github.com/aws-amplify/amplify-category-api/compare/graphql-transformer-common@4.30.0...graphql-transformer-common@4.30.1) (2024-04-26)
 
 **Note:** Version bump only for package graphql-transformer-common

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

@@ -21,6 +21,7 @@ export declare const TYPESCRIPT_DATA_SCHEMA_CONSTANTS: {
     PROPERTY_AZ: string;
     PROPERTY_DATABASE: string;
     PROPERTY_CONNECTION_URI: string;
+    PROPERTY_SSL_CERTIFICATE: string;
     PROPERTY_ENGINE: string;
     PROPERTY_IDENTIFIER: string;
 };

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

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

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

@@ -24,6 +24,7 @@ exports.TYPESCRIPT_DATA_SCHEMA_CONSTANTS = {
     PROPERTY_AZ: 'availabilityZone',
     PROPERTY_DATABASE: 'database',
     PROPERTY_CONNECTION_URI: 'connectionUri',
+    PROPERTY_SSL_CERTIFICATE: 'sslCertificate',
     PROPERTY_ENGINE: 'engine',
     PROPERTY_IDENTIFIER: 'identifier',
 };

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

@@ -1 +1 @@
-{"version":3,"file":"TypescriptSchemaConstants.js","sourceRoot":"","sources":["../src/TypescriptSchemaConstants.ts"],"names":[],"mappings":";;;AAAa,QAAA,gCAAgC,GAAG;IAC9C,cAAc,EAAE,0BAA0B;IAC1C,wBAAwB,EAAE,oCAAoC;IAC9D,eAAe,EAAE,sBAAsB;IACvC,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;IAC9B,0BAA0B,EAAE,WAAW;IACvC,qBAAqB,EAAE,QAAQ;IAC/B,YAAY,EAAE,WAAW;IACzB,eAAe,EAAE,OAAO;IACxB,2BAA2B,EAAE,kBAAkB;IAC/C,kBAAkB,EAAE,yBAAyB;IAC7C,kBAAkB,EAAE,UAAU;IAC9B,WAAW,EAAE,kBAAkB;IAC/B,iBAAiB,EAAE,UAAU;IAC7B,uBAAuB,EAAE,eAAe;IACxC,eAAe,EAAE,QAAQ;IACzB,mBAAmB,EAAE,YAAY;CAClC,CAAC"}
+{"version":3,"file":"TypescriptSchemaConstants.js","sourceRoot":"","sources":["../src/TypescriptSchemaConstants.ts"],"names":[],"mappings":";;;AAAa,QAAA,gCAAgC,GAAG;IAC9C,cAAc,EAAE,0BAA0B;IAC1C,wBAAwB,EAAE,oCAAoC;IAC9D,eAAe,EAAE,sBAAsB;IACvC,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;IAC9B,0BAA0B,EAAE,WAAW;IACvC,qBAAqB,EAAE,QAAQ;IAC/B,YAAY,EAAE,WAAW;IACzB,eAAe,EAAE,OAAO;IACxB,2BAA2B,EAAE,kBAAkB;IAC/C,kBAAkB,EAAE,yBAAyB;IAC7C,kBAAkB,EAAE,UAAU;IAC9B,WAAW,EAAE,kBAAkB;IAC/B,iBAAiB,EAAE,UAAU;IAC7B,uBAAuB,EAAE,eAAe;IACxC,wBAAwB,EAAE,gBAAgB;IAC1C,eAAe,EAAE,QAAQ;IACzB,mBAAmB,EAAE,YAAY;CAClC,CAAC"}

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

@@ -1,6 +1,6 @@
 {
   "name": "graphql-transformer-common",
-  "version": "4.30.1",
+  "version": "4.31.0",
   "description": "Common code and constants for AppSync Transformers",
   "repository": {
     "type": "git",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-api-construct",
-  "version": "1.9.5",
+  "version": "1.11.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.5",
-    "@aws-amplify/graphql-default-value-transformer": "2.3.7",
+    "@aws-amplify/graphql-auth-transformer": "3.6.1",
+    "@aws-amplify/graphql-default-value-transformer": "2.3.9",
     "@aws-amplify/graphql-directives": "1.1.0",
-    "@aws-amplify/graphql-function-transformer": "2.1.22",
-    "@aws-amplify/graphql-http-transformer": "2.1.22",
-    "@aws-amplify/graphql-index-transformer": "2.4.3",
-    "@aws-amplify/graphql-maps-to-transformer": "3.4.17",
-    "@aws-amplify/graphql-model-transformer": "2.10.1",
-    "@aws-amplify/graphql-predictions-transformer": "2.1.22",
-    "@aws-amplify/graphql-relational-transformer": "2.5.5",
-    "@aws-amplify/graphql-searchable-transformer": "2.7.3",
-    "@aws-amplify/graphql-sql-transformer": "0.3.3",
-    "@aws-amplify/graphql-transformer": "1.5.7",
-    "@aws-amplify/graphql-transformer-core": "2.8.0",
-    "@aws-amplify/graphql-transformer-interfaces": "3.8.0",
+    "@aws-amplify/graphql-function-transformer": "2.1.24",
+    "@aws-amplify/graphql-http-transformer": "2.1.24",
+    "@aws-amplify/graphql-index-transformer": "2.4.5",
+    "@aws-amplify/graphql-maps-to-transformer": "3.4.19",
+    "@aws-amplify/graphql-model-transformer": "2.11.0",
+    "@aws-amplify/graphql-predictions-transformer": "2.1.24",
+    "@aws-amplify/graphql-relational-transformer": "2.5.7",
+    "@aws-amplify/graphql-searchable-transformer": "2.7.5",
+    "@aws-amplify/graphql-sql-transformer": "0.3.5",
+    "@aws-amplify/graphql-transformer": "1.6.1",
+    "@aws-amplify/graphql-transformer-core": "2.9.1",
+    "@aws-amplify/graphql-transformer-interfaces": "3.10.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.16",
-    "graphql-transformer-common": "4.30.1",
+    "graphql-transformer-common": "4.31.0",
     "hjson": "^3.2.2",
     "immer": "^9.0.12",
     "is-buffer": "^2.0.5",
@@ -114,12 +114,12 @@
     "zod": "^3.22.3"
   },
   "devDependencies": {
-    "@aws-amplify/graphql-transformer-test-utils": "0.5.2",
+    "@aws-amplify/graphql-transformer-test-utils": "0.5.4",
     "@types/fs-extra": "^8.0.1",
     "@types/node": "^12.12.6",
     "aws-cdk-lib": "2.80.0",
     "constructs": "10.0.5",
-    "jsii": "^5.1.5",
+    "jsii": "^5.4.23",
     "jsii-docgen": "9.1.2",
     "jsii-pacmak": "^1.84.0",
     "rimraf": "^3.0.0",
@@ -179,5 +179,5 @@
       "/__tests__/"
     ]
   },
-  "gitHead": "1a38118743b11c20b6d102881b39eb5cc0d93320"
+  "gitHead": "25f293039b3430194e038725e71b3526ae1204d4"
 }

package/src/amplify-graphql-api.ts

@@ -156,7 +156,7 @@ export class AmplifyGraphqlApi extends Construct {
 
     if (conflictResolution && dataStoreConfiguration) {
       throw new Error(
-        `conflictResolution is deprecated. conflictResolution and dataStoreConfiguration cannot be used together. Please use dataStoreConfiguration.`,
+        'conflictResolution is deprecated. conflictResolution and dataStoreConfiguration cannot be used together. Please use dataStoreConfiguration.',
       );
     }
 

package/src/internal/default-parameters.ts

@@ -10,6 +10,7 @@ export const defaultTranslationBehavior: TranslationBehavior = {
   disableResolverDeduping: true,
   sandboxModeEnabled: false,
   useSubUsernameForDefaultIdentityClaim: true,
+  subscriptionsInheritPrimaryAuth: false,
   populateOwnerFieldForStaticGroupAuth: true,
   suppressApiKeyGeneration: false,
   secondaryKeyAsGSI: true,

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

@@ -126,6 +126,28 @@ export type SqlModelDataSourceDbConnectionConfig =
   | SqlModelDataSourceSsmDbConnectionConfig
   | SqlModelDataSourceSsmDbConnectionStringConfig;
 
+/**
+ * Marker interface. Although we can't declare it in the actual interface definition because it results in invalid C#, each conforming type
+ * must have a `configType: string` field to allow for discriminated union behavior.
+ */
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface SslCertConfig {}
+
+export interface SslCertSsmPathConfig extends SslCertConfig {
+  /**
+   * The SSM path to a custom SSL certificate to use instead of the default. Amplify resolves the trust store to use as follows:
+   * - If the `ssmPath` parameter is provided, use it.
+   *   - If the parameter is a single string, use it.
+   *   - If the parameter is an array, iterate over them in order
+   *   - In either case, if the parameter is provided but the certificate content isn't retrievable, fails with an error.
+   * - If the database host is an RDS cluster, instance, or proxy (in other words, if the database host ends with "rds.amazonaws.com"), use
+   *   an RDS-specific trust store vended by AWS. See
+   *   https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/UsingWithRDS.SSL.html#UsingWithRDS.SSL.CertificatesAllRegions
+   * - Otherwise, use the trust store vended with the NodeJS runtime version that the SQL lambda is running on
+   */
+  readonly ssmPath: string | string[];
+}
+
 /**
  * The configuration option to use a Secure Systems Manager parameter to store the connection string to the database.
  * @experimental
@@ -138,6 +160,11 @@ export interface SqlModelDataSourceSsmDbConnectionStringConfig {
    * attempt to retrieve connection information from subsequent paths in the array.
    **/
   readonly connectionUriSsmPath: string | string[];
+
+  /**
+   * An optional configuration for a custom SSL certificate authority to use when connecting to the database.
+   */
+  readonly sslCertConfig?: SslCertConfig;
 }
 
 /**
@@ -150,7 +177,10 @@ 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. **/
+  /**
+   * 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. */
@@ -161,6 +191,11 @@ export interface SqlModelDataSourceSecretsManagerDbConnectionConfig {
 
   /** The hostame of the database. */
   readonly hostname: string;
+
+  /**
+   * An optional configuration for a custom SSL certificate authority to use when connecting to the database.
+   */
+  readonly sslCertConfig?: SslCertConfig;
 }
 
 /**
@@ -185,6 +220,11 @@ export interface SqlModelDataSourceSsmDbConnectionConfig {
 
   /** The Secure Systems Manager parameter containing the database name. */
   readonly databaseNameSsmPath: string;
+
+  /**
+   * An optional configuration for a custom SSL certificate authority to use when connecting to the database.
+   */
+  readonly sslCertConfig?: SslCertConfig;
 }
 
 /**

package/src/types.ts

@@ -427,6 +427,12 @@ export interface TranslationBehavior {
    */
   readonly useSubUsernameForDefaultIdentityClaim: boolean;
 
+  /**
+   * When enabled, suppresses default behavior of redacting relational fields when auth rules do not exactly match.
+   * @default false
+   */
+  readonly subscriptionsInheritPrimaryAuth: boolean;
+
   /**
    * Ensure that the owner field is still populated even if a static iam or group authorization applies.
    * @default true
@@ -522,6 +528,12 @@ export interface PartialTranslationBehavior {
    */
   readonly useSubUsernameForDefaultIdentityClaim?: boolean;
 
+  /**
+   * When enabled, suppresses default behavior of redacting relational fields when auth rules do not exactly match.
+   * @default false
+   */
+  readonly subscriptionsInheritPrimaryAuth?: boolean;
+
   /**
    * Ensure that the owner field is still populated even if a static iam or group authorization applies.
    * @default true