From e4214a998380e6872e01d8d6a0d6b9a45b91509d Mon Sep 17 00:00:00 2001 From: Peter Beams Date: Tue, 17 Mar 2015 13:00:36 +0000 Subject: [PATCH] ran go fmt and made 1 fix after running tests again --- .../aws/resource_aws_network_interface.go | 89 ++++++++++--------- .../resource_aws_network_interface_test.go | 41 +++++---- builtin/providers/aws/structure.go | 16 ++-- builtin/providers/aws/structure_test.go | 24 ++--- 4 files changed, 85 insertions(+), 85 deletions(-) diff --git a/builtin/providers/aws/resource_aws_network_interface.go b/builtin/providers/aws/resource_aws_network_interface.go index f82bdc69b..c4829f4b8 100644 --- a/builtin/providers/aws/resource_aws_network_interface.go +++ b/builtin/providers/aws/resource_aws_network_interface.go @@ -1,17 +1,17 @@ package aws import ( - "bytes" + "bytes" "fmt" "log" "strconv" "time" - + "github.com/hashicorp/aws-sdk-go/aws" - "github.com/hashicorp/terraform/helper/hashcode" + "github.com/hashicorp/aws-sdk-go/gen/ec2" + "github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/schema" - "github.com/hashicorp/aws-sdk-go/gen/ec2" ) func resourceAwsNetworkInterface() *schema.Resource { @@ -21,18 +21,18 @@ func resourceAwsNetworkInterface() *schema.Resource { Update: resourceAwsNetworkInterfaceUpdate, Delete: resourceAwsNetworkInterfaceDelete, - Schema: map[string]*schema.Schema{ - + Schema: map[string]*schema.Schema{ + "subnet_id": &schema.Schema{ Type: schema.TypeString, - Required: true, + Required: true, ForceNew: true, }, "private_ips": &schema.Schema{ Type: schema.TypeSet, Optional: true, - ForceNew: true, + ForceNew: true, Elem: &schema.Schema{Type: schema.TypeString}, Set: func(v interface{}) int { return hashcode.String(v.(string)) @@ -42,7 +42,7 @@ func resourceAwsNetworkInterface() *schema.Resource { "security_groups": &schema.Schema{ Type: schema.TypeSet, Optional: true, - Computed: true, + Computed: true, Elem: &schema.Schema{Type: schema.TypeString}, Set: func(v interface{}) int { return hashcode.String(v.(string)) @@ -63,29 +63,29 @@ func resourceAwsNetworkInterface() *schema.Resource { Required: true, }, "attachment_id": &schema.Schema{ - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, }, }, }, Set: resourceAwsEniAttachmentHash, }, - "tags": tagsSchema(), + "tags": tagsSchema(), }, } } func resourceAwsNetworkInterfaceCreate(d *schema.ResourceData, meta interface{}) error { - + ec2conn := meta.(*AWSClient).ec2conn - request := &ec2.CreateNetworkInterfaceRequest{ - Groups: expandStringList(d.Get("security_groups").(*schema.Set).List()), - SubnetID: aws.String(d.Get("subnet_id").(string)), - PrivateIPAddresses: expandPrivateIPAddesses(d.Get("private_ips").(*schema.Set).List()), + request := &ec2.CreateNetworkInterfaceRequest{ + Groups: expandStringList(d.Get("security_groups").(*schema.Set).List()), + SubnetID: aws.String(d.Get("subnet_id").(string)), + PrivateIPAddresses: expandPrivateIPAddesses(d.Get("private_ips").(*schema.Set).List()), } - + log.Printf("[DEBUG] Creating network interface") resp, err := ec2conn.CreateNetworkInterface(request) if err != nil { @@ -95,14 +95,14 @@ func resourceAwsNetworkInterfaceCreate(d *schema.ResourceData, meta interface{}) d.SetId(*resp.NetworkInterface.NetworkInterfaceID) log.Printf("[INFO] ENI ID: %s", d.Id()) - return resourceAwsNetworkInterfaceUpdate(d, meta) + return resourceAwsNetworkInterfaceUpdate(d, meta) } func resourceAwsNetworkInterfaceRead(d *schema.ResourceData, meta interface{}) error { ec2conn := meta.(*AWSClient).ec2conn - describe_network_interfaces_request := &ec2.DescribeNetworkInterfacesRequest{ - NetworkInterfaceIDs: []string{d.Id()}, + describe_network_interfaces_request := &ec2.DescribeNetworkInterfacesRequest{ + NetworkInterfaceIDs: []string{d.Id()}, } describeResp, err := ec2conn.DescribeNetworkInterfaces(describe_network_interfaces_request) @@ -112,7 +112,7 @@ func resourceAwsNetworkInterfaceRead(d *schema.ResourceData, meta interface{}) e d.SetId("") return nil } - + return fmt.Errorf("Error retrieving ENI: %s", err) } if len(describeResp.NetworkInterfaces) != 1 { @@ -125,41 +125,42 @@ func resourceAwsNetworkInterfaceRead(d *schema.ResourceData, meta interface{}) e d.Set("security_groups", flattenGroupIdentifiers(eni.Groups)) if eni.Attachment != nil { - d.Set("attachment", flattenAttachment(eni.Attachment)) + attachment := []map[string]interface{} { flattenAttachment(eni.Attachment) } + d.Set("attachment", attachment) } else { d.Set("attachment", nil) } - + return nil } func networkInterfaceAttachmentRefreshFunc(ec2conn *ec2.EC2, id string) resource.StateRefreshFunc { return func() (interface{}, string, error) { - describe_network_interfaces_request := &ec2.DescribeNetworkInterfacesRequest{ - NetworkInterfaceIDs: []string{id}, + describe_network_interfaces_request := &ec2.DescribeNetworkInterfacesRequest{ + NetworkInterfaceIDs: []string{id}, } describeResp, err := ec2conn.DescribeNetworkInterfaces(describe_network_interfaces_request) - if err != nil { - log.Printf("[ERROR] Could not find network interface %s. %s", id, err) + if err != nil { + log.Printf("[ERROR] Could not find network interface %s. %s", id, err) return nil, "", err } eni := describeResp.NetworkInterfaces[0] - hasAttachment := strconv.FormatBool(eni.Attachment != nil) - log.Printf("[DEBUG] ENI %s has attachment state %s", id, hasAttachment) + hasAttachment := strconv.FormatBool(eni.Attachment != nil) + log.Printf("[DEBUG] ENI %s has attachment state %s", id, hasAttachment) return eni, hasAttachment, nil } } func resourceAwsNetworkInterfaceDetach(oa *schema.Set, meta interface{}, eniId string) error { // if there was an old attachment, remove it - if oa != nil && len(oa.List()) > 0 { + if oa != nil && len(oa.List()) > 0 { old_attachment := oa.List()[0].(map[string]interface{}) detach_request := &ec2.DetachNetworkInterfaceRequest{ - AttachmentID: aws.String(old_attachment["attachment_id"].(string)), - Force: aws.Boolean(true), + AttachmentID: aws.String(old_attachment["attachment_id"].(string)), + Force: aws.Boolean(true), } ec2conn := meta.(*AWSClient).ec2conn detach_err := ec2conn.DetachNetworkInterface(detach_request) @@ -175,9 +176,9 @@ func resourceAwsNetworkInterfaceDetach(oa *schema.Set, meta interface{}, eniId s Timeout: 10 * time.Minute, } if _, err := stateConf.WaitForState(); err != nil { - return fmt.Errorf( - "Error waiting for ENI (%s) to become dettached: %s", eniId, err) - } + return fmt.Errorf( + "Error waiting for ENI (%s) to become dettached: %s", eniId, err) + } } return nil @@ -189,20 +190,20 @@ func resourceAwsNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{}) if d.HasChange("attachment") { ec2conn := meta.(*AWSClient).ec2conn - oa, na := d.GetChange("attachment") - + oa, na := d.GetChange("attachment") + detach_err := resourceAwsNetworkInterfaceDetach(oa.(*schema.Set), meta, d.Id()) if detach_err != nil { return detach_err } // if there is a new attachment, attach it - if na != nil && len(na.(*schema.Set).List()) > 0 { + if na != nil && len(na.(*schema.Set).List()) > 0 { new_attachment := na.(*schema.Set).List()[0].(map[string]interface{}) attach_request := &ec2.AttachNetworkInterfaceRequest{ - DeviceIndex: aws.Integer(new_attachment["device_index"].(int)), - InstanceID: aws.String(new_attachment["instance"].(string)), - NetworkInterfaceID: aws.String(d.Id()), + DeviceIndex: aws.Integer(new_attachment["device_index"].(int)), + InstanceID: aws.String(new_attachment["instance"].(string)), + NetworkInterfaceID: aws.String(d.Id()), } _, attach_err := ec2conn.AttachNetworkInterface(attach_request) if attach_err != nil { @@ -215,8 +216,8 @@ func resourceAwsNetworkInterfaceUpdate(d *schema.ResourceData, meta interface{}) if d.HasChange("security_groups") { request := &ec2.ModifyNetworkInterfaceAttributeRequest{ - NetworkInterfaceID: aws.String(d.Id()), - Groups: expandStringList(d.Get("security_groups").(*schema.Set).List()), + NetworkInterfaceID: aws.String(d.Id()), + Groups: expandStringList(d.Get("security_groups").(*schema.Set).List()), } ec2conn := meta.(*AWSClient).ec2conn diff --git a/builtin/providers/aws/resource_aws_network_interface_test.go b/builtin/providers/aws/resource_aws_network_interface_test.go index 1478c289e..413533e56 100644 --- a/builtin/providers/aws/resource_aws_network_interface_test.go +++ b/builtin/providers/aws/resource_aws_network_interface_test.go @@ -1,7 +1,7 @@ package aws -import ( - "fmt" +import ( + "fmt" "testing" "github.com/hashicorp/aws-sdk-go/aws" @@ -12,7 +12,7 @@ import ( func TestAccAWSENI_basic(t *testing.T) { var conf ec2.NetworkInterface - + resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, @@ -22,7 +22,7 @@ func TestAccAWSENI_basic(t *testing.T) { Config: testAccAWSENIConfig, Check: resource.ComposeTestCheckFunc( testAccCheckAWSENIExists("aws_network_interface.bar", &conf), - testAccCheckAWSENIAttributes(&conf), + testAccCheckAWSENIAttributes(&conf), resource.TestCheckResourceAttr( "aws_network_interface.bar", "private_ips.#", "1"), resource.TestCheckResourceAttr( @@ -35,7 +35,7 @@ func TestAccAWSENI_basic(t *testing.T) { func TestAccAWSENI_attached(t *testing.T) { var conf ec2.NetworkInterface - + resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, @@ -45,7 +45,7 @@ func TestAccAWSENI_attached(t *testing.T) { Config: testAccAWSENIConfigWithAttachment, Check: resource.ComposeTestCheckFunc( testAccCheckAWSENIExists("aws_network_interface.bar", &conf), - testAccCheckAWSENIAttributesWithAttachment(&conf), + testAccCheckAWSENIAttributesWithAttachment(&conf), resource.TestCheckResourceAttr( "aws_network_interface.bar", "private_ips.#", "1"), resource.TestCheckResourceAttr( @@ -57,7 +57,7 @@ func TestAccAWSENI_attached(t *testing.T) { } func testAccCheckAWSENIExists(n string, res *ec2.NetworkInterface) resource.TestCheckFunc { - return func(s *terraform.State) error { + return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { return fmt.Errorf("Not found: %s", n) @@ -68,8 +68,8 @@ func testAccCheckAWSENIExists(n string, res *ec2.NetworkInterface) resource.Test } ec2conn := testAccProvider.Meta().(*AWSClient).ec2conn - describe_network_interfaces_request := &ec2.DescribeNetworkInterfacesRequest{ - NetworkInterfaceIDs: []string{rs.Primary.ID}, + describe_network_interfaces_request := &ec2.DescribeNetworkInterfacesRequest{ + NetworkInterfaceIDs: []string{rs.Primary.ID}, } describeResp, err := ec2conn.DescribeNetworkInterfaces(describe_network_interfaces_request) @@ -90,9 +90,9 @@ func testAccCheckAWSENIExists(n string, res *ec2.NetworkInterface) resource.Test func testAccCheckAWSENIAttributes(conf *ec2.NetworkInterface) resource.TestCheckFunc { return func(s *terraform.State) error { - + if conf.Attachment != nil { - return fmt.Errorf("expected attachment to be nil") + return fmt.Errorf("expected attachment to be nil") } if *conf.AvailabilityZone != "us-west-2a" { @@ -108,18 +108,18 @@ func testAccCheckAWSENIAttributes(conf *ec2.NetworkInterface) resource.TestCheck } return nil - } + } } func testAccCheckAWSENIAttributesWithAttachment(conf *ec2.NetworkInterface) resource.TestCheckFunc { return func(s *terraform.State) error { - + if conf.Attachment == nil { - return fmt.Errorf("expected attachment to be set, but was nil") + return fmt.Errorf("expected attachment to be set, but was nil") } if *conf.Attachment.DeviceIndex != 1 { - return fmt.Errorf("expected attachment device index to be 1, but was %d", *conf.Attachment.DeviceIndex) + return fmt.Errorf("expected attachment device index to be 1, but was %d", *conf.Attachment.DeviceIndex) } if *conf.AvailabilityZone != "us-west-2a" { @@ -135,7 +135,7 @@ func testAccCheckAWSENIAttributesWithAttachment(conf *ec2.NetworkInterface) reso } return nil - } + } } func testAccCheckAWSENIDestroy(s *terraform.State) error { @@ -145,8 +145,8 @@ func testAccCheckAWSENIDestroy(s *terraform.State) error { } ec2conn := testAccProvider.Meta().(*AWSClient).ec2conn - describe_network_interfaces_request := &ec2.DescribeNetworkInterfacesRequest{ - NetworkInterfaceIDs: []string{rs.Primary.ID}, + describe_network_interfaces_request := &ec2.DescribeNetworkInterfacesRequest{ + NetworkInterfaceIDs: []string{rs.Primary.ID}, } _, err := ec2conn.DescribeNetworkInterfaces(describe_network_interfaces_request) @@ -156,13 +156,12 @@ func testAccCheckAWSENIDestroy(s *terraform.State) error { } return err - } + } } return nil } - const testAccAWSENIConfig = ` resource "aws_vpc" "foo" { cidr_block = "172.16.0.0/16" @@ -233,4 +232,4 @@ resource "aws_network_interface" "bar" { Name = "bar_interface" } } -` \ No newline at end of file +` diff --git a/builtin/providers/aws/structure.go b/builtin/providers/aws/structure.go index 2855506df..09d8a10be 100644 --- a/builtin/providers/aws/structure.go +++ b/builtin/providers/aws/structure.go @@ -221,21 +221,21 @@ func expandPrivateIPAddesses(ips []interface{}) []ec2.PrivateIPAddressSpecificat dtos := make([]ec2.PrivateIPAddressSpecification, 0, len(ips)) for i, v := range ips { new_private_ip := ec2.PrivateIPAddressSpecification{ - PrivateIPAddress: aws.String(v.(string)), - } - + PrivateIPAddress: aws.String(v.(string)), + } + new_private_ip.Primary = aws.Boolean(i == 0) - + dtos = append(dtos, new_private_ip) } return dtos } //Flattens network interface attachment into a map[string]interface -func flattenAttachment(a *ec2.NetworkInterfaceAttachment) map[string]interface{} { - att := make(map[string]interface{}) +func flattenAttachment(a *ec2.NetworkInterfaceAttachment) map[string]interface{} { + att := make(map[string]interface{}) att["instance"] = *a.InstanceID att["device_index"] = *a.DeviceIndex - att["attachment_id"] = *a.AttachmentID + att["attachment_id"] = *a.AttachmentID return att -} \ No newline at end of file +} diff --git a/builtin/providers/aws/structure_test.go b/builtin/providers/aws/structure_test.go index 84a7ad09d..bc5cf68e4 100644 --- a/builtin/providers/aws/structure_test.go +++ b/builtin/providers/aws/structure_test.go @@ -271,9 +271,9 @@ func TestExpandInstanceString(t *testing.T) { } func TestFlattenNetworkInterfacesPrivateIPAddesses(t *testing.T) { - expanded := []ec2.NetworkInterfacePrivateIPAddress { - ec2.NetworkInterfacePrivateIPAddress { PrivateIPAddress: aws.String("192.168.0.1") }, - ec2.NetworkInterfacePrivateIPAddress { PrivateIPAddress: aws.String("192.168.0.2") }, + expanded := []ec2.NetworkInterfacePrivateIPAddress{ + ec2.NetworkInterfacePrivateIPAddress{PrivateIPAddress: aws.String("192.168.0.1")}, + ec2.NetworkInterfacePrivateIPAddress{PrivateIPAddress: aws.String("192.168.0.2")}, } result := flattenNetworkInterfacesPrivateIPAddesses(expanded) @@ -296,9 +296,9 @@ func TestFlattenNetworkInterfacesPrivateIPAddesses(t *testing.T) { } func TestFlattenGroupIdentifiers(t *testing.T) { - expanded := []ec2.GroupIdentifier { - ec2.GroupIdentifier { GroupID: aws.String("sg-001") }, - ec2.GroupIdentifier { GroupID: aws.String("sg-002") }, + expanded := []ec2.GroupIdentifier{ + ec2.GroupIdentifier{GroupID: aws.String("sg-001")}, + ec2.GroupIdentifier{GroupID: aws.String("sg-002")}, } result := flattenGroupIdentifiers(expanded) @@ -317,10 +317,10 @@ func TestFlattenGroupIdentifiers(t *testing.T) { } func TestExpandPrivateIPAddesses(t *testing.T) { - + ip1 := "192.168.0.1" ip2 := "192.168.0.2" - flattened := []interface{} { + flattened := []interface{}{ ip1, ip2, } @@ -330,7 +330,7 @@ func TestExpandPrivateIPAddesses(t *testing.T) { if len(result) != 2 { t.Fatalf("expected result had %d elements, but got %d", 2, len(result)) } - + if *result[0].PrivateIPAddress != "192.168.0.1" || !*result[0].Primary { t.Fatalf("expected ip to be 192.168.0.1 and Primary, but got %v, %b", *result[0].PrivateIPAddress, *result[0].Primary) } @@ -342,8 +342,8 @@ func TestExpandPrivateIPAddesses(t *testing.T) { func TestFlattenAttachment(t *testing.T) { expanded := &ec2.NetworkInterfaceAttachment{ - InstanceID: aws.String("i-00001"), - DeviceIndex: aws.Integer(1), + InstanceID: aws.String("i-00001"), + DeviceIndex: aws.Integer(1), AttachmentID: aws.String("at-002"), } @@ -364,4 +364,4 @@ func TestFlattenAttachment(t *testing.T) { if result["attachment_id"] != "at-002" { t.Fatalf("expected attachment_id to be at-002, but got %s", result["attachment_id"]) } -} \ No newline at end of file +}