Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

r/aws_servicecatalog_provisioned_product: properly set stack_set_provisioned_preferences.accounts #31293

Merged
merged 2 commits into from
May 9, 2023
Merged

r/aws_servicecatalog_provisioned_product: properly set stack_set_provisioned_preferences.accounts #31293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7a66b8
r/aws_servicecatalog_provisioned_product: properly set stack_set_prov…
jar-b May 9, 2023
d6a9aa2
chore: changelog
jar-b May 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/31293.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_servicecatalog_provisioned_product: Fix to properly send `stack_set_provisioned_preferences.0.accounts` on create and update
```
4 changes: 2 additions & 2 deletions internal/service/servicecatalog/provisioned_product.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ func expandProvisioningPreferences(tfMap map[string]interface{}) *servicecatalog

apiObject := &servicecatalog.ProvisioningPreferences{}

if v, ok := tfMap["account"].([]interface{}); ok && len(v) > 0 {
if v, ok := tfMap["accounts"].([]interface{}); ok && len(v) > 0 {
apiObject.StackSetAccounts = flex.ExpandStringList(v)
}

Expand Down Expand Up @@ -735,7 +735,7 @@ func expandUpdateProvisioningPreferences(tfMap map[string]interface{}) *servicec

apiObject := &servicecatalog.UpdateProvisioningPreferences{}

if v, ok := tfMap["account"].([]interface{}); ok && len(v) > 0 {
if v, ok := tfMap["accounts"].([]interface{}); ok && len(v) > 0 {
apiObject.StackSetAccounts = flex.ExpandStringList(v)
}

Expand Down
8 changes: 8 additions & 0 deletions internal/service/servicecatalog/provisioned_product_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ func TestAccServiceCatalogProvisionedProduct_stackSetProvisioningPreferences(t *
resource.TestCheckResourceAttr(resourceName, "stack_set_provisioning_preferences.#", "1"),
resource.TestCheckResourceAttr(resourceName, "stack_set_provisioning_preferences.0.failure_tolerance_count", "1"),
resource.TestCheckResourceAttr(resourceName, "stack_set_provisioning_preferences.0.max_concurrency_count", "2"),
resource.TestCheckResourceAttr(resourceName, "stack_set_provisioning_preferences.0.accounts.#", "1"),
resource.TestCheckResourceAttr(resourceName, "stack_set_provisioning_preferences.0.regions.#", "1"),
),
},
{
Expand All @@ -186,6 +188,8 @@ func TestAccServiceCatalogProvisionedProduct_stackSetProvisioningPreferences(t *
resource.TestCheckResourceAttr(resourceName, "stack_set_provisioning_preferences.#", "1"),
resource.TestCheckResourceAttr(resourceName, "stack_set_provisioning_preferences.0.failure_tolerance_count", "3"),
resource.TestCheckResourceAttr(resourceName, "stack_set_provisioning_preferences.0.max_concurrency_count", "4"),
resource.TestCheckResourceAttr(resourceName, "stack_set_provisioning_preferences.0.accounts.#", "1"),
resource.TestCheckResourceAttr(resourceName, "stack_set_provisioning_preferences.0.regions.#", "1"),
),
},
{
Expand Down Expand Up @@ -786,13 +790,17 @@ resource "aws_servicecatalog_provisioned_product" "test" {
func testAccProvisionedProductConfig_stackSetprovisioningPreferences(rName, domain, email, vpcCidr string, failureToleranceCount, maxConcurrencyCount int) string {
return acctest.ConfigCompose(testAccProvisionedProductTemplateURLBaseConfig(rName, domain, email),
fmt.Sprintf(`
data "aws_region" "current" {}

resource "aws_servicecatalog_provisioned_product" "test" {
name = %[1]q
product_id = aws_servicecatalog_product.test.id
provisioning_artifact_name = %[1]q
path_id = data.aws_servicecatalog_launch_paths.test.summaries[0].path_id

stack_set_provisioning_preferences {
accounts = [data.aws_caller_identity.current.account_id]
regions = [data.aws_region.current.name]
failure_tolerance_count = %[3]d
max_concurrency_count = %[4]d
}
Expand Down