Merge branch 'main' into merge-back/2.99.0

aws · Sep 28, 2023 · 2cecd0e · 2cecd0e
2 parents 0aa1096 + e8f0cda
commit 2cecd0e
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 18 deletions.
diff --git a/packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES b/packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES
@@ -264,7 +264,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE
 
 ----------------
 
-** aws-sdk@2.1451.0 - https://www.npmjs.com/package/aws-sdk/v/2.1451.0 | Apache-2.0
+** aws-sdk@2.1461.0 - https://www.npmjs.com/package/aws-sdk/v/2.1461.0 | Apache-2.0
 AWS SDK for JavaScript
 Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
@@ -461,7 +461,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ----------------
 
-** cdk-from-cfn@0.17.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.17.0 | MIT OR Apache-2.0
+** cdk-from-cfn@0.35.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.35.0 | MIT OR Apache-2.0
 
 ----------------
 

diff --git a/packages/@aws-cdk/cli-lib-alpha/package.json b/packages/@aws-cdk/cli-lib-alpha/package.json
@@ -121,4 +121,4 @@
   },
   "dependencies": {},
   "peerDependencies": {}
-}
+}
diff --git a/packages/aws-cdk/THIRD_PARTY_LICENSES b/packages/aws-cdk/THIRD_PARTY_LICENSES
@@ -461,7 +461,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ----------------
 
-** cdk-from-cfn@0.17.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.17.0 | MIT OR Apache-2.0
+** cdk-from-cfn@0.35.0 - https://www.npmjs.com/package/cdk-from-cfn/v/0.35.0 | MIT OR Apache-2.0
 
 ----------------
 

diff --git a/packages/aws-cdk/package.json b/packages/aws-cdk/package.json
@@ -82,7 +82,7 @@
     "aws-cdk-lib": "0.0.0",
     "aws-sdk-mock": "5.6.0",
     "axios": "^0.27.2",
-    "cdk-from-cfn": "^0.17.0",
+    "cdk-from-cfn": "^0.35.0",
     "constructs": "^10.0.0",
     "fast-check": "^3.13.0",
     "jest": "^29.7.0",
@@ -105,7 +105,7 @@
     "aws-sdk": "^2.1461.0",
     "camelcase": "^6.3.0",
     "cdk-assets": "0.0.0",
-    "cdk-from-cfn": "^0.17.0",
+    "cdk-from-cfn": "^0.35.0",
     "chalk": "^4",
     "chokidar": "^3.5.3",
     "decamelize": "^5.0.1",

diff --git a/packages/aws-cdk/test/commands/test-resources/stacks/S3Stack.cs b/packages/aws-cdk/test/commands/test-resources/stacks/S3Stack.cs
@@ -3,8 +3,12 @@
 using Constructs;
 using System.Collections.Generic;
 
-namespace Com.Acme.Test.Simple
+namespace GoodCSharpStack
 {
+    public class GoodCSharpStackProps : StackProps
+    {
+    }
+
     /// <summary>
     /// AWS CloudFormation Sample Template S3_Website_Bucket_With_Retain_On_Delete: Sample template showing how to create a publicly accessible S3 bucket configured for website access with a deletion policy of retain on delete.
     /// </summary>

diff --git a/packages/aws-cdk/test/commands/test-resources/stacks/s3.go b/packages/aws-cdk/test/commands/test-resources/stacks/s3.go
@@ -48,10 +48,10 @@ func NewGoodGoStack(scope constructs.Construct, id string, props GoodGoStackProp
 func main() {
 	defer jsii.Close()
 
-	app := awscdk.NewApp(nil)
+	app := cdk.NewApp(nil)
 
-	NewGoodGoStack(app, "GoodGo", &GoodGoStackProps{
-		awscdk.StackProps{
+	NewGoodGoStack(app, "GoodGo", GoodGoStackProps{
+		cdk.StackProps{
 			Env: env(),
 		},
 	})
@@ -61,7 +61,7 @@ func main() {
 
 // env determines the AWS environment (account+region) in which our stack is to
 // be deployed. For more information see: https://docs.aws.amazon.com/cdk/latest/guide/environments.html
-func env() *awscdk.Environment {
+func env() *cdk.Environment {
 	// If unspecified, this stack will be "environment-agnostic".
 	// Account/Region-dependent features and context lookups will not work, but a
 	// single synthesized template can be deployed anywhere.
@@ -71,7 +71,7 @@ func env() *awscdk.Environment {
 	// Uncomment if you know exactly what account and region you want to deploy
 	// the stack to. This is the recommendation for production stacks.
 	//---------------------------------------------------------------------------
-	// return &awscdk.Environment{
+	// return &cdk.Environment{
 	//  Account: jsii.String("123456789012"),
 	//  Region:  jsii.String("us-east-1"),
 	// }
@@ -80,7 +80,7 @@ func env() *awscdk.Environment {
 	// implied by the current CLI configuration. This is recommended for dev
 	// stacks.
 	//---------------------------------------------------------------------------
-	// return &awscdk.Environment{
+	// return &cdk.Environment{
 	//  Account: jsii.String(os.Getenv("CDK_DEFAULT_ACCOUNT")),
 	//  Region:  jsii.String(os.Getenv("CDK_DEFAULT_REGION")),
 	// }

diff --git a/packages/aws-cdk/test/commands/test-resources/stacks/s3_stack.py b/packages/aws-cdk/test/commands/test-resources/stacks/s3_stack.py
@@ -27,7 +27,7 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
             'errorDocument': 'error.html',
           },
         )
-    s3Bucket.cfnOptions.deletionPolicy = cdk.CfnDeletionPolicy.RETAIN
+    s3Bucket.cfn_options.deletion_policy = cdk.CfnDeletionPolicy.RETAIN
 
     # Outputs
     self.website_u_r_l = s3Bucket.attr_website_u_r_l

diff --git a/yarn.lock b/yarn.lock
@@ -5334,10 +5334,10 @@ case@1.6.3, case@^1.6.3:
   resolved "https://registry.npmjs.org/case/-/case-1.6.3.tgz#0a4386e3e9825351ca2e6216c60467ff5f1ea1c9"
   integrity sha512-mzDSXIPaFwVDvZAHqZ9VlbyF4yyXRuX6IvB06WvPYkqJVO24kX1PPhv9bfpKNFZyxYFmmgo03HUiD8iklmJYRQ==
 
-cdk-from-cfn@^0.17.0:
-  version "0.17.0"
-  resolved "https://registry.npmjs.org/cdk-from-cfn/-/cdk-from-cfn-0.17.0.tgz#46f77dc1141c21ee99255cdda59a8a2d2d428755"
-  integrity sha512-7sJnvEfnlFhYdIih4XZfIpUFiIy0ogdLXHk8BZEaWdG1tSpUOV9HTmk5IvZJr6YfF1j1D21kvrGLZYZNsRr7HA==
+cdk-from-cfn@^0.35.0:
+  version "0.35.0"
+  resolved "https://registry.npmjs.org/cdk-from-cfn/-/cdk-from-cfn-0.35.0.tgz#e7c1111fa9286a6ebd6d82d7f8083af7c4eef230"
+  integrity sha512-5wBdQKHv+z93209sxNf8ErTUgvKu5gMSNjQUJRqunKq2zENJbrnCKUUTv1vwR2KFhijKIGykWBsqRsByZ4QN/A==
 
 cdk-generate-synthetic-examples@^0.1.291:
   version "0.1.291"
-Original file line number
+Diff line change
@@ Expand Up / @@ -121,4 +121,4 @@ @@
       },
       "dependencies": {},
       "peerDependencies": {}
-    }
+    }