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

Add output S3 region to AWS SSM since it is now a supported parameter. #21803

Merged
merged 3 commits into from
Nov 24, 2021
+160 −0
Merged

Add output S3 region to AWS SSM since it is now a supported parameter. #21803

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1975162
Add output S3 region to AWS SSM since it is now a supported parameter.
atomixer Nov 17, 2021
42cd362
Add output S3 region to AWS SSM documentation
atomixer Nov 20, 2021
e0a1a0c
CR updates
anGie44 Nov 24, 2021
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
CR updates
  • Loading branch information
@anGie44
anGie44 committed Nov 24, 2021

Verified

This commit was signed with the committer’s verified signature.
snyk-bot Snyk bot
GPG key ID: 5009E0832F4D3DD3
Verified
Learn about vigilant mode
commit e0a1a0c3f1ad2e32de66af826ea804029ad8f37d
3 changes: 3 additions & 0 deletions .changelog/21803.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_ssm_association: Add `s3_region` argument to `output_location` configuration block
```
9 changes: 5 additions & 4 deletions internal/service/ssm/association.go
View file
Original file line number Diff line number Diff line change
@@ -91,8 +91,9 @@ func ResourceAssociation() *schema.Resource {
Optional: true,
},
"s3_region": {
Type: schema.TypeString,
Optional: true,
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.StringLenBetween(3, 20),
},
},
},
@@ -364,8 +365,8 @@ func expandSSMAssociationOutputLocation(config []interface{}) *ssm.InstanceAssoc
S3OutputLocation.OutputS3KeyPrefix = aws.String(v.(string))
}

if v, ok := locationConfig["s3_region"]; ok {
S3OutputLocation.OutputS3Region = aws.String(v.(string))
if v, ok := locationConfig["s3_region"].(string); ok && v != "" {
S3OutputLocation.OutputS3Region = aws.String(v)
}

return &ssm.InstanceAssociationOutputLocation{
157 changes: 143 additions & 14 deletions internal/service/ssm/association_test.go
View file
Original file line number Diff line number Diff line change
@@ -331,8 +331,6 @@ func TestAccSSMAssociation_withOutputLocation(t *testing.T) {
resourceName, "output_location.0.s3_bucket_name", fmt.Sprintf("tf-acc-test-ssmoutput-%s", name)),
resource.TestCheckResourceAttr(
resourceName, "output_location.0.s3_key_prefix", "SSMAssociation"),
resource.TestCheckResourceAttr(
resourceName, "output_location.0.s3_region", "us-east-1"),
),
},
{
@@ -348,8 +346,6 @@ func TestAccSSMAssociation_withOutputLocation(t *testing.T) {
resourceName, "output_location.0.s3_bucket_name", fmt.Sprintf("tf-acc-test-ssmoutput-updated-%s", name)),
resource.TestCheckResourceAttr(
resourceName, "output_location.0.s3_key_prefix", "SSMAssociation"),
resource.TestCheckResourceAttr(
resourceName, "output_location.0.s3_region", "us-east-2"),
),
},
{
@@ -360,8 +356,56 @@ func TestAccSSMAssociation_withOutputLocation(t *testing.T) {
resourceName, "output_location.0.s3_bucket_name", fmt.Sprintf("tf-acc-test-ssmoutput-updated-%s", name)),
resource.TestCheckResourceAttr(
resourceName, "output_location.0.s3_key_prefix", "UpdatedAssociation"),
resource.TestCheckResourceAttr(
resourceName, "output_location.0.s3_region", "UpdatedAssociation"),
),
},
},
})
}

func TestAccSSMAssociation_withOutputLocation_s3Region(t *testing.T) {
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_ssm_association.test"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t); acctest.PreCheckMultipleRegion(t, 2) },
ErrorCheck: acctest.ErrorCheck(t, ssm.EndpointsID),
ProviderFactories: acctest.ProviderFactories,
CheckDestroy: testAccCheckAssociationDestroy,
Steps: []resource.TestStep{
{
Config: testAccAssociationWithOutputLocationS3RegionConfig(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAssociationExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "output_location.#", "1"),
resource.TestCheckResourceAttr(resourceName, "output_location.0.s3_bucket_name", rName),
resource.TestCheckResourceAttr(resourceName, "output_location.0.s3_region", acctest.Region()),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
{
Config: testAccAssociationWithOutputLocationUpdateS3RegionConfig(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAssociationExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "output_location.#", "1"),
resource.TestCheckResourceAttr(resourceName, "output_location.0.s3_bucket_name", rName),
resource.TestCheckResourceAttr(resourceName, "output_location.0.s3_region", acctest.AlternateRegion()),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
{
Config: testAccAssociationWithOutputLocationNoS3RegionConfig(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAssociationExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "output_location.#", "1"),
resource.TestCheckResourceAttr(resourceName, "output_location.0.s3_region", ""),
),
},
},
@@ -1083,7 +1127,6 @@ func testAccAssociationBasicWithOutPutLocationConfig(rName string) string {
resource "aws_s3_bucket" "output_location" {
bucket = "tf-acc-test-ssmoutput-%s"
force_destroy = true
region = "us-east-1"
}

resource "aws_ssm_document" "test" {
@@ -1123,24 +1166,114 @@ resource "aws_ssm_association" "test" {
output_location {
s3_bucket_name = aws_s3_bucket.output_location.id
s3_key_prefix = "SSMAssociation"
s3_region = aws_s3_bucket.output_location.region
}
}
`, rName, rName)
}

