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

resource/aws_config_config_rule: Prevent panic when specifying empty scope #5852

Merged
merged 1 commit into from
Sep 14, 2018
Merged

resource/aws_config_config_rule: Prevent panic when specifying empty scope #5852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 1 addition & 5 deletions aws/resource_aws_config_config_rule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,10 @@ func resourceAwsConfigConfigRulePut(d *schema.ResourceData, meta interface{}) er
name := d.Get("name").(string)
ruleInput := configservice.ConfigRule{
ConfigRuleName: aws.String(name),
Scope: expandConfigRuleScope(d.Get("scope").([]interface{})),
Source: expandConfigRuleSource(d.Get("source").([]interface{})),
}

scopes := d.Get("scope").([]interface{})
if len(scopes) > 0 {
ruleInput.Scope = expandConfigRuleScope(scopes[0].(map[string]interface{}))
}

if v, ok := d.GetOk("description"); ok {
ruleInput.Description = aws.String(v.(string))
}
Expand Down
155 changes: 155 additions & 0 deletions aws/resource_aws_config_config_rule_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,86 @@ func testAccConfigConfigRule_importLambda(t *testing.T) {
})
}

func testAccConfigConfigRule_Scope_TagKey(t *testing.T) {
var configRule configservice.ConfigRule
rName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_config_config_rule.test"

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckConfigConfigRuleDestroy,
Steps: []resource.TestStep{
{
Config: testAccConfigConfigRuleConfig_Scope_TagKey(rName, "key1"),
Check: resource.ComposeTestCheckFunc(
testAccCheckConfigConfigRuleExists(resourceName, &configRule),
resource.TestCheckResourceAttr(resourceName, "scope.#", "1"),
resource.TestCheckResourceAttr(resourceName, "scope.0.tag_key", "key1"),
),
},
{
Config: testAccConfigConfigRuleConfig_Scope_TagKey(rName, "key2"),
Check: resource.ComposeTestCheckFunc(
testAccCheckConfigConfigRuleExists(resourceName, &configRule),
resource.TestCheckResourceAttr(resourceName, "scope.#", "1"),
resource.TestCheckResourceAttr(resourceName, "scope.0.tag_key", "key2"),
),
},
},
})
}

func testAccConfigConfigRule_Scope_TagKey_Empty(t *testing.T) {
var configRule configservice.ConfigRule
rName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_config_config_rule.test"

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckConfigConfigRuleDestroy,
Steps: []resource.TestStep{
{
Config: testAccConfigConfigRuleConfig_Scope_TagKey(rName, ""),
Check: resource.ComposeTestCheckFunc(
testAccCheckConfigConfigRuleExists(resourceName, &configRule),
),
},
},
})
}

func testAccConfigConfigRule_Scope_TagValue(t *testing.T) {
var configRule configservice.ConfigRule
rName := acctest.RandomWithPrefix("tf-acc-test")
resourceName := "aws_config_config_rule.test"

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckConfigConfigRuleDestroy,
Steps: []resource.TestStep{
{
Config: testAccConfigConfigRuleConfig_Scope_TagValue(rName, "value1"),
Check: resource.ComposeTestCheckFunc(
testAccCheckConfigConfigRuleExists(resourceName, &configRule),
resource.TestCheckResourceAttr(resourceName, "scope.#", "1"),
resource.TestCheckResourceAttr(resourceName, "scope.0.tag_value", "value1"),
),
},
{
Config: testAccConfigConfigRuleConfig_Scope_TagValue(rName, "value2"),
Check: resource.ComposeTestCheckFunc(
testAccCheckConfigConfigRuleExists(resourceName, &configRule),
resource.TestCheckResourceAttr(resourceName, "scope.#", "1"),
resource.TestCheckResourceAttr(resourceName, "scope.0.tag_value", "value2"),
),
},
},
})
}

func testAccCheckConfigConfigRuleName(n, desired string, obj *configservice.ConfigRule) resource.TestCheckFunc {
return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n]
Expand Down Expand Up @@ -224,6 +304,42 @@ func testAccCheckConfigConfigRuleDestroy(s *terraform.State) error {
return nil
}

