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

Jump to bottom

Add support for tagging aws_dx_lag and aws_dx_connection resources #2990

Merged
merged 4 commits into from
Feb 13, 2018
Merged

Add support for tagging aws_dx_lag and aws_dx_connection resources #2990

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5281c8b
Add support for tagging aws_dx_lag and aws_dx_connection resources.
ewbankkit Jan 12, 2018
60a9812
Fix indentation for configuration generation.
Feb 13, 2018
4a2a9a2
Remove Direct Connect connection from state only if it's in 'Deleted'…
Feb 13, 2018
3a2988d
Do not remove LAG if it's in Deleting state
radeksimko Feb 13, 2018
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
112 changes: 92 additions & 20 deletions aws/resource_aws_dx_connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ package aws

import (
"fmt"
"log"
"time"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/arn"
"github.com/aws/aws-sdk-go/service/directconnect"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema"
Expand All @@ -14,79 +16,142 @@ func resourceAwsDxConnection() *schema.Resource {
return &schema.Resource{
Create: resourceAwsDxConnectionCreate,
Read: resourceAwsDxConnectionRead,
Update: resourceAwsDxConnectionUpdate,
Delete: resourceAwsDxConnectionDelete,

Schema: map[string]*schema.Schema{
"name": &schema.Schema{
"arn": {
Type: schema.TypeString,
Computed: true,
},
"name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"bandwidth": &schema.Schema{
"bandwidth": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: validateDxConnectionBandWidth,
},
"location": &schema.Schema{
"location": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"tags": tagsSchema(),
},
}
}

func resourceAwsDxConnectionCreate(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).dxconn

input := &directconnect.CreateConnectionInput{
req := &directconnect.CreateConnectionInput{
Bandwidth: aws.String(d.Get("bandwidth").(string)),
ConnectionName: aws.String(d.Get("name").(string)),
Location: aws.String(d.Get("location").(string)),
}
resp, err := conn.CreateConnection(input)

log.Printf("[DEBUG] Creating Direct Connect connection: %#v", req)
resp, err := conn.CreateConnection(req)
if err != nil {
return err
}
d.SetId(*resp.ConnectionId)
return resourceAwsDxConnectionRead(d, meta)

d.SetId(aws.StringValue(resp.ConnectionId))
return resourceAwsDxConnectionUpdate(d, meta)
}

func resourceAwsDxConnectionRead(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).dxconn

connectionId := d.Id()
input := &directconnect.DescribeConnectionsInput{
ConnectionId: aws.String(connectionId),
}
resp, err := conn.DescribeConnections(input)
resp, err := conn.DescribeConnections(&directconnect.DescribeConnectionsInput{
ConnectionId: aws.String(d.Id()),
})
if err != nil {
if isNoSuchDxConnectionErr(err) {
log.Printf("[WARN] Direct Connect connection (%s) not found, removing from state", d.Id())
d.SetId("")
return nil
}
return err
}

if len(resp.Connections) < 1 {
log.Printf("[WARN] Direct Connect connection (%s) not found, removing from state", d.Id())
d.SetId("")
return nil
}
if len(resp.Connections) != 1 {
return fmt.Errorf("[ERROR] Number of DX Connection (%s) isn't one, got %d", connectionId, len(resp.Connections))
return fmt.Errorf("[ERROR] Number of Direct Connect connections (%s) isn't one, got %d", d.Id(), len(resp.Connections))
}
if d.Id() != *resp.Connections[0].ConnectionId {
return fmt.Errorf("[ERROR] DX Connection (%s) not found", connectionId)
connection := resp.Connections[0]
if d.Id() != aws.StringValue(connection.ConnectionId) {
return fmt.Errorf("[ERROR] Direct Connect connection (%s) not found", d.Id())
}
terminalStates := map[string]bool{
directconnect.ConnectionStateDeleted: true,
directconnect.ConnectionStateDeleting: true,
directconnect.ConnectionStateRejected: true,
}
if _, ok := terminalStates[aws.StringValue(connection.ConnectionState)]; ok {
log.Printf("[WARN] Direct Connect connection (%s) not found, removing from state", d.Id())
d.SetId("")
return nil
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd be ok with removing the resource from state if it's in ConnectionStateDeleted, but I think we should keep it in the state if it's still ConnectionStateDeleting or ConnectionStateRejected. The deletion may not finish successfully and rejection != deleted resource, AFAIK?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, agreed. I'll fix.


arn := arn.ARN{
Partition: meta.(*AWSClient).partition,
Region: meta.(*AWSClient).region,
Service: "directconnect",
AccountID: meta.(*AWSClient).accountid,
Resource: fmt.Sprintf("dxcon/%s", d.Id()),
}.String()
d.Set("arn", arn)
d.Set("name", connection.ConnectionName)
d.Set("bandwidth", connection.Bandwidth)
d.Set("location", connection.Location)

if err := getTagsDX(conn, d, arn); err != nil {
return err
}

return nil
}

func resourceAwsDxConnectionUpdate(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).dxconn

arn := arn.ARN{
Partition: meta.(*AWSClient).partition,
Region: meta.(*AWSClient).region,
Service: "directconnect",
AccountID: meta.(*AWSClient).accountid,
Resource: fmt.Sprintf("dxcon/%s", d.Id()),
}.String()
if err := setTagsDX(conn, d, arn); err != nil {
return err
}

return resourceAwsDxConnectionRead(d, meta)
}

func resourceAwsDxConnectionDelete(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).dxconn

input := &directconnect.DeleteConnectionInput{
log.Printf("[DEBUG] Deleting Direct Connect connection: %s", d.Id())
_, err := conn.DeleteConnection(&directconnect.DeleteConnectionInput{
ConnectionId: aws.String(d.Id()),
}
_, err := conn.DeleteConnection(input)
})
if err != nil {
if isNoSuchDxConnectionErr(err) {
return nil
}
return err
}

deleteStateConf := &resource.StateChangeConf{
Pending: []string{directconnect.ConnectionStatePending, directconnect.ConnectionStateOrdering, directconnect.ConnectionStateAvailable, directconnect.ConnectionStateRequested, directconnect.ConnectionStateDeleting},
Target: []string{directconnect.ConnectionStateDeleted},
Expand All @@ -97,9 +162,9 @@ func resourceAwsDxConnectionDelete(d *schema.ResourceData, meta interface{}) err
}
_, err = deleteStateConf.WaitForState()
if err != nil {
return fmt.Errorf("Error waiting for Dx Connection (%s) to be deleted: %s", d.Id(), err)
return fmt.Errorf("Error waiting for Direct Connect connection (%s) to be deleted: %s", d.Id(), err)
}
d.SetId("")

return nil
}

Expand All @@ -112,6 +177,13 @@ func dxConnectionRefreshStateFunc(conn *directconnect.DirectConnect, connId stri
if err != nil {
return nil, "failed", err
}
if len(resp.Connections) < 1 {
return resp, directconnect.ConnectionStateDeleted, nil
}
return resp, *resp.Connections[0].ConnectionState, nil
}
}

