Skip to content

Commit

Permalink
cloudfront/continue_deployment_policy: Fix to allow updates with depl…
Browse files Browse the repository at this point in the history 
…oyments
  • Loading branch information
@YakDriver
YakDriver committed Sep 27, 2023
1 parent 023c8e5 commit be621af
Show file tree
Hide file tree
Showing 2 changed files with 97 additions and 21 deletions.
89 changes: 81 additions & 8 deletions internal/service/cloudfront/continuous_deployment_policy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,16 +271,9 @@ func (r *resourceContinuousDeploymentPolicy) Delete(ctx context.Context, req res
return
}

in := &cloudfront.DeleteContinuousDeploymentPolicyInput{
Id: aws.String(state.ID.ValueString()),
IfMatch: aws.String(state.ETag.ValueString()),
}
err := DeleteCDP(ctx, conn, state.ID.ValueString())

_, err := conn.DeleteContinuousDeploymentPolicyWithContext(ctx, in)
if err != nil {
if tfawserr.ErrCodeEquals(err, cloudfront.ErrCodeNoSuchContinuousDeploymentPolicy) {
return
}
resp.Diagnostics.AddError(
create.ProblemStandardMessage(names.CloudFront, create.ErrActionDeleting, ResNameContinuousDeploymentPolicy, state.ID.String(), err),
err.Error(),
Expand All @@ -289,6 +282,86 @@ func (r *resourceContinuousDeploymentPolicy) Delete(ctx context.Context, req res
}
}

func DeleteCDP(ctx context.Context, conn *cloudfront.CloudFront, id string) error {
etag, err := cdpETag(ctx, conn, id)
if tfresource.NotFound(err) {
return nil
}

if err != nil {
return err
}

in := &cloudfront.DeleteContinuousDeploymentPolicyInput{
Id: aws.String(id),
IfMatch: etag,
}

_, err = conn.DeleteContinuousDeploymentPolicyWithContext(ctx, in)
if tfawserr.ErrCodeEquals(err, cloudfront.ErrCodeNoSuchContinuousDeploymentPolicy) {
return nil
}

if tfawserr.ErrCodeEquals(err, cloudfront.ErrCodePreconditionFailed, cloudfront.ErrCodeInvalidIfMatchVersion) {
etag, err := cdpETag(ctx, conn, id)
if tfresource.NotFound(err) {
return nil
}

if err != nil {
return err
}

in.SetIfMatch(aws.StringValue(etag))

_, err = conn.DeleteContinuousDeploymentPolicyWithContext(ctx, in)
if tfawserr.ErrCodeEquals(err, cloudfront.ErrCodeNoSuchContinuousDeploymentPolicy) {
return nil
}
}

if err != nil {
return err
}

return nil
}

func disableContinuousDeploymentPolicy(ctx context.Context, conn *cloudfront.CloudFront, id string) error {
out, err := FindContinuousDeploymentPolicyByID(ctx, conn, id)
if tfresource.NotFound(err) || out == nil || out.ContinuousDeploymentPolicy == nil || out.ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig == nil {
return nil
}

if !aws.BoolValue(out.ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig.Enabled) {
return nil
}

out.ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig.SetEnabled(false)

in := &cloudfront.UpdateContinuousDeploymentPolicyInput{
Id: out.ContinuousDeploymentPolicy.Id,
IfMatch: out.ETag,
ContinuousDeploymentPolicyConfig: out.ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig,
}

_, err = conn.UpdateContinuousDeploymentPolicyWithContext(ctx, in)
if err != nil {
return err
}

return nil
}

func cdpETag(ctx context.Context, conn *cloudfront.CloudFront, id string) (*string, error) {
output, err := FindContinuousDeploymentPolicyByID(ctx, conn, id)
if err != nil {
return nil, err
}

return output.ETag, nil
}

func (r *resourceContinuousDeploymentPolicy) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {
resource.ImportStatePassthroughID(ctx, path.Root("id"), req, resp)
}
Expand Down
29 changes: 16 additions & 13 deletions internal/service/cloudfront/continuous_deployment_policy_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (

"github.com/aws/aws-sdk-go/service/cloudfront"
"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest"
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
"github.com/hashicorp/terraform-plugin-testing/terraform"
"github.com/hashicorp/terraform-provider-aws/internal/acctest"
Expand Down Expand Up @@ -43,7 +44,7 @@ func TestAccCloudFrontContinuousDeploymentPolicy_basic(t *testing.T) {
CheckDestroy: testAccCheckContinuousDeploymentPolicyDestroy(ctx),
Steps: []resource.TestStep{
{
Config: testAccContinuousDeploymentPolicyConfig_init(),
Config: testAccContinuousDeploymentPolicyConfig_init(defaultDomain),
Check: resource.ComposeTestCheckFunc(
testAccCheckDistributionExists(ctx, stagingDistributionResourceName, &stagingDistribution),
testAccCheckDistributionExists(ctx, productionDistributionResourceName, &productionDistribution),
Expand Down Expand Up @@ -97,7 +98,7 @@ func TestAccCloudFrontContinuousDeploymentPolicy_disappears(t *testing.T) {
CheckDestroy: testAccCheckContinuousDeploymentPolicyDestroy(ctx),
Steps: []resource.TestStep{
{
Config: testAccContinuousDeploymentPolicyConfig_init(),
Config: testAccContinuousDeploymentPolicyConfig_init(defaultDomain),
Check: resource.ComposeTestCheckFunc(
testAccCheckDistributionExists(ctx, stagingDistributionResourceName, &stagingDistribution),
testAccCheckDistributionExists(ctx, productionDistributionResourceName, &productionDistribution),
Expand Down Expand Up @@ -129,7 +130,7 @@ func TestAccCloudFrontContinuousDeploymentPolicy_trafficConfig(t *testing.T) {
CheckDestroy: testAccCheckContinuousDeploymentPolicyDestroy(ctx),
Steps: []resource.TestStep{
{
Config: testAccContinuousDeploymentPolicyConfig_init(),
Config: testAccContinuousDeploymentPolicyConfig_init(defaultDomain),
Check: resource.ComposeTestCheckFunc(
testAccCheckDistributionExists(ctx, stagingDistributionResourceName, &stagingDistribution),
testAccCheckDistributionExists(ctx, productionDistributionResourceName, &productionDistribution),
Expand Down Expand Up @@ -215,6 +216,8 @@ func TestAccCloudFrontContinuousDeploymentPolicy_domainChange(t *testing.T) {
resourceName := "aws_cloudfront_continuous_deployment_policy.test"
stagingDistributionResourceName := "aws_cloudfront_distribution.staging"
productionDistributionResourceName := "aws_cloudfront_distribution.test"
domain1 := fmt.Sprintf("%s.example.com", sdkacctest.RandomWithPrefix(acctest.ResourcePrefix))
domain2 := fmt.Sprintf("%s.example.com", sdkacctest.RandomWithPrefix(acctest.ResourcePrefix))

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() {
Expand All @@ -226,15 +229,15 @@ func TestAccCloudFrontContinuousDeploymentPolicy_domainChange(t *testing.T) {
CheckDestroy: testAccCheckContinuousDeploymentPolicyDestroy(ctx),
Steps: []resource.TestStep{
{
Config: testAccContinuousDeploymentPolicyConfig_init(),
Config: testAccContinuousDeploymentPolicyConfig_init(domain1),
Check: resource.ComposeTestCheckFunc(
testAccCheckDistributionExists(ctx, stagingDistributionResourceName, &stagingDistribution),
testAccCheckDistributionExists(ctx, productionDistributionResourceName, &productionDistribution),
testAccCheckContinuousDeploymentPolicyExists(ctx, resourceName, &policy),
),
},
{
Config: testAccContinuousDeploymentPolicyConfig_TrafficConfig_singleWeight(true, "0.01", 300, 600, defaultDomain),
Config: testAccContinuousDeploymentPolicyConfig_TrafficConfig_singleWeight(true, "0.01", 300, 600, domain1),
Check: resource.ComposeTestCheckFunc(
testAccCheckContinuousDeploymentPolicyExists(ctx, resourceName, &policy),
resource.TestCheckResourceAttr(resourceName, "enabled", "true"),
Expand All @@ -247,15 +250,15 @@ func TestAccCloudFrontContinuousDeploymentPolicy_domainChange(t *testing.T) {
"single_weight_config.0.session_stickiness_config.0.maximum_ttl": "600",
}),
resource.TestCheckTypeSetElemNestedAttrs(stagingDistributionResourceName, "origin.*", map[string]string{
"domain_name": defaultDomain,
"domain_name": domain1,
}),
resource.TestCheckTypeSetElemNestedAttrs(productionDistributionResourceName, "origin.*", map[string]string{
"domain_name": defaultDomain,
"domain_name": domain1,
}),
),
},
{
Config: testAccContinuousDeploymentPolicyConfig_TrafficConfig_singleWeight(true, "0.01", 300, 600, "tf33338.example.com"),
Config: testAccContinuousDeploymentPolicyConfig_TrafficConfig_singleWeight(true, "0.01", 300, 600, domain2),
Check: resource.ComposeTestCheckFunc(
testAccCheckContinuousDeploymentPolicyExists(ctx, resourceName, &policy),
resource.TestCheckResourceAttr(resourceName, "enabled", "true"),
Expand All @@ -268,10 +271,10 @@ func TestAccCloudFrontContinuousDeploymentPolicy_domainChange(t *testing.T) {
"single_weight_config.0.session_stickiness_config.0.maximum_ttl": "600",
}),
resource.TestCheckTypeSetElemNestedAttrs(stagingDistributionResourceName, "origin.*", map[string]string{
"domain_name": "tf33338.example.com",
"domain_name": domain2,
}),
resource.TestCheckTypeSetElemNestedAttrs(productionDistributionResourceName, "origin.*", map[string]string{
"domain_name": "tf33338.example.com",
"domain_name": domain2,
}),
),
},
Expand Down Expand Up @@ -482,10 +485,10 @@ resource "aws_cloudfront_distribution" "test" {
//
// ContinuousDeploymentPolicyInUse: The specified continuous deployment policy is
// currently associated with a distribution.
func testAccContinuousDeploymentPolicyConfig_init() string {
func testAccContinuousDeploymentPolicyConfig_init(domain string) string {
return acctest.ConfigCompose(
testAccContinuousDeploymentPolicyConfigBase_staging(defaultDomain),
testAccContinuousDeploymentPolicyConfigBase_productionInit(defaultDomain),
testAccContinuousDeploymentPolicyConfigBase_staging(domain),
testAccContinuousDeploymentPolicyConfigBase_productionInit(domain),
`
resource "aws_cloudfront_continuous_deployment_policy" "test" {
enabled = false
Expand Down

0 comments on commit be621af

Please sign in to comment.