func testAccConfigConfigRuleConfig_base(rName string) string {
return fmt.Sprintf(`
data "aws_partition" "current" {}

resource "aws_config_configuration_recorder" "test" {
name = %q
role_arn = "${aws_iam_role.test.arn}"
}

resource "aws_iam_role" "test" {
name = %q

assume_role_policy = <<EOF
{
"Version": "2012-10-17",
"Statement": [
{
"Action": "sts:AssumeRole",
"Principal": {
"Service": "config.amazonaws.com"
},
"Effect": "Allow",
"Sid": ""
}
]
}
EOF
}

resource "aws_iam_role_policy_attachment" "test" {
policy_arn = "arn:${data.aws_partition.current.partition}:iam::aws:policy/service-role/AWSConfigRole"
role = "${aws_iam_role.test.name}"
}
`, rName, rName)
}

func testAccConfigConfigRuleConfig_basic(randInt int) string {
return fmt.Sprintf(`
resource "aws_config_config_rule" "foo" {
Expand Down Expand Up @@ -471,3 +587,42 @@ resource "aws_iam_role_policy" "p" {
POLICY
}`, randInt, path, randInt, randInt, randInt, randInt, randInt, randInt, randInt)
}

func testAccConfigConfigRuleConfig_Scope_TagKey(rName, tagKey string) string {
return testAccConfigConfigRuleConfig_base(rName) + fmt.Sprintf(`
resource "aws_config_config_rule" "test" {
name = %q

scope {
tag_key = %q
}

source {
owner = "AWS"
source_identifier = "S3_BUCKET_VERSIONING_ENABLED"
}

depends_on = ["aws_config_configuration_recorder.test"]
}
`, rName, tagKey)
}

func testAccConfigConfigRuleConfig_Scope_TagValue(rName, tagValue string) string {
return testAccConfigConfigRuleConfig_base(rName) + fmt.Sprintf(`
resource "aws_config_config_rule" "test" {
name = %q

scope {
tag_key = "key"
tag_value = %q
}

source {
owner = "AWS"
source_identifier = "S3_BUCKET_VERSIONING_ENABLED"
}

depends_on = ["aws_config_configuration_recorder.test"]
}
`, rName, tagValue)
}
13 changes: 8 additions & 5 deletions aws/resource_aws_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@ import (
func TestAccAWSConfig(t *testing.T) {
testCases := map[string]map[string]func(t *testing.T){
"Config": {
"basic": testAccConfigConfigRule_basic,
"ownerAws": testAccConfigConfigRule_ownerAws,
"customlambda": testAccConfigConfigRule_customlambda,
"importAws": testAccConfigConfigRule_importAws,
"importLambda": testAccConfigConfigRule_importLambda,
"basic": testAccConfigConfigRule_basic,
"ownerAws": testAccConfigConfigRule_ownerAws,
"customlambda": testAccConfigConfigRule_customlambda,
"importAws": testAccConfigConfigRule_importAws,
"importLambda": testAccConfigConfigRule_importLambda,
"scopeTagKey": testAccConfigConfigRule_Scope_TagKey,
"scopeTagKeyEmpty": testAccConfigConfigRule_Scope_TagKey_Empty,
"scopeTagValue": testAccConfigConfigRule_Scope_TagValue,
},
"ConfigurationRecorderStatus": {
"basic": testAccConfigConfigurationRecorderStatus_basic,
Expand Down
6 changes: 5 additions & 1 deletion aws/structure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2201,7 +2201,11 @@ func flattenConfigRuleScope(scope *configservice.Scope) []interface{} {
return items
}

func expandConfigRuleScope(configured map[string]interface{}) *configservice.Scope {
func expandConfigRuleScope(l []interface{}) *configservice.Scope {
if len(l) == 0 || l[0] == nil {
return nil
}
configured := l[0].(map[string]interface{})
scope := &configservice.Scope{}

if v, ok := configured["compliance_resource_id"].(string); ok && v != "" {
Expand Down