Merge branch 'main' of https://github.com/sakurai-ryo/aws-cdk into fi…

…x-fail-state-error-cause
aws · May 15, 2024 · 39f6572 · 39f6572
2 parents 3604180 + 4b6dc8c
commit 39f6572
Show file tree

Hide file tree

Showing 36 changed files with 36,709 additions and 45 deletions.
diff --git a/...catalog/test/integ.two-products.js.snapshot/integ-servicecatalog-two-products.assets.json b/...catalog/test/integ.two-products.js.snapshot/integ-servicecatalog-two-products.assets.json
diff --git a/...talog/test/integ.two-products.js.snapshot/integ-servicecatalog-two-products.template.json b/...talog/test/integ.two-products.js.snapshot/integ-servicecatalog-two-products.template.json
@@ -41,7 +41,7 @@
       "Value": "true"
      },
      {
-      "Key": "aws-cdk:cr-owned:8a3b3620",
+      "Key": "aws-cdk:cr-owned:978d2e9b",
       "Value": "true"
      }
     ]
@@ -130,12 +130,12 @@
     "Description": "/opt/awscli/aws"
    }
   },
-  "TestAssetBucketProductAssetsDeploymentCustomResource5F81E30F": {
+  "TestAssetBucketProductAssetsDeploymentCustomResource256MiBB5A849A6": {
    "Type": "Custom::CDKBucketDeployment",
    "Properties": {
     "ServiceToken": {
      "Fn::GetAtt": [
-      "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C81C01536",
+      "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C256MiB5F7BD223",
       "Arn"
      ]
     },
@@ -217,7 +217,7 @@
     "CustomS3AutoDeleteObjectsCustomResourceProviderRole3B1BD092"
    ]
   },
-  "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265": {
+  "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C256MiBServiceRoleF991ED9F": {
    "Type": "AWS::IAM::Role",
    "Properties": {
     "AssumeRolePolicyDocument": {
@@ -248,7 +248,7 @@
     ]
    }
   },
-  "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRoleDefaultPolicy88902FDF": {
+  "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C256MiBServiceRoleDefaultPolicyE5468F0E": {
    "Type": "AWS::IAM::Policy",
    "Properties": {
     "PolicyDocument": {
@@ -327,15 +327,15 @@
      ],
      "Version": "2012-10-17"
     },
-    "PolicyName": "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRoleDefaultPolicy88902FDF",
+    "PolicyName": "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C256MiBServiceRoleDefaultPolicyE5468F0E",
     "Roles": [
      {
-      "Ref": "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265"
+      "Ref": "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C256MiBServiceRoleF991ED9F"
      }
     ]
    }
   },
-  "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C81C01536": {
+  "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C256MiB5F7BD223": {
    "Type": "AWS::Lambda::Function",
    "Properties": {
     "Code": {
@@ -353,18 +353,19 @@
       "Ref": "TestAssetBucketProductAssetsDeploymentAwsCliLayerD1E52C82"
      }
     ],
+    "MemorySize": 256,
     "Role": {
      "Fn::GetAtt": [
-      "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265",
+      "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C256MiBServiceRoleF991ED9F",
       "Arn"
      ]
     },
     "Runtime": "python3.9",
     "Timeout": 900
    },
    "DependsOn": [
-    "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRoleDefaultPolicy88902FDF",
-    "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756CServiceRole89A01265"
+    "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C256MiBServiceRoleDefaultPolicyE5468F0E",
+    "CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C256MiBServiceRoleF991ED9F"
    ]
   },
   "Product133E85955": {

diff --git a/...framework-integ/test/aws-servicecatalog/test/integ.two-products.js.snapshot/manifest.json b/...framework-integ/test/aws-servicecatalog/test/integ.two-products.js.snapshot/manifest.json
diff --git a/...ing/framework-integ/test/aws-servicecatalog/test/integ.two-products.js.snapshot/tree.json b/...ing/framework-integ/test/aws-servicecatalog/test/integ.two-products.js.snapshot/tree.json
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.two-products.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-servicecatalog/test/integ.two-products.ts
@@ -36,6 +36,7 @@ class PortfolioStack extends cdk.Stack {
         cloudFormationTemplate: servicecatalog.CloudFormationTemplate.fromProductStack(
           new TestAssetProductStack1(this, 'MyProductStack1', {
             assetBucket: testAssetBucket,
+            memoryLimit: 256,
           }),
         ),
       }],