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_db_security_group: Use API provided ARN instead of manually created one #5226

Merged
merged 1 commit into from
Jul 26, 2018
Merged

resource/aws_db_security_group: Use API provided ARN instead of manually created one #5226

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
42 changes: 13 additions & 29 deletions aws/resource_aws_db_security_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import (
"time"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/arn"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/service/rds"

"github.com/hashicorp/go-multierror"
Expand All @@ -28,47 +26,47 @@ func resourceAwsDbSecurityGroup() *schema.Resource {
},

Schema: map[string]*schema.Schema{
"arn": &schema.Schema{
"arn": {
Type: schema.TypeString,
Computed: true,
},

"name": &schema.Schema{
"name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},

"description": &schema.Schema{
"description": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
Default: "Managed by Terraform",
},

"ingress": &schema.Schema{
"ingress": {
Type: schema.TypeSet,
Required: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"cidr": &schema.Schema{
"cidr": {
Type: schema.TypeString,
Optional: true,
},

"security_group_name": &schema.Schema{
"security_group_name": {
Type: schema.TypeString,
Optional: true,
Computed: true,
},

"security_group_id": &schema.Schema{
"security_group_id": {
Type: schema.TypeString,
Optional: true,
Computed: true,
},

"security_group_owner_id": &schema.Schema{
"security_group_owner_id": {
Type: schema.TypeString,
Optional: true,
Computed: true,
Expand Down Expand Up @@ -148,8 +146,8 @@ func resourceAwsDbSecurityGroupRead(d *schema.ResourceData, meta interface{}) er
return err
}

d.Set("name", *sg.DBSecurityGroupName)
d.Set("description", *sg.DBSecurityGroupDescription)
d.Set("name", sg.DBSecurityGroupName)
d.Set("description", sg.DBSecurityGroupDescription)

// Create an empty schema.Set to hold all ingress rules
rules := &schema.Set{
Expand Down Expand Up @@ -179,13 +177,7 @@ func resourceAwsDbSecurityGroupRead(d *schema.ResourceData, meta interface{}) er

conn := meta.(*AWSClient).rdsconn

arn := arn.ARN{
Partition: meta.(*AWSClient).partition,
Service: "rds",
Region: meta.(*AWSClient).region,
AccountID: meta.(*AWSClient).accountid,
Resource: fmt.Sprintf("secgrp:%s", d.Id()),
}.String()
arn := aws.StringValue(sg.DBSecurityGroupArn)
d.Set("arn", arn)
resp, err := conn.ListTagsForResource(&rds.ListTagsForResourceInput{
ResourceName: aws.String(arn),
Expand All @@ -209,14 +201,7 @@ func resourceAwsDbSecurityGroupUpdate(d *schema.ResourceData, meta interface{})

d.Partial(true)

arn := arn.ARN{
Partition: meta.(*AWSClient).partition,
Service: "rds",
Region: meta.(*AWSClient).region,
AccountID: meta.(*AWSClient).accountid,
Resource: fmt.Sprintf("secgrp:%s", d.Id()),
}.String()
if err := setTagsRDS(conn, d, arn); err != nil {
if err := setTagsRDS(conn, d, d.Get("arn").(string)); err != nil {
return err
} else {
d.SetPartial("tags")
Expand Down Expand Up @@ -273,8 +258,7 @@ func resourceAwsDbSecurityGroupDelete(d *schema.ResourceData, meta interface{})
_, err := conn.DeleteDBSecurityGroup(&opts)

if err != nil {
newerr, ok := err.(awserr.Error)
if ok && newerr.Code() == "InvalidDBSecurityGroup.NotFound" {
if isAWSErr(err, "InvalidDBSecurityGroup.NotFound", "") {
return nil
}
return err
Expand Down
2 changes: 2 additions & 0 deletions aws/resource_aws_db_security_group_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package aws
import (
"fmt"
"os"
"regexp"
"testing"

"github.com/aws/aws-sdk-go/aws"
Expand Down Expand Up @@ -32,6 +33,7 @@ func TestAccAWSDBSecurityGroup_basic(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSDBSecurityGroupExists("aws_db_security_group.bar", &v),
testAccCheckAWSDBSecurityGroupAttributes(&v),
resource.TestMatchResourceAttr("aws_db_security_group.bar", "arn", regexp.MustCompile(`^arn:[^:]+:rds:[^:]+:\d{12}:secgrp:.+`)),
resource.TestCheckResourceAttr(
"aws_db_security_group.bar", "name", rName),
resource.TestCheckResourceAttr(
Expand Down