From 383ff1ce002dfe2d863ecc59cddd6297b6e19e89 Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Fri, 6 Aug 2021 12:29:26 -0400 Subject: [PATCH 1/2] set bool value with default directly in API method requests during create/update --- ..._aws_imagebuilder_infrastructure_configuration.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/aws/resource_aws_imagebuilder_infrastructure_configuration.go b/aws/resource_aws_imagebuilder_infrastructure_configuration.go index b2d22e530765..9fc2b5b6e8e1 100644 --- a/aws/resource_aws_imagebuilder_infrastructure_configuration.go +++ b/aws/resource_aws_imagebuilder_infrastructure_configuration.go @@ -129,7 +129,8 @@ func resourceAwsImageBuilderInfrastructureConfigurationCreate(d *schema.Resource tags := defaultTagsConfig.MergeTags(keyvaluetags.New(d.Get("tags").(map[string]interface{}))) input := &imagebuilder.CreateInfrastructureConfigurationInput{ - ClientToken: aws.String(resource.UniqueId()), + ClientToken: aws.String(resource.UniqueId()), + TerminateInstanceOnFailure: aws.Bool(d.Get("terminate_instance_on_failure").(bool)), } if v, ok := d.GetOk("description"); ok { @@ -176,10 +177,6 @@ func resourceAwsImageBuilderInfrastructureConfigurationCreate(d *schema.Resource input.Tags = tags.IgnoreAws().ImagebuilderTags() } - if v, ok := d.GetOk("terminate_instance_on_failure"); ok { - input.TerminateInstanceOnFailure = aws.Bool(v.(bool)) - } - var output *imagebuilder.CreateInfrastructureConfigurationOutput err := resource.Retry(iamwaiter.PropagationTimeout, func() *resource.RetryError { var err error @@ -290,6 +287,7 @@ func resourceAwsImageBuilderInfrastructureConfigurationUpdate(d *schema.Resource ) { input := &imagebuilder.UpdateInfrastructureConfigurationInput{ InfrastructureConfigurationArn: aws.String(d.Id()), + TerminateInstanceOnFailure: aws.Bool(d.Get("terminate_instance_on_failure").(bool)), } if v, ok := d.GetOk("description"); ok { @@ -328,10 +326,6 @@ func resourceAwsImageBuilderInfrastructureConfigurationUpdate(d *schema.Resource input.SubnetId = aws.String(v.(string)) } - if v, ok := d.GetOk("terminate_instance_on_failure"); ok { - input.TerminateInstanceOnFailure = aws.Bool(v.(bool)) - } - err := resource.Retry(iamwaiter.PropagationTimeout, func() *resource.RetryError { _, err := conn.UpdateInfrastructureConfiguration(input) From 24b01ed16975e488d988a1ec8e56859fd3b867ef Mon Sep 17 00:00:00 2001 From: Angie Pinilla Date: Fri, 6 Aug 2021 12:38:25 -0400 Subject: [PATCH 2/2] Update CHANGELOG for #20464 --- .changelog/20464.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/20464.txt diff --git a/.changelog/20464.txt b/.changelog/20464.txt new file mode 100644 index 000000000000..4fad6ed9d7b8 --- /dev/null +++ b/.changelog/20464.txt @@ -0,0 +1,3 @@ +```release-note:bug +aws/resource_aws_imagebuilder_infrastructure_configuration: Always set `terminate_instance_on_failure` on create and update +``` \ No newline at end of file