func testAccAssociationWithOutputLocationS3RegionConfigBase(rName string) string {
return fmt.Sprintf(`
resource "aws_s3_bucket" "test" {
bucket = %[1]q
force_destroy = true
}

resource "aws_ssm_document" "test" {
name = %[1]q
document_type = "Command"

content = <<DOC
{
"schemaVersion": "1.2",
"description": "Check ip configuration of a Linux instance.",
"parameters": {},
"runtimeConfig": {
"aws:runShellScript": {
"properties": [
{
"id": "0.aws:runShellScript",
"runCommand": [
"ifconfig"
]
}
]
}
}
}
DOC
}
`, rName)
}

func testAccAssociationWithOutputLocationS3RegionConfig(rName string) string {
return acctest.ConfigCompose(
testAccAssociationWithOutputLocationS3RegionConfigBase(rName),
`
resource "aws_ssm_association" "test" {
name = aws_ssm_document.test.name

targets {
key = "tag:Name"
values = ["acceptanceTest"]
}

output_location {
s3_bucket_name = aws_s3_bucket.test.id
s3_region = aws_s3_bucket.test.region
}
}
`)
}

func testAccAssociationWithOutputLocationUpdateS3RegionConfig(rName string) string {
return acctest.ConfigCompose(
testAccAssociationWithOutputLocationS3RegionConfigBase(rName),
fmt.Sprintf(`
resource "aws_ssm_association" "test" {
name = aws_ssm_document.test.name

targets {
key = "tag:Name"
values = ["acceptanceTest"]
}

output_location {
s3_bucket_name = aws_s3_bucket.test.id
s3_region = %[1]q
}
}
`, acctest.AlternateRegion()))
}

func testAccAssociationWithOutputLocationNoS3RegionConfig(rName string) string {
return acctest.ConfigCompose(
testAccAssociationWithOutputLocationS3RegionConfigBase(rName),
`
resource "aws_ssm_association" "test" {
name = aws_ssm_document.test.name

targets {
key = "tag:Name"
values = ["acceptanceTest"]
}

output_location {
s3_bucket_name = aws_s3_bucket.test.id
}
}
`)
}

func testAccAssociationBasicWithOutPutLocationUpdateBucketNameConfig(rName string) string {
return fmt.Sprintf(`
resource "aws_s3_bucket" "output_location" {
bucket = "tf-acc-test-ssmoutput-%s"
force_destroy = true
region = "us-east-1"
}

resource "aws_s3_bucket" "output_location_updated" {
bucket = "tf-acc-test-ssmoutput-updated-%s"
force_destroy = true
region = "us-east-2"
}

resource "aws_ssm_document" "test" {
@@ -1180,7 +1313,6 @@ resource "aws_ssm_association" "test" {
output_location {
s3_bucket_name = aws_s3_bucket.output_location_updated.id
s3_key_prefix = "SSMAssociation"
s3_region = aws_s3_bucket.output_location_updated.region
}
}
`, rName, rName, rName)
@@ -1191,13 +1323,11 @@ func testAccAssociationBasicWithOutPutLocationUpdateKeyPrefixConfig(rName string
resource "aws_s3_bucket" "output_location" {
bucket = "tf-acc-test-ssmoutput-%s"
force_destroy = true
region = "us-east-1"
}

resource "aws_s3_bucket" "output_location_updated" {
bucket = "tf-acc-test-ssmoutput-updated-%s"
force_destroy = true
region = "us-east-2"
}

resource "aws_ssm_document" "test" {
@@ -1237,7 +1367,6 @@ resource "aws_ssm_association" "test" {
output_location {
s3_bucket_name = aws_s3_bucket.output_location_updated.id
s3_key_prefix = "UpdatedAssociation"
s3_region = aws_s3_bucket.output_location_updated.region
}
}
`, rName, rName, rName)