Merge branch 'main' into 25980-add1Nvidia

aws · Dec 26, 2023 · dc91c42 · dc91c42
2 parents c0cc138 + 607dccb
commit dc91c42
Show file tree

Hide file tree

Showing 11 changed files with 81 additions and 21 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.36",
-    "@aws-cdk/service-spec-types": "^0.0.36",
+    "@aws-cdk/aws-service-spec": "^0.0.38",
+    "@aws-cdk/service-spec-types": "^0.0.38",
     "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.36",
+    "@aws-cdk/aws-service-spec": "^0.0.38",
     "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/aws-neptunegraph/.jsiirc.json b/packages/aws-cdk-lib/aws-neptunegraph/.jsiirc.json
@@ -0,0 +1,13 @@
+{
+  "targets": {
+    "java": {
+      "package": "software.amazon.awscdk.services.neptunegraph"
+    },
+    "dotnet": {
+      "package": "Amazon.CDK.AWS.NeptuneGraph"
+    },
+    "python": {
+      "module": "aws_cdk.aws_neptunegraph"
+    }
+  }
+}
diff --git a/packages/aws-cdk-lib/aws-neptunegraph/README.md b/packages/aws-cdk-lib/aws-neptunegraph/README.md
@@ -0,0 +1,39 @@
+# AWS::NeptuneGraph 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 neptunegraph from 'aws-cdk-lib/aws-neptunegraph';
+```
+
+<!--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 NeptuneGraph construct libraries](https://constructs.dev/search?q=neptunegraph)
+- 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::NeptuneGraph resources](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_NeptuneGraph.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::NeptuneGraph](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_NeptuneGraph.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-neptunegraph/index.ts b/packages/aws-cdk-lib/aws-neptunegraph/index.ts
@@ -0,0 +1 @@
+export * from './lib';
diff --git a/packages/aws-cdk-lib/aws-neptunegraph/lib/index.ts b/packages/aws-cdk-lib/aws-neptunegraph/lib/index.ts
@@ -0,0 +1,2 @@
+// AWS::NeptuneGraph Cloudformation Resources
+export * from './neptunegraph.generated';
diff --git a/packages/aws-cdk-lib/index.ts b/packages/aws-cdk-lib/index.ts
@@ -173,6 +173,7 @@ export * as aws_memorydb from './aws-memorydb';
 export * as aws_msk from './aws-msk';
 export * as aws_mwaa from './aws-mwaa';
 export * as aws_neptune from './aws-neptune';
+export * as aws_neptunegraph from './aws-neptunegraph';
 export * as aws_networkfirewall from './aws-networkfirewall';
 export * as aws_networkmanager from './aws-networkmanager';
 export * as aws_nimblestudio from './aws-nimblestudio';

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.36",
+    "@aws-cdk/aws-service-spec": "^0.0.38",
     "@aws-cdk/cdk-build-tools": "0.0.0",
     "@aws-cdk/custom-resource-handlers": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
@@ -386,6 +386,7 @@
     "./aws-msk": "./aws-msk/index.js",
     "./aws-mwaa": "./aws-mwaa/index.js",
     "./aws-neptune": "./aws-neptune/index.js",
+    "./aws-neptunegraph": "./aws-neptunegraph/index.js",
     "./aws-networkfirewall": "./aws-networkfirewall/index.js",
     "./aws-networkmanager": "./aws-networkmanager/index.js",
     "./aws-nimblestudio": "./aws-nimblestudio/index.js",

diff --git a/packages/aws-cdk-lib/scripts/scope-map.json b/packages/aws-cdk-lib/scripts/scope-map.json
@@ -465,6 +465,9 @@
   "aws-neptune": [
     "AWS::Neptune"
   ],
+  "aws-neptunegraph": [
+    "AWS::NeptuneGraph"
+  ],
   "aws-networkfirewall": [
     "AWS::NetworkFirewall"
   ],

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.36",
-    "@aws-cdk/service-spec-importers": "^0.0.12",
-    "@aws-cdk/service-spec-types": "^0.0.36",
+    "@aws-cdk/aws-service-spec": "^0.0.38",
+    "@aws-cdk/service-spec-importers": "^0.0.14",
+    "@aws-cdk/service-spec-types": "^0.0.38",
     "@cdklabs/tskb": "^0.0.3",
     "@cdklabs/typewriter": "^0.0.3",
     "camelcase": "^6",

diff --git a/yarn.lock b/yarn.lock
@@ -56,25 +56,25 @@
   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.36":
-  version "0.0.36"
-  resolved "https://registry.npmjs.org/@aws-cdk/aws-service-spec/-/aws-service-spec-0.0.36.tgz#ce62d242c0d7e4bc6527327d9849bae1f7df190c"
-  integrity sha512-hnhWZntWw/GYAYWdhJJSG+xiPQBcBTl8K9AFZSHzW0NvhJCRJIu/3NfFyPmRqZ1qEkHrLhmagVFbdeXucHnjWw==
+"@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==
   dependencies:
-    "@aws-cdk/service-spec-types" "^0.0.36"
+    "@aws-cdk/service-spec-types" "^0.0.38"
     "@cdklabs/tskb" "^0.0.3"
 
 "@aws-cdk/lambda-layer-kubectl-v24@^2.0.242":
   version "2.0.242"
   resolved "https://registry.npmjs.org/@aws-cdk/lambda-layer-kubectl-v24/-/lambda-layer-kubectl-v24-2.0.242.tgz#4273a5ad7714f933a7eba155eb9280823086db71"
   integrity sha512-7/wIOo685tmrEe4hh6zqDELhBZh5OQGf3Hd2FU2Vnwy2ZubW8qTmEw5gqJCsCrGKeYDoa1BcVhDRZ/nzjkaqyA==
 
-"@aws-cdk/service-spec-importers@^0.0.12":
-  version "0.0.12"
-  resolved "https://registry.npmjs.org/@aws-cdk/service-spec-importers/-/service-spec-importers-0.0.12.tgz#0af7f326eb5503ad8c65e195c37713956fc7fff5"
-  integrity sha512-Vhb7gPzN0vWV38HfI3h+pRIdaTxK7A77dbVOXKZa8z8Ge1PQq+Tn4xaMzOkhbnXxDnbP2EEUrc8whWYsPo7l1A==
+"@aws-cdk/service-spec-importers@^0.0.14":
+  version "0.0.14"
+  resolved "https://registry.npmjs.org/@aws-cdk/service-spec-importers/-/service-spec-importers-0.0.14.tgz#db8fef9d0a95cce4e90d41d48184233c8eeb18ad"
+  integrity sha512-KBlSEEc3c6CiKa2YUh562+8PfXlh/0ZkWyi7zFYYAlxaMGVGcQM0coOA/hKf6DRSaQ/6CajH4CSbNQwJAQ1rzg==
   dependencies:
-    "@aws-cdk/service-spec-types" "^0.0.36"
+    "@aws-cdk/service-spec-types" "^0.0.38"
     "@cdklabs/tskb" "^0.0.3"
     ajv "^6"
     canonicalize "^2.0.0"
@@ -85,10 +85,10 @@
     glob "^8"
     sort-json "^2.0.1"
 
-"@aws-cdk/service-spec-types@^0.0.36":
-  version "0.0.36"
-  resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.36.tgz#d4e7c78b246ba6abdd262668c748f91c31c6075d"
-  integrity sha512-ILHIT+/7boUOJLe3H0doBxIm9k5+I2wNBg+WzJ6GC2IlPPT1R6qax9yZmvxSDfq87dWEpIuc3DDUZsPkWIA/qg==
+"@aws-cdk/service-spec-types@^0.0.38":
+  version "0.0.38"
+  resolved "https://registry.npmjs.org/@aws-cdk/service-spec-types/-/service-spec-types-0.0.38.tgz#ca56478cdb0cdb2502ae5e332227553ff61a4c9b"
+  integrity sha512-uFZpElN0flikUQvqtnKEDP1Q4bO+Dxsc1+GhL2bEm1Wb/oreBNhlRQJIQBzby4ABMC2iiZgqmKJ+peon1UTM4A==
   dependencies:
     "@cdklabs/tskb" "^0.0.3"