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

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

@@ -65,6 +65,5 @@
     "coveragePathIgnorePatterns": [
       "/__tests__/"
     ]
-  },
-  "gitHead": "eb2582338abd3e8337cad283b2cb973af1d4f5fd"
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/graphql-api-construct",
-  "version": "1.10.0",
+  "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.6.0",
-    "@aws-amplify/graphql-default-value-transformer": "2.3.8",
+    "@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.23",
-    "@aws-amplify/graphql-http-transformer": "2.1.23",
-    "@aws-amplify/graphql-index-transformer": "2.4.4",
-    "@aws-amplify/graphql-maps-to-transformer": "3.4.18",
-    "@aws-amplify/graphql-model-transformer": "2.10.2",
-    "@aws-amplify/graphql-predictions-transformer": "2.1.23",
-    "@aws-amplify/graphql-relational-transformer": "2.5.6",
-    "@aws-amplify/graphql-searchable-transformer": "2.7.4",
-    "@aws-amplify/graphql-sql-transformer": "0.3.4",
-    "@aws-amplify/graphql-transformer": "1.6.0",
-    "@aws-amplify/graphql-transformer-core": "2.9.0",
-    "@aws-amplify/graphql-transformer-interfaces": "3.9.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",
@@ -114,12 +114,12 @@
     "zod": "^3.22.3"
   },
   "devDependencies": {
-    "@aws-amplify/graphql-transformer-test-utils": "0.5.3",
+    "@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": "eb2582338abd3e8337cad283b2cb973af1d4f5fd"
+  "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/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/node_modules/graphql-transformer-common/LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1.  Definitions.
-
-    "License" shall mean the terms and conditions for use, reproduction,
-    and distribution as defined by Sections 1 through 9 of this document.
-
-    "Licensor" shall mean the copyright owner or entity authorized by
-    the copyright owner that is granting the License.
-
-    "Legal Entity" shall mean the union of the acting entity and all
-    other entities that control, are controlled by, or are under common
-    control with that entity. For the purposes of this definition,
-    "control" means (i) the power, direct or indirect, to cause the
-    direction or management of such entity, whether by contract or
-    otherwise, or (ii) ownership of fifty percent (50%) or more of the
-    outstanding shares, or (iii) beneficial ownership of such entity.
-
-    "You" (or "Your") shall mean an individual or Legal Entity
-    exercising permissions granted by this License.
-
-    "Source" form shall mean the preferred form for making modifications,
-    including but not limited to software source code, documentation
-    source, and configuration files.
-
-    "Object" form shall mean any form resulting from mechanical
-    transformation or translation of a Source form, including but
-    not limited to compiled object code, generated documentation,
-    and conversions to other media types.
-
-    "Work" shall mean the work of authorship, whether in Source or
-    Object form, made available under the License, as indicated by a
-    copyright notice that is included in or attached to the work
-    (an example is provided in the Appendix below).
-
-    "Derivative Works" shall mean any work, whether in Source or Object
-    form, that is based on (or derived from) the Work and for which the
-    editorial revisions, annotations, elaborations, or other modifications
-    represent, as a whole, an original work of authorship. For the purposes
-    of this License, Derivative Works shall not include works that remain
-    separable from, or merely link (or bind by name) to the interfaces of,
-    the Work and Derivative Works thereof.
-
-    "Contribution" shall mean any work of authorship, including
-    the original version of the Work and any modifications or additions
-    to that Work or Derivative Works thereof, that is intentionally
-    submitted to Licensor for inclusion in the Work by the copyright owner
-    or by an individual or Legal Entity authorized to submit on behalf of
-    the copyright owner. For the purposes of this definition, "submitted"
-    means any form of electronic, verbal, or written communication sent
-    to the Licensor or its representatives, including but not limited to
-    communication on electronic mailing lists, source code control systems,
-    and issue tracking systems that are managed by, or on behalf of, the
-    Licensor for the purpose of discussing and improving the Work, but
-    excluding communication that is conspicuously marked or otherwise
-    designated in writing by the copyright owner as "Not a Contribution."
-
-    "Contributor" shall mean Licensor and any individual or Legal Entity
-    on behalf of whom a Contribution has been received by Licensor and
-    subsequently incorporated within the Work.
-
-2.  Grant of Copyright License. Subject to the terms and conditions of
-    this License, each Contributor hereby grants to You a perpetual,
-    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-    copyright license to reproduce, prepare Derivative Works of,
-    publicly display, publicly perform, sublicense, and distribute the
-    Work and such Derivative Works in Source or Object form.
-
-3.  Grant of Patent License. Subject to the terms and conditions of
-    this License, each Contributor hereby grants to You a perpetual,
-    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-    (except as stated in this section) patent license to make, have made,
-    use, offer to sell, sell, import, and otherwise transfer the Work,
-    where such license applies only to those patent claims licensable
-    by such Contributor that are necessarily infringed by their
-    Contribution(s) alone or by combination of their Contribution(s)
-    with the Work to which such Contribution(s) was submitted. If You
-    institute patent litigation against any entity (including a
-    cross-claim or counterclaim in a lawsuit) alleging that the Work
-    or a Contribution incorporated within the Work constitutes direct
-    or contributory patent infringement, then any patent licenses
-    granted to You under this License for that Work shall terminate
-    as of the date such litigation is filed.
-
-4.  Redistribution. You may reproduce and distribute copies of the
-    Work or Derivative Works thereof in any medium, with or without
-    modifications, and in Source or Object form, provided that You
-    meet the following conditions:
-
-    (a) You must give any other recipients of the Work or
-    Derivative Works a copy of this License; and
-
-    (b) You must cause any modified files to carry prominent notices
-    stating that You changed the files; and
-
-    (c) You must retain, in the Source form of any Derivative Works
-    that You distribute, all copyright, patent, trademark, and
-    attribution notices from the Source form of the Work,
-    excluding those notices that do not pertain to any part of
-    the Derivative Works; and
-
-    (d) If the Work includes a "NOTICE" text file as part of its
-    distribution, then any Derivative Works that You distribute must
-    include a readable copy of the attribution notices contained
-    within such NOTICE file, excluding those notices that do not
-    pertain to any part of the Derivative Works, in at least one
-    of the following places: within a NOTICE text file distributed
-    as part of the Derivative Works; within the Source form or
-    documentation, if provided along with the Derivative Works; or,
-    within a display generated by the Derivative Works, if and
-    wherever such third-party notices normally appear. The contents
-    of the NOTICE file are for informational purposes only and
-    do not modify the License. You may add Your own attribution
-    notices within Derivative Works that You distribute, alongside
-    or as an addendum to the NOTICE text from the Work, provided
-    that such additional attribution notices cannot be construed
-    as modifying the License.
-
-    You may add Your own copyright statement to Your modifications and
-    may provide additional or different license terms and conditions
-    for use, reproduction, or distribution of Your modifications, or
-    for any such Derivative Works as a whole, provided Your use,
-    reproduction, and distribution of the Work otherwise complies with
-    the conditions stated in this License.
-
-5.  Submission of Contributions. Unless You explicitly state otherwise,
-    any Contribution intentionally submitted for inclusion in the Work
-    by You to the Licensor shall be under the terms and conditions of
-    this License, without any additional terms or conditions.
-    Notwithstanding the above, nothing herein shall supersede or modify
-    the terms of any separate license agreement you may have executed
-    with Licensor regarding such Contributions.
-
-6.  Trademarks. This License does not grant permission to use the trade
-    names, trademarks, service marks, or product names of the Licensor,
-    except as required for reasonable and customary use in describing the
-    origin of the Work and reproducing the content of the NOTICE file.
-
-7.  Disclaimer of Warranty. Unless required by applicable law or
-    agreed to in writing, Licensor provides the Work (and each
-    Contributor provides its Contributions) on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-    implied, including, without limitation, any warranties or conditions
-    of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-    PARTICULAR PURPOSE. You are solely responsible for determining the
-    appropriateness of using or redistributing the Work and assume any
-    risks associated with Your exercise of permissions under this License.
-
-8.  Limitation of Liability. In no event and under no legal theory,
-    whether in tort (including negligence), contract, or otherwise,
-    unless required by applicable law (such as deliberate and grossly
-    negligent acts) or agreed to in writing, shall any Contributor be
-    liable to You for damages, including any direct, indirect, special,
-    incidental, or consequential damages of any character arising as a
-    result of this License or out of the use or inability to use the
-    Work (including but not limited to damages for loss of goodwill,
-    work stoppage, computer failure or malfunction, or any and all
-    other commercial damages or losses), even if such Contributor
-    has been advised of the possibility of such damages.
-
-9.  Accepting Warranty or Additional Liability. While redistributing
-    the Work or Derivative Works thereof, You may choose to offer,
-    and charge a fee for, acceptance of support, warranty, indemnity,
-    or other liability obligations and/or rights consistent with this
-    License. However, in accepting such obligations, You may act only
-    on Your own behalf and on Your sole responsibility, not on behalf
-    of any other Contributor, and only if You agree to indemnify,
-    defend, and hold each Contributor harmless for any liability
-    incurred by, or claims asserted against, such Contributor by reason
-    of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-Copyright 2017 - 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.