From be7162747fc3a82ee8fe0a012be7b9122c2893af Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Fri, 1 Jul 2016 13:37:48 -0700 Subject: [PATCH] Remove unused variables --- builtin/providers/aws/resource_aws_cloudwatch_event_rule.go | 4 +--- .../aws/resource_aws_codedeploy_deployment_group.go | 6 ++---- builtin/providers/aws/resource_aws_opsworks_application.go | 4 +--- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/builtin/providers/aws/resource_aws_cloudwatch_event_rule.go b/builtin/providers/aws/resource_aws_cloudwatch_event_rule.go index 9c420e807..3181b8480 100644 --- a/builtin/providers/aws/resource_aws_cloudwatch_event_rule.go +++ b/builtin/providers/aws/resource_aws_cloudwatch_event_rule.go @@ -157,10 +157,8 @@ func resourceAwsCloudWatchEventRuleUpdate(d *schema.ResourceData, meta interface log.Printf("[DEBUG] Updating CloudWatch Event Rule: %s", input) // IAM Roles take some time to propagate - var out *events.PutRuleOutput err := resource.Retry(30*time.Second, func() *resource.RetryError { - var err error - out, err = conn.PutRule(input) + _, err := conn.PutRule(input) pattern := regexp.MustCompile("cannot be assumed by principal '[a-z]+\\.amazonaws\\.com'\\.$") if err != nil { if awsErr, ok := err.(awserr.Error); ok { diff --git a/builtin/providers/aws/resource_aws_codedeploy_deployment_group.go b/builtin/providers/aws/resource_aws_codedeploy_deployment_group.go index 2d705b712..f1bfa49ba 100644 --- a/builtin/providers/aws/resource_aws_codedeploy_deployment_group.go +++ b/builtin/providers/aws/resource_aws_codedeploy_deployment_group.go @@ -299,10 +299,8 @@ func resourceAwsCodeDeployDeploymentGroupUpdate(d *schema.ResourceData, meta int log.Printf("[DEBUG] Updating CodeDeploy DeploymentGroup %s", d.Id()) // Retry to handle IAM role eventual consistency. - var resp *codedeploy.UpdateDeploymentGroupOutput - var err error - err = resource.Retry(5*time.Minute, func() *resource.RetryError { - resp, err = conn.UpdateDeploymentGroup(&input) + err := resource.Retry(5*time.Minute, func() *resource.RetryError { + _, err := conn.UpdateDeploymentGroup(&input) if err != nil { retry := false codedeployErr, ok := err.(awserr.Error) diff --git a/builtin/providers/aws/resource_aws_opsworks_application.go b/builtin/providers/aws/resource_aws_opsworks_application.go index 07be805ee..69eb78d4e 100644 --- a/builtin/providers/aws/resource_aws_opsworks_application.go +++ b/builtin/providers/aws/resource_aws_opsworks_application.go @@ -347,10 +347,8 @@ func resourceAwsOpsworksApplicationUpdate(d *schema.ResourceData, meta interface log.Printf("[DEBUG] Updating OpsWorks layer: %s", d.Id()) - var resp *opsworks.UpdateAppOutput err := resource.Retry(2*time.Minute, func() *resource.RetryError { - var cerr error - resp, cerr = client.UpdateApp(req) + _, cerr := client.UpdateApp(req) if cerr != nil { log.Printf("[INFO] client error") if opserr, ok := cerr.(awserr.Error); ok {