feat(core): Pre-concatenate Fn::Join (#967)

This restores the pre-concatenation of `Fn::Join` fragments that was introduced in #916 and reverted in #958 due to an other feature part of the same commit. The goal is to pre-concatenate the string literals present in the concatenated values, and flatten `Fn::Join` nested under another `Fn::Join` using the same delimiter, so as to produce more readable CloudFormation templates. Additionally, if the `Fn::Join` pre-concatenation results in a single string being left, then the `Fn::Join` intrinsic is erased and replaced with a string literal.
aws · Oct 22, 2018 · 33c32a8 · 33c32a8
1 parent 1626c37
commit 33c32a8
Show file tree

Hide file tree

Showing 61 changed files with 930 additions and 1,964 deletions.
diff --git a/packages/@aws-cdk/assets/test/integ.assets.directory.lit.expected.json b/packages/@aws-cdk/assets/test/integ.assets.directory.lit.expected.json
@@ -30,18 +30,11 @@
  "Fn::Join": [
  "",
  [
- "arn",
- ":",
+ "arn:",
  {
  "Ref": "AWS::Partition"
  },
- ":",
- "s3",
- ":",
- "",
- ":",
- "",
- ":",
+ ":s3:::",
  {
  "Ref": "SampleAssetS3BucketE6B2908E"
  }
@@ -52,50 +45,29 @@
  "Fn::Join": [
  "",
  [
+ "arn:",
  {
- "Fn::Join": [
- "",
- [
- "arn",
- ":",
- {
- "Ref": "AWS::Partition"
- },
- ":",
- "s3",
- ":",
- "",
- ":",
- "",
- ":",
- {
- "Ref": "SampleAssetS3BucketE6B2908E"
- }
- ]
- ]
+ "Ref": "AWS::Partition"
+ },
+ ":s3:::",
+ {
+ "Ref": "SampleAssetS3BucketE6B2908E"
  },
  "/",
  {
- "Fn::Join": [
- "",
- [
- {
- "Fn::Select": [
- 0,
- {
- "Fn::Split": [
- "||",
- {
- "Ref": "SampleAssetS3VersionKey3E106D34"
- }
- ]
- }
- ]
- },
- "*"
- ]
+ "Fn::Select": [
+ 0,
+ {
+ "Fn::Split": [
+ "||",
+ {
+ "Ref": "SampleAssetS3VersionKey3E106D34"
+ }
+ ]
+ }
  ]
- }
+ },
+ "*"
  ]
  ]
  }

diff --git a/packages/@aws-cdk/assets/test/integ.assets.file.lit.expected.json b/packages/@aws-cdk/assets/test/integ.assets.file.lit.expected.json
@@ -30,18 +30,11 @@
  "Fn::Join": [
  "",
  [
- "arn",
- ":",
+ "arn:",
  {
  "Ref": "AWS::Partition"
  },
- ":",
- "s3",
- ":",
- "",
- ":",
- "",
- ":",
+ ":s3:::",
  {
  "Ref": "SampleAssetS3BucketE6B2908E"
  }
@@ -52,50 +45,29 @@
  "Fn::Join": [
  "",
  [
+ "arn:",
  {
- "Fn::Join": [
- "",
- [
- "arn",
- ":",
- {
- "Ref": "AWS::Partition"
- },
- ":",
- "s3",
- ":",
- "",
- ":",
- "",
- ":",
- {
- "Ref": "SampleAssetS3BucketE6B2908E"
- }
- ]
- ]
+ "Ref": "AWS::Partition"
+ },
+ ":s3:::",
+ {
+ "Ref": "SampleAssetS3BucketE6B2908E"
  },
  "/",
  {
- "Fn::Join": [
- "",
- [
- {
- "Fn::Select": [
- 0,
- {
- "Fn::Split": [
- "||",
- {
- "Ref": "SampleAssetS3VersionKey3E106D34"
- }
- ]
- }
- ]
- },
- "*"
- ]
+ "Fn::Select": [
+ 0,
+ {
+ "Fn::Split": [
+ "||",
+ {
+ "Ref": "SampleAssetS3VersionKey3E106D34"
+ }
+ ]
+ }
  ]
- }
+ },
+ "*"
  ]
  ]
  }

diff --git a/packages/@aws-cdk/assets/test/integ.assets.permissions.lit.expected.json b/packages/@aws-cdk/assets/test/integ.assets.permissions.lit.expected.json
@@ -30,18 +30,11 @@
  "Fn::Join": [
  "",
  [
- "arn",
- ":",
+ "arn:",
  {
  "Ref": "AWS::Partition"
  },
- ":",
- "s3",
- ":",
- "",
- ":",
- "",
- ":",
+ ":s3:::",
  {
  "Ref": "MyFileS3BucketACE13C36"
  }
@@ -52,50 +45,29 @@
  "Fn::Join": [
  "",
  [
+ "arn:",
  {
- "Fn::Join": [
- "",
- [
- "arn",
- ":",
- {
- "Ref": "AWS::Partition"
- },
- ":",
- "s3",
- ":",
- "",
- ":",
- "",
- ":",
- {
- "Ref": "MyFileS3BucketACE13C36"
- }
- ]
- ]
+ "Ref": "AWS::Partition"
+ },
+ ":s3:::",
+ {
+ "Ref": "MyFileS3BucketACE13C36"
  },
  "/",
  {
- "Fn::Join": [
- "",
- [
- {
- "Fn::Select": [
- 0,
- {
- "Fn::Split": [
- "||",
- {
- "Ref": "MyFileS3VersionKey568C3C9F"
- }
- ]
- }
- ]
- },
- "*"
- ]
+ "Fn::Select": [
+ 0,
+ {
+ "Fn::Split": [
+ "||",
+ {
+ "Ref": "MyFileS3VersionKey568C3C9F"
+ }
+ ]
+ }
  ]
- }
+ },
+ "*"
  ]
  ]
  }