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.

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

Allows enabling support of tag policies #11535

Merged
merged 8 commits into from
Jan 17, 2020
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
More efficient structure
Nikolai fauskrud committed Jan 9, 2020
commit 7d946a1f74b58f672f1baa8d0ddff1f9cf8fc118
73 changes: 37 additions & 36 deletions aws/resource_aws_organizations_organization_test.go
Original file line number Diff line number Diff line change
@@ -94,47 +94,48 @@ func testAccAwsOrganizationsOrganization_AwsServiceAccessPrincipals(t *testing.T
})
}

func addTestStepsAwsOrganizationsOrganization_EnabledPolicyTypes(policyType string, testSteps *[]resource.TestStep) {
func addTestStepsAwsOrganizationsOrganization_EnabledPolicyTypes(policyTypes *[]string) *[]resource.TestStep {
nikolaifa marked this conversation as resolved.
Show resolved Hide resolved
resourceName := "aws_organizations_organization.test"
var organization organizations.Organization
newSteps := *testSteps

*testSteps = append(newSteps, []resource.TestStep{
{
Config: testAccAwsOrganizationsOrganizationConfigEnabledPolicyTypes1(policyType),
Check: resource.ComposeTestCheckFunc(
testAccCheckAwsOrganizationsOrganizationExists(resourceName, &organization),
resource.TestCheckResourceAttr(resourceName, "enabled_policy_types.#", "1"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
{
Config: testAccAwsOrganizationsOrganizationConfig,
Check: resource.ComposeTestCheckFunc(
testAccCheckAwsOrganizationsOrganizationExists(resourceName, &organization),
resource.TestCheckResourceAttr(resourceName, "enabled_policy_types.#", "0"),
),
},
{
Config: testAccAwsOrganizationsOrganizationConfigEnabledPolicyTypes1(policyType),
Check: resource.ComposeTestCheckFunc(
testAccCheckAwsOrganizationsOrganizationExists(resourceName, &organization),
resource.TestCheckResourceAttr(resourceName, "enabled_policy_types.#", "1"),
),
},
})
var testSteps []resource.TestStep

for _, policyType := range *policyTypes {
testSteps = append(testSteps, []resource.TestStep{
{
Config: testAccAwsOrganizationsOrganizationConfigEnabledPolicyTypes1(policyType),
Check: resource.ComposeTestCheckFunc(
testAccCheckAwsOrganizationsOrganizationExists(resourceName, &organization),
resource.TestCheckResourceAttr(resourceName, "enabled_policy_types.#", "1"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
{
Config: testAccAwsOrganizationsOrganizationConfig,
Check: resource.ComposeTestCheckFunc(
testAccCheckAwsOrganizationsOrganizationExists(resourceName, &organization),
resource.TestCheckResourceAttr(resourceName, "enabled_policy_types.#", "0"),
),
},
{
Config: testAccAwsOrganizationsOrganizationConfigEnabledPolicyTypes1(policyType),
Check: resource.ComposeTestCheckFunc(
testAccCheckAwsOrganizationsOrganizationExists(resourceName, &organization),
resource.TestCheckResourceAttr(resourceName, "enabled_policy_types.#", "1"),
),
},
}...)
}
return &testSteps
}

func testAccAwsOrganizationsOrganization_EnabledPolicyTypes(t *testing.T) {
var testSteps []resource.TestStep
func testAccAwsOrganizationsOrganization_EnabledPolicyTypes(t *testing.T) {
policyTypes := []string{organizations.PolicyTypeServiceControlPolicy, organizations.PolicyTypeTagPolicy}
testSteps := *addTestStepsAwsOrganizationsOrganization_EnabledPolicyTypes(&policyTypes)

addTestStepsAwsOrganizationsOrganization_EnabledPolicyTypes(organizations.PolicyTypeServiceControlPolicy, &testSteps)
addTestStepsAwsOrganizationsOrganization_EnabledPolicyTypes(organizations.PolicyTypeTagPolicy, &testSteps)

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t); testAccOrganizationsAccountPreCheck(t) },
Providers: testAccProviders,