fix(s3): allow empty string as keyPrefixEquals (#26243)

Closes #26242 . ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
aws · Jul 17, 2023 · 9381880 · 9381880
1 parent 3b9c983
commit 9381880
Show file tree

Hide file tree

Showing 11 changed files with 453 additions and 1 deletion.
diff --git a/...g/framework-integ/test/aws-s3/test/integ.bucket.website-routing-rules.js.snapshot/cdk.out b/...g/framework-integ/test/aws-s3/test/integ.bucket.website-routing-rules.js.snapshot/cdk.out
@@ -0,0 +1 @@
+{"version":"32.0.0"}
diff --git a/...ite-routing-rules.js.snapshot/cdkintegs3bucketDefaultTestDeployAssertB89636B8.assets.json b/...ite-routing-rules.js.snapshot/cdkintegs3bucketDefaultTestDeployAssertB89636B8.assets.json
@@ -0,0 +1,19 @@
+{
+  "version": "32.0.0",
+  "files": {
+    "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
+      "source": {
+        "path": "cdkintegs3bucketDefaultTestDeployAssertB89636B8.template.json",
+        "packaging": "file"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    }
+  },
+  "dockerImages": {}
+}
diff --git a/...e-routing-rules.js.snapshot/cdkintegs3bucketDefaultTestDeployAssertB89636B8.template.json b/...e-routing-rules.js.snapshot/cdkintegs3bucketDefaultTestDeployAssertB89636B8.template.json
@@ -0,0 +1,36 @@
+{
+ "Parameters": {
+  "BootstrapVersion": {
+   "Type": "AWS::SSM::Parameter::Value<String>",
+   "Default": "/cdk-bootstrap/hnb659fds/version",
+   "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+  }
+ },
+ "Rules": {
+  "CheckBootstrapVersion": {
+   "Assertions": [
+    {
+     "Assert": {
+      "Fn::Not": [
+       {
+        "Fn::Contains": [
+         [
+          "1",
+          "2",
+          "3",
+          "4",
+          "5"
+         ],
+         {
+          "Ref": "BootstrapVersion"
+         }
+        ]
+       }
+      ]
+     },
+     "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+    }
+   ]
+  }
+ }
+}
diff --git a/...ramework-integ/test/aws-s3/test/integ.bucket.website-routing-rules.js.snapshot/integ.json b/...ramework-integ/test/aws-s3/test/integ.bucket.website-routing-rules.js.snapshot/integ.json
@@ -0,0 +1,12 @@
+{
+  "version": "32.0.0",
+  "testCases": {
+    "cdk-integ-s3-bucket/DefaultTest": {
+      "stacks": [
+        "s3-bucket-routing"
+      ],
+      "assertionStack": "cdk-integ-s3-bucket/DefaultTest/DeployAssert",
+      "assertionStackName": "cdkintegs3bucketDefaultTestDeployAssertB89636B8"
+    }
+  }
+}
diff --git a/...ework-integ/test/aws-s3/test/integ.bucket.website-routing-rules.js.snapshot/manifest.json b/...ework-integ/test/aws-s3/test/integ.bucket.website-routing-rules.js.snapshot/manifest.json
@@ -0,0 +1,111 @@
+{
+  "version": "32.0.0",
+  "artifacts": {
+    "s3-bucket-routing.assets": {
+      "type": "cdk:asset-manifest",
+      "properties": {
+        "file": "s3-bucket-routing.assets.json",
+        "requiresBootstrapStackVersion": 6,
+        "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+      }
+    },
+    "s3-bucket-routing": {
+      "type": "aws:cloudformation:stack",
+      "environment": "aws://unknown-account/unknown-region",
+      "properties": {
+        "templateFile": "s3-bucket-routing.template.json",
+        "validateOnSynth": false,
+        "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
+        "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4c953dadd81493b9ba7f2a1c7b5aea35907c8e0df9be35cd5171c5d4393f5482.json",
+        "requiresBootstrapStackVersion": 6,
+        "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
+        "additionalDependencies": [
+          "s3-bucket-routing.assets"
+        ],
+        "lookupRole": {
+          "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
+          "requiresBootstrapStackVersion": 8,
+          "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+        }
+      },
+      "dependencies": [
+        "s3-bucket-routing.assets"
+      ],
+      "metadata": {
+        "/s3-bucket-routing/MyBucketWithRoutingRules/Resource": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "MyBucketWithRoutingRulesC6E1CAA2"
+          }
+        ],
+        "/s3-bucket-routing/BootstrapVersion": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "BootstrapVersion"
+          }
+        ],
+        "/s3-bucket-routing/CheckBootstrapVersion": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "CheckBootstrapVersion"
+          }
+        ]
+      },
+      "displayName": "s3-bucket-routing"
+    },
+    "cdkintegs3bucketDefaultTestDeployAssertB89636B8.assets": {
+      "type": "cdk:asset-manifest",
+      "properties": {
+        "file": "cdkintegs3bucketDefaultTestDeployAssertB89636B8.assets.json",
+        "requiresBootstrapStackVersion": 6,
+        "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+      }
+    },
+    "cdkintegs3bucketDefaultTestDeployAssertB89636B8": {
+      "type": "aws:cloudformation:stack",
+      "environment": "aws://unknown-account/unknown-region",
+      "properties": {
+        "templateFile": "cdkintegs3bucketDefaultTestDeployAssertB89636B8.template.json",
+        "validateOnSynth": false,
+        "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
+        "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
+        "requiresBootstrapStackVersion": 6,
+        "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
+        "additionalDependencies": [
+          "cdkintegs3bucketDefaultTestDeployAssertB89636B8.assets"
+        ],
+        "lookupRole": {
+          "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
+          "requiresBootstrapStackVersion": 8,
+          "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+        }
+      },
+      "dependencies": [
+        "cdkintegs3bucketDefaultTestDeployAssertB89636B8.assets"
+      ],
+      "metadata": {
+        "/cdk-integ-s3-bucket/DefaultTest/DeployAssert/BootstrapVersion": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "BootstrapVersion"
+          }
+        ],
+        "/cdk-integ-s3-bucket/DefaultTest/DeployAssert/CheckBootstrapVersion": [
+          {
+            "type": "aws:cdk:logicalId",
+            "data": "CheckBootstrapVersion"
+          }
+        ]
+      },
+      "displayName": "cdk-integ-s3-bucket/DefaultTest/DeployAssert"
+    },
+    "Tree": {
+      "type": "cdk:tree",
+      "properties": {
+        "file": "tree.json"
+      }
+    }
+  }
+}
diff --git a/.../aws-s3/test/integ.bucket.website-routing-rules.js.snapshot/s3-bucket-routing.assets.json b/.../aws-s3/test/integ.bucket.website-routing-rules.js.snapshot/s3-bucket-routing.assets.json
@@ -0,0 +1,19 @@
+{
+  "version": "32.0.0",
+  "files": {
+    "4c953dadd81493b9ba7f2a1c7b5aea35907c8e0df9be35cd5171c5d4393f5482": {
+      "source": {
+        "path": "s3-bucket-routing.template.json",
+        "packaging": "file"
+      },
+      "destinations": {
+        "current_account-current_region": {
+          "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+          "objectKey": "4c953dadd81493b9ba7f2a1c7b5aea35907c8e0df9be35cd5171c5d4393f5482.json",
+          "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+        }
+      }
+    }
+  },
+  "dockerImages": {}
+}
diff --git a/...ws-s3/test/integ.bucket.website-routing-rules.js.snapshot/s3-bucket-routing.template.json b/...ws-s3/test/integ.bucket.website-routing-rules.js.snapshot/s3-bucket-routing.template.json
@@ -0,0 +1,60 @@
+{
+ "Resources": {
+  "MyBucketWithRoutingRulesC6E1CAA2": {
+   "Type": "AWS::S3::Bucket",
+   "Properties": {
+    "WebsiteConfiguration": {
+     "IndexDocument": "index.html",
+     "RoutingRules": [
+      {
+       "RedirectRule": {
+        "HostName": "example.com",
+        "Protocol": "https",
+        "ReplaceKeyWith": "/"
+       },
+       "RoutingRuleCondition": {
+        "KeyPrefixEquals": ""
+       }
+      }
+     ]
+    }
+   },
+   "UpdateReplacePolicy": "Delete",
+   "DeletionPolicy": "Delete"
+  }
+ },
+ "Parameters": {
+  "BootstrapVersion": {
+   "Type": "AWS::SSM::Parameter::Value<String>",
+   "Default": "/cdk-bootstrap/hnb659fds/version",
+   "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+  }
+ },
+ "Rules": {
+  "CheckBootstrapVersion": {
+   "Assertions": [
+    {
+     "Assert": {
+      "Fn::Not": [
+       {
+        "Fn::Contains": [
+         [
+          "1",
+          "2",
+          "3",
+          "4",
+          "5"
+         ],
+         {
+          "Ref": "BootstrapVersion"
+         }
+        ]
+       }
+      ]
+     },
+     "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+    }
+   ]
+  }
+ }
+}