From e807026ff2de0073921ba34ef5db74f0eb696677 Mon Sep 17 00:00:00 2001 From: Kamil Turek Date: Sun, 1 Oct 2023 15:13:26 +0200 Subject: [PATCH 01/10] Add new resource --- .../service/sesv2/account_vdm_attributes.go | 240 ++++++++++++++++++ internal/service/sesv2/service_package_gen.go | 5 + 2 files changed, 245 insertions(+) create mode 100644 internal/service/sesv2/account_vdm_attributes.go diff --git a/internal/service/sesv2/account_vdm_attributes.go b/internal/service/sesv2/account_vdm_attributes.go new file mode 100644 index 000000000000..f7deae3a5fa4 --- /dev/null +++ b/internal/service/sesv2/account_vdm_attributes.go @@ -0,0 +1,240 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package sesv2 + +import ( + "context" + "errors" + "log" + + "github.com/aws/aws-sdk-go-v2/service/sesv2" + "github.com/aws/aws-sdk-go-v2/service/sesv2/types" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/create" + "github.com/hashicorp/terraform-provider-aws/internal/enum" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/names" +) + +// @SDKResource("aws_sesv2_account_vdm_attributes", name="Account VDM Attributes") +func ResourceAccountVDMAttributes() *schema.Resource { + return &schema.Resource{ + CreateWithoutTimeout: resourceAccountVDMAttributesUpdate, + ReadWithoutTimeout: resourceAccountVDMAttributesRead, + UpdateWithoutTimeout: resourceAccountVDMAttributesUpdate, + DeleteWithoutTimeout: resourceAccountVDMAttributesDelete, + + Importer: &schema.ResourceImporter{ + StateContext: schema.ImportStatePassthroughContext, + }, + + Schema: map[string]*schema.Schema{ + "dashboard_attributes": { + Type: schema.TypeList, + Optional: true, + Computed: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "engagement_metrics": { + Type: schema.TypeString, + Optional: true, + ValidateDiagFunc: enum.Validate[types.FeatureStatus](), + }, + }, + }, + }, + "guardian_attributes": { + Type: schema.TypeList, + Optional: true, + Computed: true, + MaxItems: 1, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "optimized_shared_delivery": { + Type: schema.TypeString, + Optional: true, + ValidateDiagFunc: enum.Validate[types.FeatureStatus](), + }, + }, + }, + }, + "vdm_enabled": { + Type: schema.TypeString, + Required: true, + ValidateDiagFunc: enum.Validate[types.FeatureStatus](), + }, + }, + } +} + +const ( + ResNameAccountVDMAttributes = "Account VDM Attributes" +) + +func resourceAccountVDMAttributesUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { + conn := meta.(*conns.AWSClient).SESV2Client(ctx) + + in := &sesv2.PutAccountVdmAttributesInput{ + VdmAttributes: &types.VdmAttributes{ + VdmEnabled: types.FeatureStatus(d.Get("vdm_enabled").(string)), + }, + } + + if v, ok := d.GetOk("dashboard_attributes"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil { + in.VdmAttributes.DashboardAttributes = expandDashboardAttributes(v.([]interface{})[0].(map[string]interface{})) + } + + if v, ok := d.GetOk("guardian_attributes"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil { + in.VdmAttributes.GuardianAttributes = expandGuardianAttributes(v.([]interface{})[0].(map[string]interface{})) + } + + out, err := conn.PutAccountVdmAttributes(ctx, in) + if err != nil { + return create.DiagError(names.SESV2, create.ErrActionCreating, ResNameAccountVDMAttributes, "", err) + } + + if out == nil { + return create.DiagError(names.SESV2, create.ErrActionCreating, ResNameAccountVDMAttributes, "", errors.New("empty output")) + } + + if d.IsNewResource() { + d.SetId("ses-account-vdm-attributes") + } + + return resourceAccountVDMAttributesRead(ctx, d, meta) +} + +func resourceAccountVDMAttributesRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { + conn := meta.(*conns.AWSClient).SESV2Client(ctx) + + out, err := FindAccountVDMAttributes(ctx, conn) + + if !d.IsNewResource() && tfresource.NotFound(err) { + log.Printf("[WARN] SESV2 AccountVDMAttributes (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + + if err != nil { + return create.DiagError(names.SESV2, create.ErrActionReading, ResNameAccountVDMAttributes, d.Id(), err) + } + + if out.DashboardAttributes != nil { + if err := d.Set("dashboard_attributes", []interface{}{flattenDashboardAttributes(out.DashboardAttributes)}); err != nil { + return create.DiagError(names.SESV2, create.ErrActionSetting, ResNameAccountVDMAttributes, d.Id(), err) + } + } + + if out.GuardianAttributes != nil { + if err := d.Set("guardian_attributes", []interface{}{flattenGuardianAttributes(out.GuardianAttributes)}); err != nil { + return create.DiagError(names.SESV2, create.ErrActionSetting, ResNameAccountVDMAttributes, d.Id(), err) + } + } + + d.Set("vdm_enabled", out.VdmEnabled) + + return nil +} + +func resourceAccountVDMAttributesDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { + conn := meta.(*conns.AWSClient).SESV2Client(ctx) + + log.Printf("[INFO] Deleting SESV2 AccountVDMAttributes %s", d.Id()) + + // TIP: -- 3. Call the AWS delete function + _, err := conn.PutAccountVdmAttributes(ctx, &sesv2.PutAccountVdmAttributesInput{ + VdmAttributes: &types.VdmAttributes{ + VdmEnabled: "DISABLED", + }, + }) + + if err != nil { + var nfe *types.NotFoundException + if errors.As(err, &nfe) { + return nil + } + + return create.DiagError(names.SESV2, create.ErrActionDeleting, ResNameAccountVDMAttributes, d.Id(), err) + } + + return nil +} + +func FindAccountVDMAttributes(ctx context.Context, conn *sesv2.Client) (*types.VdmAttributes, error) { + in := &sesv2.GetAccountInput{} + out, err := conn.GetAccount(ctx, in) + if err != nil { + var nfe *types.NotFoundException + if errors.As(err, &nfe) { + return nil, &retry.NotFoundError{ + LastError: err, + LastRequest: in, + } + } + + return nil, err + } + + if out == nil || out.VdmAttributes == nil { + return nil, tfresource.NewEmptyResultError(in) + } + + return out.VdmAttributes, nil +} + +func expandDashboardAttributes(tfMap map[string]interface{}) *types.DashboardAttributes { + if tfMap == nil { + return nil + } + + a := &types.DashboardAttributes{} + + if v, ok := tfMap["engagement_metrics"].(string); ok && v != "" { + a.EngagementMetrics = types.FeatureStatus(v) + } + + return a +} + +func expandGuardianAttributes(tfMap map[string]interface{}) *types.GuardianAttributes { + if tfMap == nil { + return nil + } + + a := &types.GuardianAttributes{} + + if v, ok := tfMap["optimized_shared_delivery"].(string); ok && v != "" { + a.OptimizedSharedDelivery = types.FeatureStatus(v) + } + + return a +} + +func flattenDashboardAttributes(apiObject *types.DashboardAttributes) map[string]interface{} { + if apiObject == nil { + return nil + } + + m := map[string]interface{}{ + "engagement_metrics": string(apiObject.EngagementMetrics), + } + + return m +} + +func flattenGuardianAttributes(apiObject *types.GuardianAttributes) map[string]interface{} { + if apiObject == nil { + return nil + } + + m := map[string]interface{}{ + "optimized_shared_delivery": string(apiObject.OptimizedSharedDelivery), + } + + return m +} diff --git a/internal/service/sesv2/service_package_gen.go b/internal/service/sesv2/service_package_gen.go index 69a64d5ed1b5..8bd83b3cbf8b 100644 --- a/internal/service/sesv2/service_package_gen.go +++ b/internal/service/sesv2/service_package_gen.go @@ -48,6 +48,11 @@ func (p *servicePackage) SDKDataSources(ctx context.Context) []*types.ServicePac func (p *servicePackage) SDKResources(ctx context.Context) []*types.ServicePackageSDKResource { return []*types.ServicePackageSDKResource{ + { + Factory: ResourceAccountVDMAttributes, + TypeName: "aws_sesv2_account_vdm_attributes", + Name: "Account VDM Attributes", + }, { Factory: ResourceConfigurationSet, TypeName: "aws_sesv2_configuration_set", From fb1727bfb6fcdfba92c4fd9de45acfb2c8f96522 Mon Sep 17 00:00:00 2001 From: Kamil Turek Date: Sun, 1 Oct 2023 15:40:57 +0200 Subject: [PATCH 02/10] Add tests --- .../sesv2/account_vdm_attributes_test.go | 203 ++++++++++++++++++ 1 file changed, 203 insertions(+) create mode 100644 internal/service/sesv2/account_vdm_attributes_test.go diff --git a/internal/service/sesv2/account_vdm_attributes_test.go b/internal/service/sesv2/account_vdm_attributes_test.go new file mode 100644 index 000000000000..158da5fb1617 --- /dev/null +++ b/internal/service/sesv2/account_vdm_attributes_test.go @@ -0,0 +1,203 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package sesv2_test + +import ( + "context" + "errors" + "fmt" + "testing" + + "github.com/aws/aws-sdk-go-v2/service/sesv2/types" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/create" + "github.com/hashicorp/terraform-provider-aws/names" + + tfsesv2 "github.com/hashicorp/terraform-provider-aws/internal/service/sesv2" +) + +func TestAccSESV2AccountVdmAttributes_serial(t *testing.T) { + t.Parallel() + + testCases := map[string]func(t *testing.T){ + "basic": testAccSESV2AccountVdmAttributes_basic, + "disappears": testAccSESV2AccountVdmAttributes_disappears, + "engagementMetrics": testAccSESV2AccountVdmAttributes_engagementMetrics, + "optimizedSharedDelivery": testAccSESV2AccountVdmAttributes_optimizedSharedDelivery, + } + + acctest.RunSerialTests1Level(t, testCases, 0) +} + +func testAccSESV2AccountVdmAttributes_basic(t *testing.T) { + ctx := acctest.Context(t) + resourceName := "aws_sesv2_account_vdm_attributes.test" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SESV2EndpointID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckAccountVdmAttributesDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccAccountVdmAttributesConfig_basic(), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourceName, "vdm_enabled", string(types.FeatureStatusEnabled)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccSESV2AccountVdmAttributes_disappears(t *testing.T) { + ctx := acctest.Context(t) + resourceName := "aws_sesv2_account_vdm_attributes.test" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SESV2EndpointID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckAccountVdmAttributesDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccAccountVdmAttributesConfig_basic(), + Check: resource.ComposeTestCheckFunc( + acctest.CheckResourceDisappears(ctx, acctest.Provider, tfsesv2.ResourceAccountVDMAttributes(), resourceName), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func testAccSESV2AccountVdmAttributes_engagementMetrics(t *testing.T) { + ctx := acctest.Context(t) + resourceName := "aws_sesv2_account_vdm_attributes.test" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SESV2EndpointID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckAccountVdmAttributesDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccAccountVdmAttributesConfig_engagementMetrics(string(types.FeatureStatusEnabled)), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourceName, "dashboard_attributes.#", "1"), + resource.TestCheckResourceAttr(resourceName, "dashboard_attributes.0.engagement_metrics", string(types.FeatureStatusEnabled)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAccountVdmAttributesConfig_engagementMetrics(string(types.FeatureStatusDisabled)), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourceName, "dashboard_attributes.#", "1"), + resource.TestCheckResourceAttr(resourceName, "dashboard_attributes.0.engagement_metrics", string(types.FeatureStatusDisabled)), + ), + }, + }, + }) +} + +func testAccSESV2AccountVdmAttributes_optimizedSharedDelivery(t *testing.T) { + ctx := acctest.Context(t) + resourceName := "aws_sesv2_account_vdm_attributes.test" + + resource.Test(t, resource.TestCase{ + PreCheck: func() { acctest.PreCheck(ctx, t) }, + ErrorCheck: acctest.ErrorCheck(t, names.SESV2EndpointID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckAccountVdmAttributesDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccAccountVdmAttributesConfig_optimizedSharedDelivery(string(types.FeatureStatusEnabled)), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourceName, "guardian_attributes.#", "1"), + resource.TestCheckResourceAttr(resourceName, "guardian_attributes.0.optimized_shared_delivery", string(types.FeatureStatusEnabled)), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccAccountVdmAttributesConfig_optimizedSharedDelivery(string(types.FeatureStatusDisabled)), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr(resourceName, "guardian_attributes.#", "1"), + resource.TestCheckResourceAttr(resourceName, "guardian_attributes.0.optimized_shared_delivery", string(types.FeatureStatusDisabled)), + ), + }, + }, + }) +} + +func testAccCheckAccountVdmAttributesDestroy(ctx context.Context) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acctest.Provider.Meta().(*conns.AWSClient).SESV2Client(ctx) + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_sesv2_account_vdm_attributes" { + continue + } + + out, err := tfsesv2.FindAccountVDMAttributes(ctx, conn) + if err != nil { + return err + } + + if out.VdmEnabled == types.FeatureStatusDisabled { + return nil + } + + return create.Error(names.SESV2, create.ErrActionCheckingDestroyed, tfsesv2.ResNameAccountVDMAttributes, rs.Primary.ID, errors.New("not destroyed")) + } + + return nil + } +} + +func testAccAccountVdmAttributesConfig_basic() string { + return ` +resource "aws_sesv2_account_vdm_attributes" "test" { + vdm_enabled = "ENABLED" +} +` +} + +func testAccAccountVdmAttributesConfig_engagementMetrics(engagementMetrics string) string { + return fmt.Sprintf(` +resource "aws_sesv2_account_vdm_attributes" "test" { + vdm_enabled = "ENABLED" + + dashboard_attributes { + engagement_metrics = %[1]q + } +} +`, engagementMetrics) +} + +func testAccAccountVdmAttributesConfig_optimizedSharedDelivery(optimizedSharedDelivery string) string { + return fmt.Sprintf(` +resource "aws_sesv2_account_vdm_attributes" "test" { + vdm_enabled = "ENABLED" + + guardian_attributes { + optimized_shared_delivery = %[1]q + } +} +`, optimizedSharedDelivery) +} From 62c30b4aefb9aa5b5070438710e0e66cdee3afd1 Mon Sep 17 00:00:00 2001 From: Kamil Turek Date: Sun, 1 Oct 2023 17:56:47 +0200 Subject: [PATCH 03/10] Add docs --- ...sesv2_account_vdm_attributes.html.markdown | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 website/docs/r/sesv2_account_vdm_attributes.html.markdown diff --git a/website/docs/r/sesv2_account_vdm_attributes.html.markdown b/website/docs/r/sesv2_account_vdm_attributes.html.markdown new file mode 100644 index 000000000000..ded3276bdeef --- /dev/null +++ b/website/docs/r/sesv2_account_vdm_attributes.html.markdown @@ -0,0 +1,69 @@ +--- +subcategory: "SESv2 (Simple Email V2)" +layout: "aws" +page_title: "AWS: aws_sesv2_account_vdm_attributes" +description: |- + Terraform resource for managing an AWS SESv2 (Simple Email V2) Account VDM Attributes. +--- + +# Resource: aws_sesv2_account_vdm_attributes + +Terraform resource for managing an AWS SESv2 (Simple Email V2) Account VDM Attributes. + +## Example Usage + +### Basic Usage + +```terraform +resource "aws_sesv2_account_vdm_attributes" "example" { + vdm_enabled = "ENABLED" + + dashboard_attributes { + engagement_metrics = "ENABLED" + } + + guardian_attributes { + optimized_shared_delivery = "ENABLED" + } +} +``` + +## Argument Reference + +The following arguments are required: + +* `vdm_enabled` - (Required) Specifies the status of your VDM configuration. Valid values: `ENABLED`, `DISABLED`. + +The following arguments are optional: + +* `dashboard_attributes` - (Optional) Specifies additional settings for your VDM configuration as applicable to the Dashboard. +* `guardian_attributes` - (Optional) Specifies additional settings for your VDM configuration as applicable to the Guardian. + +### dashboard_attributes + +* `engagement_metrics` - (Optional) Specifies the status of your VDM engagement metrics collection. Valid values: `ENABLED`, `DISABLED`. + +### guardian_options + +* `optimized_shared_delivery` - (Optional) Specifies the status of your VDM optimized shared delivery. Valid values: `ENABLED`, `DISABLED`. + +## Attribute Reference + +This data source exports no additional attributes. + +## Import + +In Terraform v1.5.0 and later, use an [`import` block](https://developer.hashicorp.com/terraform/language/import) to import SESv2 (Simple Email V2) Account VDM Attributes using the word `ses-account-vdm-attributes`. For example: + +```terraform +import { + to = aws_sesv2_account_vdm_attributes.example + id = "ses-account-vdm-attributes" +} +``` + +Using `terraform import`, import SESv2 (Simple Email V2) Account VDM Attributes using the word `ses-account-vdm-attributes`. For example: + +```console +% terraform import aws_sesv2_account_vdm_attributes.example ses-account-vdm-attributes +``` From 7e091b8029f0635e00e5d52de1c94c34dcf29126 Mon Sep 17 00:00:00 2001 From: Kamil Turek Date: Sun, 1 Oct 2023 18:03:34 +0200 Subject: [PATCH 04/10] Remove comment --- internal/service/sesv2/account_vdm_attributes.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/service/sesv2/account_vdm_attributes.go b/internal/service/sesv2/account_vdm_attributes.go index f7deae3a5fa4..f994cbf8fd20 100644 --- a/internal/service/sesv2/account_vdm_attributes.go +++ b/internal/service/sesv2/account_vdm_attributes.go @@ -146,7 +146,6 @@ func resourceAccountVDMAttributesDelete(ctx context.Context, d *schema.ResourceD log.Printf("[INFO] Deleting SESV2 AccountVDMAttributes %s", d.Id()) - // TIP: -- 3. Call the AWS delete function _, err := conn.PutAccountVdmAttributes(ctx, &sesv2.PutAccountVdmAttributesInput{ VdmAttributes: &types.VdmAttributes{ VdmEnabled: "DISABLED", From 997fe6382c5697936b7eb3d573967e73bfd0f524 Mon Sep 17 00:00:00 2001 From: Kamil Turek Date: Sun, 1 Oct 2023 18:03:44 +0200 Subject: [PATCH 05/10] Fix argument name --- website/docs/r/sesv2_account_vdm_attributes.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/sesv2_account_vdm_attributes.html.markdown b/website/docs/r/sesv2_account_vdm_attributes.html.markdown index ded3276bdeef..0c56181596e1 100644 --- a/website/docs/r/sesv2_account_vdm_attributes.html.markdown +++ b/website/docs/r/sesv2_account_vdm_attributes.html.markdown @@ -43,7 +43,7 @@ The following arguments are optional: * `engagement_metrics` - (Optional) Specifies the status of your VDM engagement metrics collection. Valid values: `ENABLED`, `DISABLED`. -### guardian_options +### guardian_attributes * `optimized_shared_delivery` - (Optional) Specifies the status of your VDM optimized shared delivery. Valid values: `ENABLED`, `DISABLED`. From 9857b62a8f08641e4fccdfa39343962ad7fb8087 Mon Sep 17 00:00:00 2001 From: Kamil Turek Date: Sun, 1 Oct 2023 18:09:27 +0200 Subject: [PATCH 06/10] Fix semgrep issues --- .../service/sesv2/account_vdm_attributes_test.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/service/sesv2/account_vdm_attributes_test.go b/internal/service/sesv2/account_vdm_attributes_test.go index 158da5fb1617..30a316b536b7 100644 --- a/internal/service/sesv2/account_vdm_attributes_test.go +++ b/internal/service/sesv2/account_vdm_attributes_test.go @@ -24,16 +24,16 @@ func TestAccSESV2AccountVdmAttributes_serial(t *testing.T) { t.Parallel() testCases := map[string]func(t *testing.T){ - "basic": testAccSESV2AccountVdmAttributes_basic, - "disappears": testAccSESV2AccountVdmAttributes_disappears, - "engagementMetrics": testAccSESV2AccountVdmAttributes_engagementMetrics, - "optimizedSharedDelivery": testAccSESV2AccountVdmAttributes_optimizedSharedDelivery, + "basic": testAccAccountVdmAttributes_basic, + "disappears": testAccAccountVdmAttributes_disappears, + "engagementMetrics": testAccAccountVdmAttributes_engagementMetrics, + "optimizedSharedDelivery": testAccAccountVdmAttributes_optimizedSharedDelivery, } acctest.RunSerialTests1Level(t, testCases, 0) } -func testAccSESV2AccountVdmAttributes_basic(t *testing.T) { +func testAccAccountVdmAttributes_basic(t *testing.T) { ctx := acctest.Context(t) resourceName := "aws_sesv2_account_vdm_attributes.test" @@ -58,7 +58,7 @@ func testAccSESV2AccountVdmAttributes_basic(t *testing.T) { }) } -func testAccSESV2AccountVdmAttributes_disappears(t *testing.T) { +func testAccAccountVdmAttributes_disappears(t *testing.T) { ctx := acctest.Context(t) resourceName := "aws_sesv2_account_vdm_attributes.test" @@ -79,7 +79,7 @@ func testAccSESV2AccountVdmAttributes_disappears(t *testing.T) { }) } -func testAccSESV2AccountVdmAttributes_engagementMetrics(t *testing.T) { +func testAccAccountVdmAttributes_engagementMetrics(t *testing.T) { ctx := acctest.Context(t) resourceName := "aws_sesv2_account_vdm_attributes.test" @@ -112,7 +112,7 @@ func testAccSESV2AccountVdmAttributes_engagementMetrics(t *testing.T) { }) } -func testAccSESV2AccountVdmAttributes_optimizedSharedDelivery(t *testing.T) { +func testAccAccountVdmAttributes_optimizedSharedDelivery(t *testing.T) { ctx := acctest.Context(t) resourceName := "aws_sesv2_account_vdm_attributes.test" From dc045cdd22ee0e790a8f08a41315f75a3eb6ca63 Mon Sep 17 00:00:00 2001 From: Kamil Turek Date: Sun, 1 Oct 2023 18:10:43 +0200 Subject: [PATCH 07/10] Capitalize VDM --- .../sesv2/account_vdm_attributes_test.go | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/internal/service/sesv2/account_vdm_attributes_test.go b/internal/service/sesv2/account_vdm_attributes_test.go index 30a316b536b7..5c457cf855cf 100644 --- a/internal/service/sesv2/account_vdm_attributes_test.go +++ b/internal/service/sesv2/account_vdm_attributes_test.go @@ -20,20 +20,20 @@ import ( tfsesv2 "github.com/hashicorp/terraform-provider-aws/internal/service/sesv2" ) -func TestAccSESV2AccountVdmAttributes_serial(t *testing.T) { +func TestAccSESV2AccountVDMAttributes_serial(t *testing.T) { t.Parallel() testCases := map[string]func(t *testing.T){ - "basic": testAccAccountVdmAttributes_basic, - "disappears": testAccAccountVdmAttributes_disappears, - "engagementMetrics": testAccAccountVdmAttributes_engagementMetrics, - "optimizedSharedDelivery": testAccAccountVdmAttributes_optimizedSharedDelivery, + "basic": testAccAccountVDMAttributes_basic, + "disappears": testAccAccountVDMAttributes_disappears, + "engagementMetrics": testAccAccountVDMAttributes_engagementMetrics, + "optimizedSharedDelivery": testAccAccountVDMAttributes_optimizedSharedDelivery, } acctest.RunSerialTests1Level(t, testCases, 0) } -func testAccAccountVdmAttributes_basic(t *testing.T) { +func testAccAccountVDMAttributes_basic(t *testing.T) { ctx := acctest.Context(t) resourceName := "aws_sesv2_account_vdm_attributes.test" @@ -41,10 +41,10 @@ func testAccAccountVdmAttributes_basic(t *testing.T) { PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.SESV2EndpointID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckAccountVdmAttributesDestroy(ctx), + CheckDestroy: testAccCheckAccountVDMAttributesDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccAccountVdmAttributesConfig_basic(), + Config: testAccAccountVDMAttributesConfig_basic(), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(resourceName, "vdm_enabled", string(types.FeatureStatusEnabled)), ), @@ -58,7 +58,7 @@ func testAccAccountVdmAttributes_basic(t *testing.T) { }) } -func testAccAccountVdmAttributes_disappears(t *testing.T) { +func testAccAccountVDMAttributes_disappears(t *testing.T) { ctx := acctest.Context(t) resourceName := "aws_sesv2_account_vdm_attributes.test" @@ -66,10 +66,10 @@ func testAccAccountVdmAttributes_disappears(t *testing.T) { PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.SESV2EndpointID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckAccountVdmAttributesDestroy(ctx), + CheckDestroy: testAccCheckAccountVDMAttributesDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccAccountVdmAttributesConfig_basic(), + Config: testAccAccountVDMAttributesConfig_basic(), Check: resource.ComposeTestCheckFunc( acctest.CheckResourceDisappears(ctx, acctest.Provider, tfsesv2.ResourceAccountVDMAttributes(), resourceName), ), @@ -79,7 +79,7 @@ func testAccAccountVdmAttributes_disappears(t *testing.T) { }) } -func testAccAccountVdmAttributes_engagementMetrics(t *testing.T) { +func testAccAccountVDMAttributes_engagementMetrics(t *testing.T) { ctx := acctest.Context(t) resourceName := "aws_sesv2_account_vdm_attributes.test" @@ -87,10 +87,10 @@ func testAccAccountVdmAttributes_engagementMetrics(t *testing.T) { PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.SESV2EndpointID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckAccountVdmAttributesDestroy(ctx), + CheckDestroy: testAccCheckAccountVDMAttributesDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccAccountVdmAttributesConfig_engagementMetrics(string(types.FeatureStatusEnabled)), + Config: testAccAccountVDMAttributesConfig_engagementMetrics(string(types.FeatureStatusEnabled)), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(resourceName, "dashboard_attributes.#", "1"), resource.TestCheckResourceAttr(resourceName, "dashboard_attributes.0.engagement_metrics", string(types.FeatureStatusEnabled)), @@ -102,7 +102,7 @@ func testAccAccountVdmAttributes_engagementMetrics(t *testing.T) { ImportStateVerify: true, }, { - Config: testAccAccountVdmAttributesConfig_engagementMetrics(string(types.FeatureStatusDisabled)), + Config: testAccAccountVDMAttributesConfig_engagementMetrics(string(types.FeatureStatusDisabled)), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(resourceName, "dashboard_attributes.#", "1"), resource.TestCheckResourceAttr(resourceName, "dashboard_attributes.0.engagement_metrics", string(types.FeatureStatusDisabled)), @@ -112,7 +112,7 @@ func testAccAccountVdmAttributes_engagementMetrics(t *testing.T) { }) } -func testAccAccountVdmAttributes_optimizedSharedDelivery(t *testing.T) { +func testAccAccountVDMAttributes_optimizedSharedDelivery(t *testing.T) { ctx := acctest.Context(t) resourceName := "aws_sesv2_account_vdm_attributes.test" @@ -120,10 +120,10 @@ func testAccAccountVdmAttributes_optimizedSharedDelivery(t *testing.T) { PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.SESV2EndpointID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, - CheckDestroy: testAccCheckAccountVdmAttributesDestroy(ctx), + CheckDestroy: testAccCheckAccountVDMAttributesDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccAccountVdmAttributesConfig_optimizedSharedDelivery(string(types.FeatureStatusEnabled)), + Config: testAccAccountVDMAttributesConfig_optimizedSharedDelivery(string(types.FeatureStatusEnabled)), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(resourceName, "guardian_attributes.#", "1"), resource.TestCheckResourceAttr(resourceName, "guardian_attributes.0.optimized_shared_delivery", string(types.FeatureStatusEnabled)), @@ -135,7 +135,7 @@ func testAccAccountVdmAttributes_optimizedSharedDelivery(t *testing.T) { ImportStateVerify: true, }, { - Config: testAccAccountVdmAttributesConfig_optimizedSharedDelivery(string(types.FeatureStatusDisabled)), + Config: testAccAccountVDMAttributesConfig_optimizedSharedDelivery(string(types.FeatureStatusDisabled)), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(resourceName, "guardian_attributes.#", "1"), resource.TestCheckResourceAttr(resourceName, "guardian_attributes.0.optimized_shared_delivery", string(types.FeatureStatusDisabled)), @@ -145,7 +145,7 @@ func testAccAccountVdmAttributes_optimizedSharedDelivery(t *testing.T) { }) } -func testAccCheckAccountVdmAttributesDestroy(ctx context.Context) resource.TestCheckFunc { +func testAccCheckAccountVDMAttributesDestroy(ctx context.Context) resource.TestCheckFunc { return func(s *terraform.State) error { conn := acctest.Provider.Meta().(*conns.AWSClient).SESV2Client(ctx) @@ -170,7 +170,7 @@ func testAccCheckAccountVdmAttributesDestroy(ctx context.Context) resource.TestC } } -func testAccAccountVdmAttributesConfig_basic() string { +func testAccAccountVDMAttributesConfig_basic() string { return ` resource "aws_sesv2_account_vdm_attributes" "test" { vdm_enabled = "ENABLED" @@ -178,7 +178,7 @@ resource "aws_sesv2_account_vdm_attributes" "test" { ` } -func testAccAccountVdmAttributesConfig_engagementMetrics(engagementMetrics string) string { +func testAccAccountVDMAttributesConfig_engagementMetrics(engagementMetrics string) string { return fmt.Sprintf(` resource "aws_sesv2_account_vdm_attributes" "test" { vdm_enabled = "ENABLED" @@ -190,7 +190,7 @@ resource "aws_sesv2_account_vdm_attributes" "test" { `, engagementMetrics) } -func testAccAccountVdmAttributesConfig_optimizedSharedDelivery(optimizedSharedDelivery string) string { +func testAccAccountVDMAttributesConfig_optimizedSharedDelivery(optimizedSharedDelivery string) string { return fmt.Sprintf(` resource "aws_sesv2_account_vdm_attributes" "test" { vdm_enabled = "ENABLED" From 303964d5d6e355a75dde71537e807f88176816bf Mon Sep 17 00:00:00 2001 From: Kamil Turek Date: Sun, 1 Oct 2023 18:13:53 +0200 Subject: [PATCH 08/10] Fix terrafmt issues --- .../sesv2/account_vdm_attributes_test.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/service/sesv2/account_vdm_attributes_test.go b/internal/service/sesv2/account_vdm_attributes_test.go index 5c457cf855cf..077f5524f9a9 100644 --- a/internal/service/sesv2/account_vdm_attributes_test.go +++ b/internal/service/sesv2/account_vdm_attributes_test.go @@ -173,7 +173,7 @@ func testAccCheckAccountVDMAttributesDestroy(ctx context.Context) resource.TestC func testAccAccountVDMAttributesConfig_basic() string { return ` resource "aws_sesv2_account_vdm_attributes" "test" { - vdm_enabled = "ENABLED" + vdm_enabled = "ENABLED" } ` } @@ -181,11 +181,11 @@ resource "aws_sesv2_account_vdm_attributes" "test" { func testAccAccountVDMAttributesConfig_engagementMetrics(engagementMetrics string) string { return fmt.Sprintf(` resource "aws_sesv2_account_vdm_attributes" "test" { - vdm_enabled = "ENABLED" + vdm_enabled = "ENABLED" - dashboard_attributes { - engagement_metrics = %[1]q - } + dashboard_attributes { + engagement_metrics = %[1]q + } } `, engagementMetrics) } @@ -193,11 +193,11 @@ resource "aws_sesv2_account_vdm_attributes" "test" { func testAccAccountVDMAttributesConfig_optimizedSharedDelivery(optimizedSharedDelivery string) string { return fmt.Sprintf(` resource "aws_sesv2_account_vdm_attributes" "test" { - vdm_enabled = "ENABLED" + vdm_enabled = "ENABLED" - guardian_attributes { - optimized_shared_delivery = %[1]q - } + guardian_attributes { + optimized_shared_delivery = %[1]q + } } `, optimizedSharedDelivery) } From 1566ee7d355834f62e7a6c9a2142d5974a0be0bf Mon Sep 17 00:00:00 2001 From: Kamil Turek Date: Sun, 1 Oct 2023 18:17:09 +0200 Subject: [PATCH 09/10] Organize imports --- internal/service/sesv2/account_vdm_attributes_test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/service/sesv2/account_vdm_attributes_test.go b/internal/service/sesv2/account_vdm_attributes_test.go index 077f5524f9a9..ca4d2e1c1fb8 100644 --- a/internal/service/sesv2/account_vdm_attributes_test.go +++ b/internal/service/sesv2/account_vdm_attributes_test.go @@ -15,9 +15,8 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" "github.com/hashicorp/terraform-provider-aws/internal/create" - "github.com/hashicorp/terraform-provider-aws/names" - tfsesv2 "github.com/hashicorp/terraform-provider-aws/internal/service/sesv2" + "github.com/hashicorp/terraform-provider-aws/names" ) func TestAccSESV2AccountVDMAttributes_serial(t *testing.T) { From b464c559d2e544a930c89cdc5d066a0bd50b2eaf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Tue, 3 Oct 2023 10:22:10 -0700 Subject: [PATCH 10/10] Add CHANGELOG entry. --- .changelog/33705.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/33705.txt diff --git a/.changelog/33705.txt b/.changelog/33705.txt new file mode 100644 index 000000000000..e609ecc53e65 --- /dev/null +++ b/.changelog/33705.txt @@ -0,0 +1,3 @@ +```release-note:new-resource +aws_sesv2_account_vdm_attributes +``` \ No newline at end of file