From e6d1e77a9ae083f3e8765b8300a43e4ce98ca738 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 16 Aug 2016 18:03:00 -0700 Subject: [PATCH] Fix vet errors found with Go 1.7 --- builtin/providers/aws/resource_aws_db_event_subscription.go | 4 ++-- terraform/diff.go | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/builtin/providers/aws/resource_aws_db_event_subscription.go b/builtin/providers/aws/resource_aws_db_event_subscription.go index b60dc0fa4..2c2fce1ac 100644 --- a/builtin/providers/aws/resource_aws_db_event_subscription.go +++ b/builtin/providers/aws/resource_aws_db_event_subscription.go @@ -281,7 +281,7 @@ func resourceAwsDbEventSubscriptionUpdate(d *schema.ResourceData, meta interface if len(remove) > 0 { for _, removing := range remove { - log.Printf("[INFO] Removing %s as a Source Identifier from %q", removing, d.Id()) + log.Printf("[INFO] Removing %s as a Source Identifier from %q", *removing, d.Id()) _, err := rdsconn.RemoveSourceIdentifierFromSubscription(&rds.RemoveSourceIdentifierFromSubscriptionInput{ SourceIdentifier: removing, SubscriptionName: aws.String(d.Id()), @@ -294,7 +294,7 @@ func resourceAwsDbEventSubscriptionUpdate(d *schema.ResourceData, meta interface if len(add) > 0 { for _, adding := range add { - log.Printf("[INFO] Adding %s as a Source Identifier to %q", adding, d.Id()) + log.Printf("[INFO] Adding %s as a Source Identifier to %q", *adding, d.Id()) _, err := rdsconn.AddSourceIdentifierToSubscription(&rds.AddSourceIdentifierToSubscriptionInput{ SourceIdentifier: adding, SubscriptionName: aws.String(d.Id()), diff --git a/terraform/diff.go b/terraform/diff.go index 5de15a24a..351a3c48d 100644 --- a/terraform/diff.go +++ b/terraform/diff.go @@ -365,7 +365,11 @@ func (d *InstanceDiff) Empty() bool { } func (d *InstanceDiff) GoString() string { - return fmt.Sprintf("*%#v", *d) + return fmt.Sprintf("*%#v", InstanceDiff{ + Attributes: d.Attributes, + Destroy: d.Destroy, + DestroyTainted: d.DestroyTainted, + }) } // RequiresNew returns true if the diff requires the creation of a new