Merge branch 'main' into gh-28580

aws · Jan 8, 2024 · 2d7af03 · 2d7af03
2 parents e2f7554 + 0f38b6e
commit 2d7af03
Show file tree

Hide file tree

Showing 16 changed files with 140 additions and 11 deletions.
diff --git a/packages/@aws-cdk/cloudformation-diff/package.json b/packages/@aws-cdk/cloudformation-diff/package.json
@@ -23,8 +23,8 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-cdk/aws-service-spec": "^0.0.38",
-    "@aws-cdk/service-spec-types": "^0.0.38",
+    "@aws-cdk/aws-service-spec": "^0.0.40",
+    "@aws-cdk/service-spec-types": "^0.0.40",
     "chalk": "^4",
     "diff": "^5.1.0",
     "fast-deep-equal": "^3.1.3",

diff --git a/packages/@aws-cdk/integ-runner/package.json b/packages/@aws-cdk/integ-runner/package.json
@@ -74,7 +74,7 @@
     "@aws-cdk/cloud-assembly-schema": "0.0.0",
     "@aws-cdk/cloudformation-diff": "0.0.0",
     "@aws-cdk/cx-api": "0.0.0",
-    "@aws-cdk/aws-service-spec": "^0.0.38",
+    "@aws-cdk/aws-service-spec": "^0.0.40",
     "cdk-assets": "0.0.0",
     "@aws-cdk/cdk-cli-wrapper": "0.0.0",
     "aws-cdk": "0.0.0",

