update integ tests and add count

aws · Sep 20, 2024 · 29e4ffc · 29e4ffc
1 parent 6024e98
commit 29e4ffc
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 15 deletions.
diff --git a/.../framework-integ/test/aws-ec2/test/integ.instance-init.js.snapshot/integ-init.assets.json b/.../framework-integ/test/aws-ec2/test/integ.instance-init.js.snapshot/integ-init.assets.json
diff --git a/...ramework-integ/test/aws-ec2/test/integ.instance-init.js.snapshot/integ-init.template.json b/...ramework-integ/test/aws-ec2/test/integ.instance-init.js.snapshot/integ-init.template.json
@@ -581,6 +581,7 @@
    ],
    "CreationPolicy": {
     "ResourceSignal": {
+     "Count": 1,
      "Timeout": "PT10M"
     }
    },

diff --git a/...k-testing/framework-integ/test/aws-ec2/test/integ.instance-init.js.snapshot/manifest.json b/...k-testing/framework-integ/test/aws-ec2/test/integ.instance-init.js.snapshot/manifest.json
diff --git a/packages/aws-cdk-lib/aws-ec2/lib/instance.ts b/packages/aws-cdk-lib/aws-ec2/lib/instance.ts
@@ -590,10 +590,6 @@ export class Instance extends Resource implements IInstance {
     this.instancePublicDnsName = this.instance.attrPublicDnsName;
     this.instancePublicIp = this.instance.attrPublicIp;
 
-    if (props.initOptions?.timeout && props.resourceSignalTimeout) {
-      Annotations.of(this).addWarningV2('@aws-cdk/aws-ec2:setSetimeout', 'Both initOptions.timeout and resourceSignalTimeout fields are set, timeout is summed together. It is suggested that only one of the two fields is set');
-    }
-
     if (FeatureFlags.of(this).isEnabled(cxapi.EC2_SUM_TIMEOUT_ENABLED)) {
       this.applyUpdatePolicies(props);
 
@@ -715,6 +711,7 @@ export class Instance extends Resource implements IInstance {
       this.instance.cfnOptions.creationPolicy = {
         ...this.instance.cfnOptions.creationPolicy,
         resourceSignal: {
+          ...this.instance.cfnOptions.creationPolicy?.resourceSignal,
           timeout: props.resourceSignalTimeout && props.resourceSignalTimeout.toIsoString(),
         },
       };

diff --git a/packages/aws-cdk-lib/aws-ec2/test/instance.test.ts b/packages/aws-cdk-lib/aws-ec2/test/instance.test.ts
@@ -1089,10 +1089,10 @@ test('resourceSignalTimeout overwrites initOptions.timeout when feature flag tur
   });
 
   // THEN
-  Annotations.fromStack(stack).hasWarning('/Default/Instance', 'Both initOptions.timeout and resourceSignalTimeout fields are set, timeout is summed together. It is suggested that only one of the two fields is set [ack: @aws-cdk/aws-ec2:setSetimeout]');
   Template.fromStack(stack).hasResource('AWS::EC2::Instance', {
     CreationPolicy: {
       ResourceSignal: {
+        Count: 1,
         Timeout: 'PT10M',
       },
     },
@@ -1211,7 +1211,6 @@ test('resourceSignalTimeout and initOptions.timeout are both set, sum timeout an
   });
 
   // THEN
-  Annotations.fromStack(stack).hasWarning('/Default/Instance', 'Both initOptions.timeout and resourceSignalTimeout fields are set, timeout is summed together. It is suggested that only one of the two fields is set [ack: @aws-cdk/aws-ec2:setSetimeout]');
   Template.fromStack(stack).hasResource('AWS::EC2::Instance', {
     CreationPolicy: {
       ResourceSignal: {