Merge pull request #36062 from acwwat/f-aws_ram_resource_share-data_s…

…ource_name_optional

feat: Mark name arg as optional to match AWS API for aws_ram_resource_share data source

.changelog/36062.txt

@@ -0,0 +1,19 @@
+```release-note:enhancement
+data-source/aws_ram_resource_share: `name` is Optional
+```
+
+```release-note:enhancement
+resource/aws_ram_resource_association: Add plan-time validation of `resource_arn` and `resource_share_arn`
+```
+
+```release-note:bug
+resource/aws_ram_principal_association: Remove from state on resource Read if `principal` is disassociated outside of Terraform 
+```
+
+```release-note:bug
+resource/aws_ram_principal_association: Prevent creation of duplicate Terraform resources
+```
+
+```release-note:bug
+resource/aws_ram_resource_association: Prevent creation of duplicate Terraform resources
+```

internal/framework/validators/aws_account_id.go

@@ -6,9 +6,9 @@ package validators
 import (
 	"context"
 
-	"github.com/YakDriver/regexache"
 	"github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag"
 	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
+	itypes "github.com/hashicorp/terraform-provider-aws/internal/types"
 )
 
 // awsAccountIDValidator validates that a string Attribute's value is a valid AWS account ID.
@@ -31,7 +31,7 @@ func (validator awsAccountIDValidator) ValidateString(ctx context.Context, reque
 	}
 
 	// https://docs.aws.amazon.com/accounts/latest/reference/manage-acct-identifiers.html.
-	if !regexache.MustCompile(`^\d{12}$`).MatchString(request.ConfigValue.ValueString()) {
+	if !itypes.IsAWSAccountID(request.ConfigValue.ValueString()) {
 		response.Diagnostics.Append(validatordiag.InvalidAttributeValueDiagnostic(
 			request.Path,
 			validator.Description(ctx),

internal/service/ram/consts.go

@@ -0,0 +1,13 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package ram
+
+import (
+	"time"
+)
+
+const (
+	resourceShareInvitationPropagationTimeout = 2 * time.Minute
+	resourceSharePropagationTimeout           = 1 * time.Minute
+)

internal/service/ram/exports_test.go

@@ -0,0 +1,19 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package ram
+
+// Exports for use in tests only.
+var (
+	ResourcePrincipalAssociation    = resourcePrincipalAssociation
+	ResourceResourceAssociation     = resourceResourceAssociation
+	ResourceResourceShare           = resourceResourceShare
+	ResourceResourceShareAccepter   = resourceResourceShareAccepter
+	ResourceSharingWithOrganization = resourceSharingWithOrganization
+
+	FindPrincipalAssociationByTwoPartKey     = findPrincipalAssociationByTwoPartKey
+	FindResourceAssociationByTwoPartKey      = findResourceAssociationByTwoPartKey
+	FindResourceShareOwnerOtherAccountsByARN = findResourceShareOwnerOtherAccountsByARN
+	FindResourceShareOwnerSelfByARN          = findResourceShareOwnerSelfByARN
+	FindSharingWithOrganization              = findSharingWithOrganization
+)