From e149a976587480c614738961397e2454839de39c Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Wed, 18 Feb 2015 18:26:59 +0000 Subject: [PATCH 1/2] Make composite literals to use keyed fields This will prevent following error: - * composite literal uses unkeyed fields --- builtin/providers/aws/resource_aws_autoscaling_group.go | 2 +- builtin/providers/aws/resource_aws_db_subnet_group_test.go | 6 ++++-- builtin/providers/aws/resource_aws_eip.go | 2 +- builtin/providers/aws/resource_aws_internet_gateway.go | 2 +- builtin/providers/aws/resource_aws_network_acl.go | 4 ++-- builtin/providers/aws/resource_aws_security_group.go | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/builtin/providers/aws/resource_aws_autoscaling_group.go b/builtin/providers/aws/resource_aws_autoscaling_group.go index d51e47865..e5ef587a0 100644 --- a/builtin/providers/aws/resource_aws_autoscaling_group.go +++ b/builtin/providers/aws/resource_aws_autoscaling_group.go @@ -336,7 +336,7 @@ func resourceAwsAutoscalingGroupDrain(d *schema.ResourceData, meta interface{}) return resource.Retry(10*time.Minute, func() error { g, err := getAwsAutoscalingGroup(d, meta) if err != nil { - return resource.RetryError{err} + return resource.RetryError{Err: err} } if g == nil { return nil diff --git a/builtin/providers/aws/resource_aws_db_subnet_group_test.go b/builtin/providers/aws/resource_aws_db_subnet_group_test.go index ac9382c23..782af1602 100644 --- a/builtin/providers/aws/resource_aws_db_subnet_group_test.go +++ b/builtin/providers/aws/resource_aws_db_subnet_group_test.go @@ -42,7 +42,8 @@ func testAccCheckDBSubnetGroupDestroy(s *terraform.State) error { } // Try to find the resource - resp, err := conn.DescribeDBSubnetGroups(&rds.DescribeDBSubnetGroups{rs.Primary.ID}) + resp, err := conn.DescribeDBSubnetGroups( + &rds.DescribeDBSubnetGroups{DBSubnetGroupName: rs.Primary.ID}) if err == nil { if len(resp.DBSubnetGroups) > 0 { return fmt.Errorf("still exist.") @@ -76,7 +77,8 @@ func testAccCheckDBSubnetGroupExists(n string, v *rds.DBSubnetGroup) resource.Te } conn := testAccProvider.Meta().(*AWSClient).rdsconn - resp, err := conn.DescribeDBSubnetGroups(&rds.DescribeDBSubnetGroups{rs.Primary.ID}) + resp, err := conn.DescribeDBSubnetGroups( + &rds.DescribeDBSubnetGroups{DBSubnetGroupName: rs.Primary.ID}) if err != nil { return err } diff --git a/builtin/providers/aws/resource_aws_eip.go b/builtin/providers/aws/resource_aws_eip.go index 8f86941e0..8a56e1de9 100644 --- a/builtin/providers/aws/resource_aws_eip.go +++ b/builtin/providers/aws/resource_aws_eip.go @@ -219,7 +219,7 @@ func resourceAwsEipDelete(d *schema.ResourceData, meta interface{}) error { return nil } if _, ok := err.(*ec2.Error); !ok { - return resource.RetryError{err} + return resource.RetryError{Err: err} } return err diff --git a/builtin/providers/aws/resource_aws_internet_gateway.go b/builtin/providers/aws/resource_aws_internet_gateway.go index 91eb7125c..39aed079d 100644 --- a/builtin/providers/aws/resource_aws_internet_gateway.go +++ b/builtin/providers/aws/resource_aws_internet_gateway.go @@ -124,7 +124,7 @@ func resourceAwsInternetGatewayDelete(d *schema.ResourceData, meta interface{}) return err // retry } - return resource.RetryError{err} + return resource.RetryError{Err: err} }) } diff --git a/builtin/providers/aws/resource_aws_network_acl.go b/builtin/providers/aws/resource_aws_network_acl.go index cbc3af42d..efafd7ffe 100644 --- a/builtin/providers/aws/resource_aws_network_acl.go +++ b/builtin/providers/aws/resource_aws_network_acl.go @@ -268,10 +268,10 @@ func resourceAwsNetworkAclDelete(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("Dependency violation: Cannot delete acl %s: %s", d.Id(), err) } _, err = ec2conn.ReplaceNetworkAclAssociation(association.NetworkAclAssociationId, defaultAcl.NetworkAclId) - return resource.RetryError{err} + return resource.RetryError{Err: err} default: // Any other error, we want to quit the retry loop immediately - return resource.RetryError{err} + return resource.RetryError{Err: err} } } log.Printf("[Info] Deleted network ACL %s successfully", d.Id()) diff --git a/builtin/providers/aws/resource_aws_security_group.go b/builtin/providers/aws/resource_aws_security_group.go index da46c4f91..85893af65 100644 --- a/builtin/providers/aws/resource_aws_security_group.go +++ b/builtin/providers/aws/resource_aws_security_group.go @@ -380,7 +380,7 @@ func resourceAwsSecurityGroupDelete(d *schema.ResourceData, meta interface{}) er return err default: // Any other error, we want to quit the retry loop immediately - return resource.RetryError{err} + return resource.RetryError{Err: err} } } From 6c8dd9e8fa4f5f24ad727ab70ee33fcaba919ba1 Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Wed, 18 Feb 2015 18:25:07 +0000 Subject: [PATCH 2/2] Unreachable code removed --- command/remote.go | 6 ++---- remote/atlas.go | 5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/command/remote.go b/command/remote.go index d9a773704..6567d8037 100644 --- a/command/remote.go +++ b/command/remote.go @@ -109,11 +109,9 @@ func (c *RemoteCommand) Run(args []string) int { case !haveLocal && haveNonManaged: // Enable remote state management return c.enableRemoteState() - - default: - panic("unhandled case") } - return 0 + + panic("unhandled case") } // disableRemoteState is used to disable remote state management, diff --git a/remote/atlas.go b/remote/atlas.go index 6d7e22164..468adca56 100644 --- a/remote/atlas.go +++ b/remote/atlas.go @@ -213,10 +213,9 @@ func (c *AtlasRemoteClient) DeleteState() error { return ErrInvalidAuth case http.StatusInternalServerError: return ErrRemoteInternal - default: - return fmt.Errorf("Unexpected HTTP response code %d", resp.StatusCode) } - return nil + + return fmt.Errorf("Unexpected HTTP response code %d", resp.StatusCode) } func (c *AtlasRemoteClient) url() *url.URL {