diff --git a/.changelog/45185.txt b/.changelog/45185.txt new file mode 100644 index 000000000000..5fdf7c0bbadb --- /dev/null +++ b/.changelog/45185.txt @@ -0,0 +1,3 @@ +```release-note:new-resource +aws_notifications_managed_notification_account_contact_association +``` \ No newline at end of file diff --git a/internal/service/notifications/exports_test.go b/internal/service/notifications/exports_test.go index 66c8caa28bb2..d269e0b5d9ed 100644 --- a/internal/service/notifications/exports_test.go +++ b/internal/service/notifications/exports_test.go @@ -5,13 +5,15 @@ package notifications // Exports for use in tests only. var ( - ResourceChannelAssociation = newChannelAssociationResource - ResourceEventRule = newEventRuleResource - ResourceNotificationConfiguration = newNotificationConfigurationResource - ResourceNotificationHub = newNotificationHubResource + ResourceChannelAssociation = newChannelAssociationResource + ResourceEventRule = newEventRuleResource + ResourceManagedNotificationAccountContactAssociation = newManagedNotificationAccountContactAssociationResource + ResourceNotificationConfiguration = newNotificationConfigurationResource + ResourceNotificationHub = newNotificationHubResource - FindChannelAssociationByTwoPartKey = findChannelAssociationByTwoPartKey - FindEventRuleByARN = findEventRuleByARN - FindNotificationConfigurationByARN = findNotificationConfigurationByARN - FindNotificationHubByRegion = findNotificationHubByRegion + FindChannelAssociationByTwoPartKey = findChannelAssociationByTwoPartKey + FindEventRuleByARN = findEventRuleByARN + FindManagedNotificationAccountContactAssociationByTwoPartKey = findManagedNotificationAccountContactAssociationByTwoPartKey + FindNotificationConfigurationByARN = findNotificationConfigurationByARN + FindNotificationHubByRegion = findNotificationHubByRegion ) diff --git a/internal/service/notifications/managed_notification_account_contact_association.go b/internal/service/notifications/managed_notification_account_contact_association.go new file mode 100644 index 000000000000..89a6dd17a505 --- /dev/null +++ b/internal/service/notifications/managed_notification_account_contact_association.go @@ -0,0 +1,195 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package notifications + +import ( + "context" + "fmt" + "slices" + + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/notifications" + awstypes "github.com/aws/aws-sdk-go-v2/service/notifications/types" + "github.com/hashicorp/terraform-plugin-framework/path" + "github.com/hashicorp/terraform-plugin-framework/resource" + "github.com/hashicorp/terraform-plugin-framework/resource/schema" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier" + "github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" + "github.com/hashicorp/terraform-provider-aws/internal/errs" + "github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag" + intflex "github.com/hashicorp/terraform-provider-aws/internal/flex" + "github.com/hashicorp/terraform-provider-aws/internal/framework" + fwflex "github.com/hashicorp/terraform-provider-aws/internal/framework/flex" + fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" +) + +// @FrameworkResource("aws_notifications_managed_notification_account_contact_association", name="Managed Notification Account Contact Association") +func newManagedNotificationAccountContactAssociationResource(_ context.Context) (resource.ResourceWithConfigure, error) { + r := &managedNotificationAccountContactAssociationResource{} + + return r, nil +} + +type managedNotificationAccountContactAssociationResource struct { + framework.ResourceWithModel[managedNotificationAccountContactAssociationResourceModel] + framework.WithNoUpdate +} + +func (r *managedNotificationAccountContactAssociationResource) Schema(ctx context.Context, request resource.SchemaRequest, response *resource.SchemaResponse) { + response.Schema = schema.Schema{ + Attributes: map[string]schema.Attribute{ + "contact_identifier": schema.StringAttribute{ + CustomType: fwtypes.StringEnumType[awstypes.AccountContactType](), + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + }, + "managed_notification_configuration_arn": schema.StringAttribute{ + CustomType: fwtypes.ARNType, + Required: true, + PlanModifiers: []planmodifier.String{ + stringplanmodifier.RequiresReplace(), + }, + }, + }, + } +} + +func (r *managedNotificationAccountContactAssociationResource) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) { + var data managedNotificationAccountContactAssociationResourceModel + response.Diagnostics.Append(request.Plan.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().NotificationsClient(ctx) + + var input notifications.AssociateManagedNotificationAccountContactInput + response.Diagnostics.Append(fwflex.Expand(ctx, data, &input)...) + if response.Diagnostics.HasError() { + return + } + + _, err := conn.AssociateManagedNotificationAccountContact(ctx, &input) + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("creating User Notifications Managed Notification Account Contact Association (%s,%s)", data.ManagedNotificationConfigurationARN.ValueString(), data.ContactIdentifier.ValueString()), err.Error()) + + return + } + + response.Diagnostics.Append(response.State.Set(ctx, data)...) +} + +func (r *managedNotificationAccountContactAssociationResource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) { + var data managedNotificationAccountContactAssociationResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().NotificationsClient(ctx) + + managedNotificationConfigurationARN, contactIdentifier := fwflex.StringValueFromFramework(ctx, data.ManagedNotificationConfigurationARN), fwflex.StringValueFromFramework(ctx, data.ContactIdentifier) + err := findManagedNotificationAccountContactAssociationByTwoPartKey(ctx, conn, managedNotificationConfigurationARN, contactIdentifier) + + if tfresource.NotFound(err) { + response.Diagnostics.Append(fwdiag.NewResourceNotFoundWarningDiagnostic(err)) + response.State.RemoveResource(ctx) + + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("reading User Notifications Managed Notification Account Contact Association (%s,%s)", managedNotificationConfigurationARN, contactIdentifier), err.Error()) + + return + } + + response.Diagnostics.Append(response.State.Set(ctx, &data)...) +} + +func (r *managedNotificationAccountContactAssociationResource) Delete(ctx context.Context, request resource.DeleteRequest, response *resource.DeleteResponse) { + var data managedNotificationAccountContactAssociationResourceModel + response.Diagnostics.Append(request.State.Get(ctx, &data)...) + if response.Diagnostics.HasError() { + return + } + + conn := r.Meta().NotificationsClient(ctx) + + var input notifications.DisassociateManagedNotificationAccountContactInput + response.Diagnostics.Append(fwflex.Expand(ctx, data, &input)...) + if response.Diagnostics.HasError() { + return + } + + _, err := conn.DisassociateManagedNotificationAccountContact(ctx, &input) + + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return + } + + if err != nil { + response.Diagnostics.AddError(fmt.Sprintf("deleting User Notifications Managed Notification Account Contact Association (%s,%s)", data.ManagedNotificationConfigurationARN.ValueString(), data.ContactIdentifier.ValueString()), err.Error()) + + return + } +} + +func (r *managedNotificationAccountContactAssociationResource) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) { + const ( + managedNotificationAccountContactAssociationIDParts = 2 + ) + parts, err := intflex.ExpandResourceId(request.ID, managedNotificationAccountContactAssociationIDParts, false) + + if err != nil { + response.Diagnostics.Append(fwdiag.NewParsingResourceIDErrorDiagnostic(err)) + + return + } + + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root("contact_identifier"), parts[1])...) + response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root("managed_notification_configuration_arn"), parts[0])...) +} + +func findManagedNotificationAccountContactAssociationByTwoPartKey(ctx context.Context, conn *notifications.Client, managedNotificationConfigurationArn, contactIdentifier string) error { + input := notifications.ListManagedNotificationChannelAssociationsInput{ + ManagedNotificationConfigurationArn: aws.String(managedNotificationConfigurationArn), + } + + pages := notifications.NewListManagedNotificationChannelAssociationsPaginator(conn, &input) + for pages.HasMorePages() { + page, err := pages.NextPage(ctx) + + if errs.IsA[*awstypes.ResourceNotFoundException](err) { + return &retry.NotFoundError{ + LastError: err, + LastRequest: &input, + } + } + + if err != nil { + return err + } + + if slices.ContainsFunc(page.ChannelAssociations, func(ca awstypes.ManagedNotificationChannelAssociationSummary) bool { + return aws.ToString(ca.ChannelIdentifier) == contactIdentifier && string(ca.ChannelType) == "ACCOUNT_CONTACT" + }) { + return nil + } + } + + return &retry.NotFoundError{ + LastRequest: &input, + } +} + +type managedNotificationAccountContactAssociationResourceModel struct { + ContactIdentifier fwtypes.StringEnum[awstypes.AccountContactType] `tfsdk:"contact_identifier"` + ManagedNotificationConfigurationARN fwtypes.ARN `tfsdk:"managed_notification_configuration_arn"` +} diff --git a/internal/service/notifications/managed_notification_account_contact_association_test.go b/internal/service/notifications/managed_notification_account_contact_association_test.go new file mode 100644 index 000000000000..ea3c43d85c81 --- /dev/null +++ b/internal/service/notifications/managed_notification_account_contact_association_test.go @@ -0,0 +1,210 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package notifications_test + +import ( + "context" + "errors" + "fmt" + "testing" + + awstypes "github.com/aws/aws-sdk-go-v2/service/notifications/types" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/plancheck" + "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + "github.com/hashicorp/terraform-provider-aws/internal/conns" + intflex "github.com/hashicorp/terraform-provider-aws/internal/flex" + tfnotifications "github.com/hashicorp/terraform-provider-aws/internal/service/notifications" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccNotificationsManagedNotificationAccountContactAssociation_basic(t *testing.T) { + ctx := acctest.Context(t) + resourceName := "aws_notifications_managed_notification_account_contact_association.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.NotificationsEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.NotificationsServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckManagedNotificationAccountContactAssociationDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccManagedNotificationAccountContactAssociationConfig_basic(string(awstypes.AccountContactTypeAccountPrimary)), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckManagedNotificationAccountContactAssociationExists(ctx, resourceName), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "contact_identifier", + ImportStateIdFunc: testAccManagedNotificationAccountContactAssociationImportStateIDFunc(resourceName), + }, + }, + }) +} + +func TestAccNotificationsManagedNotificationAccountContactAssociation_disappears(t *testing.T) { + ctx := acctest.Context(t) + resourceName := "aws_notifications_managed_notification_account_contact_association.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.NotificationsEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.NotificationsServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckManagedNotificationAccountContactAssociationDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccManagedNotificationAccountContactAssociationConfig_basic(string(awstypes.AccountContactTypeAccountAlternateSecurity)), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckManagedNotificationAccountContactAssociationExists(ctx, resourceName), + acctest.CheckFrameworkResourceDisappears(ctx, acctest.Provider, tfnotifications.ResourceManagedNotificationAccountContactAssociation, resourceName), + ), + ExpectNonEmptyPlan: true, + ConfigPlanChecks: resource.ConfigPlanChecks{ + PostApplyPostRefresh: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate), + }, + }, + }, + }, + }) +} + +func testAccCheckManagedNotificationAccountContactAssociationDestroy(ctx context.Context) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acctest.Provider.Meta().(*conns.AWSClient).NotificationsClient(ctx) + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_notifications_managed_notification_account_contact_association" { + continue + } + + err := tfnotifications.FindManagedNotificationAccountContactAssociationByTwoPartKey(ctx, conn, rs.Primary.Attributes["managed_notification_configuration_arn"], rs.Primary.Attributes["contact_identifier"]) + + if tfresource.NotFound(err) { + continue + } + + if err != nil { + return err + } + + return errors.New("User Notifications Managed Notification Account Contact Association still exists") + } + + return nil + } +} + +func testAccCheckManagedNotificationAccountContactAssociationExists(ctx context.Context, n string) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[n] + if !ok { + return fmt.Errorf("Not found: %s", n) + } + + conn := acctest.Provider.Meta().(*conns.AWSClient).NotificationsClient(ctx) + + err := tfnotifications.FindManagedNotificationAccountContactAssociationByTwoPartKey(ctx, conn, rs.Primary.Attributes["managed_notification_configuration_arn"], rs.Primary.Attributes["contact_identifier"]) + + return err + } +} + +func testAccManagedNotificationAccountContactAssociationImportStateIDFunc(n string) func(*terraform.State) (string, error) { + return func(state *terraform.State) (string, error) { + rs, ok := state.RootModule().Resources[n] + if !ok { + return "", fmt.Errorf("Not found: %s", n) + } + + return rs.Primary.Attributes["managed_notification_configuration_arn"] + intflex.ResourceIdSeparator + rs.Primary.Attributes["contact_identifier"], nil + } +} + +func TestAccNotificationsManagedNotificationAccountContactAssociation_alternateBilling(t *testing.T) { + ctx := acctest.Context(t) + resourceName := "aws_notifications_managed_notification_account_contact_association.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.NotificationsEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.NotificationsServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckManagedNotificationAccountContactAssociationDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccManagedNotificationAccountContactAssociationConfig_basic(string(awstypes.AccountContactTypeAccountAlternateBilling)), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckManagedNotificationAccountContactAssociationExists(ctx, resourceName), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "contact_identifier", + ImportStateIdFunc: testAccManagedNotificationAccountContactAssociationImportStateIDFunc(resourceName), + }, + }, + }) +} + +func TestAccNotificationsManagedNotificationAccountContactAssociation_alternateOperations(t *testing.T) { + ctx := acctest.Context(t) + resourceName := "aws_notifications_managed_notification_account_contact_association.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.NotificationsEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.NotificationsServiceID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckManagedNotificationAccountContactAssociationDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccManagedNotificationAccountContactAssociationConfig_basic(string(awstypes.AccountContactTypeAccountAlternateOperations)), + Check: resource.ComposeAggregateTestCheckFunc( + testAccCheckManagedNotificationAccountContactAssociationExists(ctx, resourceName), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIdentifierAttribute: "contact_identifier", + ImportStateIdFunc: testAccManagedNotificationAccountContactAssociationImportStateIDFunc(resourceName), + }, + }, + }) +} + +func testAccManagedNotificationAccountContactAssociationConfig_basic(contactIdentifier string) string { + return fmt.Sprintf(` +data "aws_caller_identity" "current" {} +data "aws_partition" "current" {} + +resource "aws_notifications_managed_notification_account_contact_association" "test" { + contact_identifier = %[1]q + managed_notification_configuration_arn = "arn:${data.aws_partition.current.partition}:notifications::${data.aws_caller_identity.current.account_id}:managed-notification-configuration/category/AWS-Health/sub-category/Security" +} +`, contactIdentifier) +} diff --git a/internal/service/notifications/service_package_gen.go b/internal/service/notifications/service_package_gen.go index 019f39a8c774..e9f333607e78 100644 --- a/internal/service/notifications/service_package_gen.go +++ b/internal/service/notifications/service_package_gen.go @@ -36,6 +36,12 @@ func (p *servicePackage) FrameworkResources(ctx context.Context) []*inttypes.Ser Name: "Event Rule", Region: unique.Make(inttypes.ResourceRegionDisabled()), }, + { + Factory: newManagedNotificationAccountContactAssociationResource, + TypeName: "aws_notifications_managed_notification_account_contact_association", + Name: "Managed Notification Account Contact Association", + Region: unique.Make(inttypes.ResourceRegionDisabled()), + }, { Factory: newNotificationConfigurationResource, TypeName: "aws_notifications_notification_configuration", diff --git a/website/docs/r/notifications_managed_notification_account_contact_association.html.markdown b/website/docs/r/notifications_managed_notification_account_contact_association.html.markdown new file mode 100644 index 000000000000..8746b3f29b4d --- /dev/null +++ b/website/docs/r/notifications_managed_notification_account_contact_association.html.markdown @@ -0,0 +1,49 @@ +--- +subcategory: "User Notifications" +layout: "aws" +page_title: "AWS: aws_notifications_managed_notification_account_contact_association" +description: |- + Terraform resource for managing an AWS User Notifications Managed Notification Account Contact Association. +--- +# Resource: aws_notifications_managed_notification_account_contact_association + +Terraform resource for managing an AWS User Notifications Managed Notification Account Contact Association. This resource associates an account contact with a managed notification configuration. + +## Example Usage + +### Basic Usage + +```terraform +resource "aws_notifications_managed_notification_account_contact_association" "example" { + contact_identifier = "ACCOUNT_PRIMARY" + managed_notification_configuration_arn = "arn:aws:notifications::123456789012:managed-notification-configuration/category/AWS-Health/sub-category/Security" +} +``` + +## Argument Reference + +The following arguments are required: + +* `contact_identifier` - (Required) A unique value of an Account Contact Type to associate with the ManagedNotificationConfiguration. Valid values: `ACCOUNT_PRIMARY`, `ACCOUNT_ALTERNATE_BILLING`, `ACCOUNT_ALTERNATE_OPERATIONS`, `ACCOUNT_ALTERNATE_SECURITY`. +* `managed_notification_configuration_arn` - (Required) ARN of the managed notification configuration to associate the account contact with. + +## Attribute Reference + +This resource 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 User Notifications Managed Notification Account Contact Association using the `managed_notification_configuration_arn,contact_identifier` format. For example: + +```terraform +import { + to = aws_notifications_managed_notification_account_contact_association.example + id = "arn:aws:notifications::123456789012:managed-notification-configuration/category/AWS-Health/sub-category/Security,ACCOUNT_PRIMARY" +} +``` + +Using `terraform import`, import User Notifications Managed Notification Account Contact Association using the `managed_notification_configuration_arn,contact_identifier` format. For example: + +```console +% terraform import aws_notifications_managed_notification_account_contact_association.example arn:aws:notifications::123456789012:managed-notification-configuration/category/AWS-Health/sub-category/Security,ACCOUNT_PRIMARY +```