func isNoSuchDxConnectionErr(err error) bool {
return isAWSErr(err, "DirectConnectClientException", "Could not find Connection with ID")
}
81 changes: 73 additions & 8 deletions aws/resource_aws_dx_connection_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,51 @@ import (
)

func TestAccAwsDxConnection_basic(t *testing.T) {
connectionName := fmt.Sprintf("tf-dx-%s", acctest.RandString(5))

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsDxConnectionDestroy,
Steps: []resource.TestStep{
{
Config: testAccDxConnectionConfig(connectionName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAwsDxConnectionExists("aws_dx_connection.hoge"),
resource.TestCheckResourceAttr("aws_dx_connection.hoge", "name", connectionName),
resource.TestCheckResourceAttr("aws_dx_connection.hoge", "bandwidth", "1Gbps"),
resource.TestCheckResourceAttr("aws_dx_connection.hoge", "location", "EqSe2"),
resource.TestCheckResourceAttr("aws_dx_connection.hoge", "tags.%", "0"),
),
},
},
})
}

func TestAccAwsDxConnection_tags(t *testing.T) {
connectionName := fmt.Sprintf("tf-dx-%s", acctest.RandString(5))

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAwsDxConnectionDestroy,
Steps: []resource.TestStep{
{
Config: testAccDxConnectionConfig(acctest.RandString(5)),
Config: testAccDxConnectionConfig_tags(connectionName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAwsDxConnectionExists("aws_dx_connection.hoge"),
resource.TestCheckResourceAttr("aws_dx_connection.hoge", "name", connectionName),
resource.TestCheckResourceAttr("aws_dx_connection.hoge", "tags.%", "2"),
resource.TestCheckResourceAttr("aws_dx_connection.hoge", "tags.Usage", "original"),
),
},
{
Config: testAccDxConnectionConfig_tagsChanged(connectionName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAwsDxConnectionExists("aws_dx_connection.hoge"),
resource.TestCheckResourceAttr("aws_dx_connection.hoge", "name", connectionName),
resource.TestCheckResourceAttr("aws_dx_connection.hoge", "tags.%", "1"),
resource.TestCheckResourceAttr("aws_dx_connection.hoge", "tags.Usage", "changed"),
),
},
},
Expand Down Expand Up @@ -63,12 +99,41 @@ func testAccCheckAwsDxConnectionExists(name string) resource.TestCheckFunc {
}
}

func testAccDxConnectionConfig(rName string) string {
func testAccDxConnectionConfig(n string) string {
return fmt.Sprintf(`
resource "aws_dx_connection" "hoge" {
name = "%s"
bandwidth = "1Gbps"
location = "EqSe2"
}
`, n)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: indentation.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

}

func testAccDxConnectionConfig_tags(n string) string {
return fmt.Sprintf(`
resource "aws_dx_connection" "hoge" {
name = "%s"
bandwidth = "1Gbps"
location = "EqSe2"

tags {
Environment = "production"
Usage = "original"
}
}
`, n)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: indentation.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

}

func testAccDxConnectionConfig_tagsChanged(n string) string {
return fmt.Sprintf(`
resource "aws_dx_connection" "hoge" {
name = "tf-dx-%s"
bandwidth = "1Gbps"
location = "EqSe2"
}
`, rName)
resource "aws_dx_connection" "hoge" {
name = "%s"
bandwidth = "1Gbps"
location = "EqSe2"

tags {
Usage = "changed"
}
}
`, n)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: indentation.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

}
Loading