diff --git a/packages/aws-cdk-lib/amzn-sdc/.jsiirc.json b/packages/aws-cdk-lib/amzn-sdc/.jsiirc.json
@@ -0,0 +1,13 @@
+{
+  "targets": {
+    "java": {
+      "package": "amzn.sdc"
+    },
+    "dotnet": {
+      "package": "Amazon.CDK.AMZN.SDC"
+    },
+    "python": {
+      "module": "aws_cdk.amzn_sdc"
+    }
+  }
+}
diff --git a/packages/aws-cdk-lib/amzn-sdc/README.md b/packages/aws-cdk-lib/amzn-sdc/README.md
@@ -0,0 +1,39 @@
+# AMZN::SDC Construct Library
+<!--BEGIN STABILITY BANNER-->
+
+---
+
+![cfn-resources: Stable](https://img.shields.io/badge/cfn--resources-stable-success.svg?style=for-the-badge)
+
+> All classes with the `Cfn` prefix in this module ([CFN Resources]) are always stable and safe to use.
+>
+> [CFN Resources]: https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib
+
+---
+
+<!--END STABILITY BANNER-->
+
+This module is part of the [AWS Cloud Development Kit](https://github.com/aws/aws-cdk) project.
+
+```ts nofixture
+import * as amzn_sdc from 'aws-cdk-lib/amzn-sdc';
+```
+
+<!--BEGIN CFNONLY DISCLAIMER-->
+
+There are no official hand-written ([L2](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib)) constructs for this service yet. Here are some suggestions on how to proceed:
+
+- Search [Construct Hub for SDC construct libraries](https://constructs.dev/search?q=sdc)
+- Use the automatically generated [L1](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_l1_using) constructs, in the same way you would use [the CloudFormation AMZN::SDC resources](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AMZN_SDC.html) directly.
+
+
+<!--BEGIN CFNONLY DISCLAIMER-->
+
+There are no hand-written ([L2](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib)) constructs for this service yet. 
+However, you can still use the automatically generated [L1](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_l1_using) constructs, and use this service exactly as you would using CloudFormation directly.
+
+For more information on the resources and properties available for this service, see the [CloudFormation documentation for AMZN::SDC](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AMZN_SDC.html).
+
+(Read the [CDK Contributing Guide](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and submit an RFC if you are interested in contributing to this construct library.)
+
+<!--END CFNONLY DISCLAIMER-->
diff --git a/packages/aws-cdk-lib/amzn-sdc/index.ts b/packages/aws-cdk-lib/amzn-sdc/index.ts
@@ -0,0 +1 @@
+export * from './lib';
diff --git a/packages/aws-cdk-lib/amzn-sdc/lib/index.ts b/packages/aws-cdk-lib/amzn-sdc/lib/index.ts
@@ -0,0 +1,2 @@
+// AMZN::SDC Cloudformation Resources
+export * from './sdc.generated';
diff --git a/packages/aws-cdk-lib/aws-codetest/.jsiirc.json b/packages/aws-cdk-lib/aws-codetest/.jsiirc.json
@@ -0,0 +1,13 @@
+{
+  "targets": {
+    "java": {
+      "package": "software.amazon.awscdk.services.codetest"
+    },
+    "dotnet": {
+      "package": "Amazon.CDK.AWS.CodeTest"
+    },
+    "python": {
+      "module": "aws_cdk.aws_codetest"
+    }
+  }
+}
diff --git a/packages/aws-cdk-lib/aws-codetest/README.md b/packages/aws-cdk-lib/aws-codetest/README.md
@@ -0,0 +1,39 @@
+# AWS::CodeTest Construct Library
+<!--BEGIN STABILITY BANNER-->
+
+---
+
+![cfn-resources: Stable](https://img.shields.io/badge/cfn--resources-stable-success.svg?style=for-the-badge)
+
+> All classes with the `Cfn` prefix in this module ([CFN Resources]) are always stable and safe to use.
+>
+> [CFN Resources]: https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib
+
+---
+
+<!--END STABILITY BANNER-->
+
+This module is part of the [AWS Cloud Development Kit](https://github.com/aws/aws-cdk) project.
+
+```ts nofixture
+import * as codetest from 'aws-cdk-lib/aws-codetest';
+```
+
+<!--BEGIN CFNONLY DISCLAIMER-->
+
+There are no official hand-written ([L2](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib)) constructs for this service yet. Here are some suggestions on how to proceed:
+
+- Search [Construct Hub for CodeTest construct libraries](https://constructs.dev/search?q=codetest)
+- Use the automatically generated [L1](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_l1_using) constructs, in the same way you would use [the CloudFormation AWS::CodeTest resources](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_CodeTest.html) directly.
+
+
+<!--BEGIN CFNONLY DISCLAIMER-->
+
+There are no hand-written ([L2](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_lib)) constructs for this service yet. 
+However, you can still use the automatically generated [L1](https://docs.aws.amazon.com/cdk/latest/guide/constructs.html#constructs_l1_using) constructs, and use this service exactly as you would using CloudFormation directly.
+
+For more information on the resources and properties available for this service, see the [CloudFormation documentation for AWS::CodeTest](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_CodeTest.html).
+
+(Read the [CDK Contributing Guide](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and submit an RFC if you are interested in contributing to this construct library.)
+
+<!--END CFNONLY DISCLAIMER-->
diff --git a/packages/aws-cdk-lib/aws-codetest/index.ts b/packages/aws-cdk-lib/aws-codetest/index.ts
@@ -0,0 +1 @@
+export * from './lib';
diff --git a/packages/aws-cdk-lib/aws-codetest/lib/index.ts b/packages/aws-cdk-lib/aws-codetest/lib/index.ts
@@ -0,0 +1,2 @@
+// AWS::CodeTest Cloudformation Resources
+export * from './codetest.generated';
diff --git a/packages/aws-cdk-lib/aws-rds/lib/instance-engine.ts b/packages/aws-cdk-lib/aws-rds/lib/instance-engine.ts
@@ -1973,6 +1973,8 @@ export class SqlServerEngineVersion {
   public static readonly VER_15_00_4322_2_V1 = SqlServerEngineVersion.of('15.00.4322.2.v1', '15.00');
   /** Version "15.00.4335.1.v1". */
   public static readonly VER_15_00_4335_1_V1 = SqlServerEngineVersion.of('15.00.4335.1.v1', '15.00');
+  /** Version "15.00.4345.5.v1". */
+  public static readonly VER_15_00_4345_5_V1 = SqlServerEngineVersion.of('15.00.4345.5.v1', '15.00');
   /** Version "16.00.4085.2.v1". */
   public static readonly VER_16_00_4085_2_V1 = SqlServerEngineVersion.of('16.00.4085.2.v1', '16.00');
   /** Version "16.00.4095.4.v1". */

diff --git a/packages/aws-cdk-lib/index.ts b/packages/aws-cdk-lib/index.ts
@@ -1,4 +1,5 @@
 export * as alexa_ask from './alexa-ask';
+export * as amzn_sdc from './amzn-sdc';
 export * as assertions from './assertions';
 export * as assets from './assets';
 export * as aws_accessanalyzer from './aws-accessanalyzer';
@@ -57,6 +58,7 @@ export * as aws_codepipeline_actions from './aws-codepipeline-actions';
 export * as aws_codestar from './aws-codestar';
 export * as aws_codestarconnections from './aws-codestarconnections';
 export * as aws_codestarnotifications from './aws-codestarnotifications';
+export * as aws_codetest from './aws-codetest';
 export * as aws_cognito from './aws-cognito';
 export * as aws_comprehend from './aws-comprehend';
 export * as aws_config from './aws-config';

diff --git a/packages/aws-cdk-lib/package.json b/packages/aws-cdk-lib/package.json
@@ -133,7 +133,7 @@
     "yaml": "1.10.2"
   },
   "devDependencies": {
-    "@aws-cdk/aws-service-spec": "^0.0.38",
+    "@aws-cdk/aws-service-spec": "^0.0.40",
     "@aws-cdk/cdk-build-tools": "0.0.0",
     "@aws-cdk/custom-resource-handlers": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
@@ -209,6 +209,7 @@
     "./.jsii": "./.jsii",
     "./.warnings.jsii.js": "./.warnings.jsii.js",
     "./alexa-ask": "./alexa-ask/index.js",
+    "./amzn-sdc": "./amzn-sdc/index.js",
     "./assertions": "./assertions/index.js",
     "./assertions/lib/helpers-internal": "./assertions/lib/helpers-internal/index.js",
     "./assets": "./assets/index.js",
@@ -268,6 +269,7 @@
     "./aws-codestar": "./aws-codestar/index.js",
     "./aws-codestarconnections": "./aws-codestarconnections/index.js",
     "./aws-codestarnotifications": "./aws-codestarnotifications/index.js",
+    "./aws-codetest": "./aws-codetest/index.js",
     "./aws-cognito": "./aws-cognito/index.js",
     "./aws-comprehend": "./aws-comprehend/index.js",
     "./aws-config": "./aws-config/index.js",

diff --git a/packages/aws-cdk-lib/scripts/scope-map.json b/packages/aws-cdk-lib/scripts/scope-map.json
@@ -2,6 +2,9 @@
   "alexa-ask": [
     "Alexa::ASK"
   ],
+  "amzn-sdc": [
+    "AMZN::SDC"
+  ],
   "aws-accessanalyzer": [
     "AWS::AccessAnalyzer"
   ],
@@ -146,6 +149,9 @@
   "aws-codestarnotifications": [
     "AWS::CodeStarNotifications"
   ],
+  "aws-codetest": [
+    "AWS::CodeTest"
+  ],
   "aws-cognito": [
     "AWS::Cognito"
   ],

diff --git a/tools/@aws-cdk/spec2cdk/package.json b/tools/@aws-cdk/spec2cdk/package.json
@@ -32,9 +32,9 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-cdk/aws-service-spec": "^0.0.38",
+    "@aws-cdk/aws-service-spec": "^0.0.40",
     "@aws-cdk/service-spec-importers": "^0.0.14",
-    "@aws-cdk/service-spec-types": "^0.0.38",
+    "@aws-cdk/service-spec-types": "^0.0.40",
     "@cdklabs/tskb": "^0.0.3",
     "@cdklabs/typewriter": "^0.0.3",
     "camelcase": "^6",

diff --git a/yarn.lock b/yarn.lock
@@ -56,12 +56,12 @@
   resolved "https://registry.npmjs.org/@aws-cdk/asset-node-proxy-agent-v6/-/asset-node-proxy-agent-v6-2.0.1.tgz#6dc9b7cdb22ff622a7176141197962360c33e9ac"
   integrity sha512-DDt4SLdLOwWCjGtltH4VCST7hpOI5DzieuhGZsBpZ+AgJdSI2GCjklCXm0GCTwJG/SolkL5dtQXyUKgg9luBDg==
 
-"@aws-cdk/aws-service-spec@^0.0.38":
-  version "0.0.38"
-  resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.0.38.tgz#bcc5fedaaec1358f3b299be7f6b60691b9d887eb"
-  integrity sha512-rnsZbD+S9RZxqQ6hhSmJEhW3iKgIkq1ztex74uYE7jFZszTIM0F1tdbnyb78RtC/+FuUwZ7FDnrXdQmWMMSsNg==
+"@aws-cdk/aws-service-spec@^0.0.40":
+  version "0.0.40"
+  resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.0.40.tgz#f1b7cb34323b060d6ab72df456f5a92ec8346bdf"
+  integrity sha512-ujRd7lEnmwsoaHAAY04QjjzKoOHnyEcv6APSEH7airjv+rodJG6713wZOWo5su8ESaC/1SE/+cFix2mKtpcz1Q==
   dependencies:
-    "@aws-cdk/service-spec-types" "^0.0.38"
+    "@aws-cdk/service-spec-types" "^0.0.40"
     "@cdklabs/tskb" "^0.0.3"
 
 "@aws-cdk/lambda-layer-kubectl-v24@^2.0.242":
@@ -92,6 +92,13 @@
   dependencies:
     "@cdklabs/tskb" "^0.0.3"
 
+"@aws-cdk/service-spec-types@^0.0.40":
+  version "0.0.40"
+  resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.40.tgz#348f67da375fbed4538f3dcbefae6f5458662b37"
+  integrity sha512-+UWCCRQ5CtkLVaiJMCdG+r/0ifHo/YIE2u0hhD731Ud1iO99cMEzulzMztfBXxNdX4ySNq9WthyJTFSFWWAxYw==
+  dependencies:
+    "@cdklabs/tskb" "^0.0.3"
+
 "@aws-crypto/[email protected]":
   version "3.0.0"
   resolved "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-3.0.0.tgz#07300eca214409c33e3ff769cd5697b57fdd38fa"