diff --git a/internal/service/cloudformation/stack_set_instance.go b/internal/service/cloudformation/stack_set_instance.go index 02dfe22c42c..1cfdf51f52f 100644 --- a/internal/service/cloudformation/stack_set_instance.go +++ b/internal/service/cloudformation/stack_set_instance.go @@ -81,7 +81,7 @@ func resourceStackSetInstance() *schema.Resource { Optional: true, ForceNew: true, MinItems: 1, - ConflictsWith: []string{"account_id"}, + ConflictsWith: []string{names.AttrAccountID}, Elem: &schema.Schema{ Type: schema.TypeString, ValidateFunc: validation.StringMatch(regexache.MustCompile(`^(ou-[0-9a-z]{4,32}-[0-9a-z]{8,32}|r-[0-9a-z]{4,32})$`), ""), @@ -92,13 +92,13 @@ func resourceStackSetInstance() *schema.Resource { Optional: true, ForceNew: true, ValidateFunc: validation.StringInSlice(enum.Slice(awstypes.AccountFilterType.Values("")...), false), - ConflictsWith: []string{"account_id"}, + ConflictsWith: []string{names.AttrAccountID}, }, "accounts": { Type: schema.TypeSet, Optional: true, ForceNew: true, - ConflictsWith: []string{"account_id"}, + ConflictsWith: []string{names.AttrAccountID}, MinItems: 1, Elem: &schema.Schema{ Type: schema.TypeString, @@ -109,7 +109,7 @@ func resourceStackSetInstance() *schema.Resource { Type: schema.TypeString, ForceNew: true, Optional: true, - ConflictsWith: []string{"account_id"}, + ConflictsWith: []string{names.AttrAccountID}, ValidateFunc: validation.StringMatch(regexp.MustCompile(`(s3://|http(s?)://).+`), ""), }, }, diff --git a/internal/service/cloudformation/stack_set_instance_test.go b/internal/service/cloudformation/stack_set_instance_test.go index 8d79f9b963d..255935248e4 100644 --- a/internal/service/cloudformation/stack_set_instance_test.go +++ b/internal/service/cloudformation/stack_set_instance_test.go @@ -817,8 +817,8 @@ resource "aws_cloudformation_stack_set_instance" "test" { deployment_targets { organizational_unit_ids = [data.aws_organizations_organization.test.roots[0].id] - account_filter_type = "INTERSECTION" - accounts = [data.aws_organizations_organization.test.non_master_accounts[0].id] + account_filter_type = "INTERSECTION" + accounts = [data.aws_organizations_organization.test.non_master_accounts[0].id] } stack_set_name = aws_cloudformation_stack_set.test.name diff --git a/website/docs/r/cloudformation_stack_set_instance.html.markdown b/website/docs/r/cloudformation_stack_set_instance.html.markdown index 46c24a1699e..e180b086d57 100644 --- a/website/docs/r/cloudformation_stack_set_instance.html.markdown +++ b/website/docs/r/cloudformation_stack_set_instance.html.markdown @@ -102,6 +102,7 @@ The `deployment_targets` configuration block supports the following arguments: * `account_filter_type` - (Optional) Limit deployment targets to individual accounts or include additional accounts with provided OUs. Valid values: `INTERSECTION`, `DIFFERENCE`, `UNION`, `NONE`. * `accounts` - (Optional) List of accounts to deploy stack set updates. * `accounts_url` - (Optional) S3 URL of the file containing the list of accounts. + ### `operation_preferences` Argument Reference The `operation_preferences` configuration block supports the following arguments: