Stabilizing integ test for record set weight from param

aws · Oct 27, 2024 · 0b850c4 · 0b850c4
1 parent e20b3bb
commit 0b850c4
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 45 deletions.
diff --git a/...teg/test/aws-route53/test/integ.record-weight-from-cfnparameter.js.snapshot/manifest.json b/...teg/test/aws-route53/test/integ.record-weight-from-cfnparameter.js.snapshot/manifest.json
diff --git a/...g.record-weight-from-cfnparameter.js.snapshot/record-weight-from-cfnparameter.assets.json b/...g.record-weight-from-cfnparameter.js.snapshot/record-weight-from-cfnparameter.assets.json
diff --git a/...record-weight-from-cfnparameter.js.snapshot/record-weight-from-cfnparameter.template.json b/...record-weight-from-cfnparameter.js.snapshot/record-weight-from-cfnparameter.template.json
@@ -6,7 +6,7 @@
     "Name": "cdk.dev."
    }
   },
-  "RecordWeightedFromCfnParameter0FB5DFC65": {
+  "RecordWithParamWeight01950FDF7": {
    "Type": "AWS::Route53::RecordSet",
    "Properties": {
     "HostedZoneId": {
@@ -24,7 +24,7 @@
        {
         "Ref": "RecordWeight0"
        },
-       "_ID_recordweigParameter04970FE98"
+       "_ID_recordweightParamWeight059BCC4E1"
       ]
      ]
     },
@@ -35,7 +35,7 @@
     }
    }
   },
-  "RecordWeightedFromCfnParameter11D8E5896": {
+  "RecordWithParamWeight182FF0BDE": {
    "Type": "AWS::Route53::RecordSet",
    "Properties": {
     "HostedZoneId": {
@@ -53,7 +53,7 @@
        {
         "Ref": "RecordWeight1"
        },
-       "_ID_recordweigParameter1EB51A657"
+       "_ID_recordweightParamWeight1304B1475"
       ]
      ]
     },
@@ -64,7 +64,7 @@
     }
    }
   },
-  "RecordWeightedFromCfnParameter2B12A1DFB": {
+  "RecordWithParamWeight2C5120D0E": {
    "Type": "AWS::Route53::RecordSet",
    "Properties": {
     "HostedZoneId": {
@@ -82,7 +82,7 @@
        {
         "Ref": "RecordWeight2"
        },
-       "_ID_recordweigParameter208409FED"
+       "_ID_recordweightParamWeight25B9D18F1"
       ]
      ]
     },
@@ -93,7 +93,7 @@
     }
    }
   },
-  "RecordWeightedFromCfnParameter3D5E67423": {
+  "RecordWithParamWeight37D431545": {
    "Type": "AWS::Route53::RecordSet",
    "Properties": {
     "HostedZoneId": {
@@ -111,7 +111,7 @@
        {
         "Ref": "RecordWeight3"
        },
-       "_ID_recordweigParameter3841525F4"
+       "_ID_recordweightParamWeight37DA83B23"
       ]
      ]
     },

diff --git a/...k-integ/test/aws-route53/test/integ.record-weight-from-cfnparameter.js.snapshot/tree.json b/...k-integ/test/aws-route53/test/integ.record-weight-from-cfnparameter.js.snapshot/tree.json
diff --git a/...dk-testing/framework-integ/test/aws-route53/test/integ.record-weight-from-cfnparameter.ts b/...dk-testing/framework-integ/test/aws-route53/test/integ.record-weight-from-cfnparameter.ts
@@ -24,7 +24,7 @@ class TestStack extends Stack {
       { target: '3.4.5.6', weight: new CfnParameter(this, 'RecordWeight2', weightParameterProps) },
       { target: '4.5.6.7', weight: new CfnParameter(this, 'RecordWeight3', weightParameterProps) },
     ].forEach((data, index) => {
-      new route53.ARecord(this, `RecordWeightedFromCfnParameter${index}`, {
+      new route53.ARecord(this, `RecordWithParamWeight${index}`, {
         zone: hostedZone,
         recordName: 'www',
         weight: data.weight.valueAsNumber,

diff --git a/packages/aws-cdk-lib/aws-route53/lib/record-set.ts b/packages/aws-cdk-lib/aws-route53/lib/record-set.ts
@@ -406,7 +406,10 @@ export class RecordSet extends Resource implements IRecordSet {
     }
 
     if (this.weight !== undefined) {
-      const idPrefix = `WEIGHT_${this.weight}_ID_`;
+      const idPrefix = `WEIGHT_${Token.isUnresolved(this.weight)
+        ? Token.asString(this.weight)
+        : this.weight
+      }_ID_`;
       return this.createIdentifier(idPrefix);
     }