Reconcile Magician formatting changes due to Go tools upgrade (hashicorp#347)

modular-magician · rileykarson · commit 4870eae80114 · 2019-01-14T09:40:25.000-08:00
Reconcile Magician formatting changes due to Go tools upgrade
diff --git a/google-beta/access_context_manager_operation.go b/google-beta/access_context_manager_operation.go
@@ -1,7 +1,7 @@
 package google
 
 import (
-	"google.golang.org/api/accesscontextmanager/v1beta"
+	accesscontextmanager "google.golang.org/api/accesscontextmanager/v1beta"
 )
 
 type AccessContextManagerOperationWaiter struct {
diff --git a/google-beta/config.go b/google-beta/config.go
@@ -13,7 +13,7 @@ import (
 
 	"golang.org/x/oauth2"
 	googleoauth "golang.org/x/oauth2/google"
-	"google.golang.org/api/accesscontextmanager/v1beta"
+	accesscontextmanager "google.golang.org/api/accesscontextmanager/v1beta"
 	appengine "google.golang.org/api/appengine/v1"
 	"google.golang.org/api/bigquery/v2"
 	"google.golang.org/api/cloudbilling/v1"
@@ -23,27 +23,27 @@ import (
 	"google.golang.org/api/cloudkms/v1"
 	"google.golang.org/api/cloudresourcemanager/v1"
 	resourceManagerV2Beta1 "google.golang.org/api/cloudresourcemanager/v2beta1"
-	"google.golang.org/api/composer/v1beta1"
+	composer "google.golang.org/api/composer/v1beta1"
 	computeBeta "google.golang.org/api/compute/v0.beta"
 	"google.golang.org/api/compute/v1"
 	"google.golang.org/api/container/v1"
 	containerBeta "google.golang.org/api/container/v1beta1"
-	"google.golang.org/api/dataflow/v1b3"
+	dataflow "google.golang.org/api/dataflow/v1b3"
 	"google.golang.org/api/dataproc/v1"
 	"google.golang.org/api/dns/v1"
 	dnsBeta "google.golang.org/api/dns/v1beta2"
 	file "google.golang.org/api/file/v1beta1"
 	"google.golang.org/api/iam/v1"
 	cloudlogging "google.golang.org/api/logging/v2"
 	"google.golang.org/api/pubsub/v1"
-	"google.golang.org/api/redis/v1beta1"
-	"google.golang.org/api/runtimeconfig/v1beta1"
+	redis "google.golang.org/api/redis/v1beta1"
+	runtimeconfig "google.golang.org/api/runtimeconfig/v1beta1"
 	"google.golang.org/api/servicemanagement/v1"
-	"google.golang.org/api/servicenetworking/v1beta"
-	"google.golang.org/api/serviceusage/v1beta1"
+	servicenetworking "google.golang.org/api/servicenetworking/v1beta"
+	serviceusage "google.golang.org/api/serviceusage/v1beta1"
 	"google.golang.org/api/sourcerepo/v1"
 	"google.golang.org/api/spanner/v1"
-	"google.golang.org/api/sqladmin/v1beta4"
+	sqladmin "google.golang.org/api/sqladmin/v1beta4"
 	"google.golang.org/api/storage/v1"
 	"google.golang.org/api/storagetransfer/v1"
 )
diff --git a/google-beta/resource_composer_environment.go b/google-beta/resource_composer_environment.go
@@ -7,10 +7,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/go-version"
+	version "github.com/hashicorp/go-version"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
-	"google.golang.org/api/composer/v1beta1"
+	composer "google.golang.org/api/composer/v1beta1"
 )
 
 const (
diff --git a/google-beta/resource_composer_environment_test.go b/google-beta/resource_composer_environment_test.go
@@ -8,11 +8,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/go-multierror"
+	multierror "github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/terraform/helper/acctest"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
-	"google.golang.org/api/composer/v1beta1"
+	composer "google.golang.org/api/composer/v1beta1"
 	"google.golang.org/api/storage/v1"
 )
 
diff --git a/google-beta/resource_compute_address.go b/google-beta/resource_compute_address.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 func resourceComputeAddress() *schema.Resource {
diff --git a/google-beta/resource_compute_autoscaler.go b/google-beta/resource_compute_autoscaler.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 func resourceComputeAutoscaler() *schema.Resource {
diff --git a/google-beta/resource_compute_backend_bucket.go b/google-beta/resource_compute_backend_bucket.go
@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 func resourceComputeBackendBucket() *schema.Resource {
diff --git a/google-beta/resource_compute_disk.go b/google-beta/resource_compute_disk.go
@@ -25,7 +25,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/customdiff"
 	"github.com/hashicorp/terraform/helper/schema"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 	"google.golang.org/api/googleapi"
 )
 
diff --git a/google-beta/resource_compute_firewall.go b/google-beta/resource_compute_firewall.go
@@ -26,7 +26,7 @@ import (
 	"github.com/hashicorp/terraform/helper/hashcode"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 func resourceComputeFirewallRuleHash(v interface{}) int {
diff --git a/google-beta/resource_compute_forwarding_rule.go b/google-beta/resource_compute_forwarding_rule.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 func resourceComputeForwardingRule() *schema.Resource {
diff --git a/google-beta/resource_compute_global_address.go b/google-beta/resource_compute_global_address.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 func resourceComputeGlobalAddress() *schema.Resource {
diff --git a/google-beta/resource_compute_health_check.go b/google-beta/resource_compute_health_check.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 func resourceComputeHealthCheck() *schema.Resource {
diff --git a/google-beta/resource_compute_http_health_check.go b/google-beta/resource_compute_http_health_check.go
@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 func resourceComputeHttpHealthCheck() *schema.Resource {
diff --git a/google-beta/resource_compute_https_health_check.go b/google-beta/resource_compute_https_health_check.go
@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 func resourceComputeHttpsHealthCheck() *schema.Resource {
diff --git a/google-beta/resource_compute_image.go b/google-beta/resource_compute_image.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 func resourceComputeImage() *schema.Resource {
diff --git a/google-beta/resource_compute_interconnect_attachment.go b/google-beta/resource_compute_interconnect_attachment.go
@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 func resourceComputeInterconnectAttachment() *schema.Resource {
diff --git a/google-beta/resource_compute_region_autoscaler.go b/google-beta/resource_compute_region_autoscaler.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 func resourceComputeRegionAutoscaler() *schema.Resource {
diff --git a/google-beta/resource_compute_region_disk.go b/google-beta/resource_compute_region_disk.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/customdiff"
 	"github.com/hashicorp/terraform/helper/schema"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 	"google.golang.org/api/googleapi"
 )
 
diff --git a/google-beta/resource_compute_route.go b/google-beta/resource_compute_route.go
@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 func resourceComputeRoute() *schema.Resource {
diff --git a/google-beta/resource_compute_router.go b/google-beta/resource_compute_router.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 func resourceComputeRouter() *schema.Resource {
diff --git a/google-beta/resource_compute_snapshot.go b/google-beta/resource_compute_snapshot.go
@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 func resourceComputeSnapshot() *schema.Resource {
diff --git a/google-beta/resource_compute_ssl_certificate.go b/google-beta/resource_compute_ssl_certificate.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 func resourceComputeSslCertificate() *schema.Resource {
diff --git a/google-beta/resource_compute_ssl_policy.go b/google-beta/resource_compute_ssl_policy.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 func sslPolicyCustomizeDiff(diff *schema.ResourceDiff, v interface{}) error {
diff --git a/google-beta/resource_compute_subnetwork.go b/google-beta/resource_compute_subnetwork.go
@@ -25,7 +25,7 @@ import (
 	"github.com/apparentlymart/go-cidr/cidr"
 	"github.com/hashicorp/terraform/helper/customdiff"
 	"github.com/hashicorp/terraform/helper/schema"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 // Whether the IP CIDR change shrinks the block.
diff --git a/google-beta/resource_compute_target_http_proxy.go b/google-beta/resource_compute_target_http_proxy.go
@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 func resourceComputeTargetHttpProxy() *schema.Resource {
diff --git a/google-beta/resource_compute_target_https_proxy.go b/google-beta/resource_compute_target_https_proxy.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 func resourceComputeTargetHttpsProxy() *schema.Resource {
diff --git a/google-beta/resource_compute_target_ssl_proxy.go b/google-beta/resource_compute_target_ssl_proxy.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 func resourceComputeTargetSslProxy() *schema.Resource {
diff --git a/google-beta/resource_compute_target_tcp_proxy.go b/google-beta/resource_compute_target_tcp_proxy.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 func resourceComputeTargetTcpProxy() *schema.Resource {
diff --git a/google-beta/resource_compute_url_map.go b/google-beta/resource_compute_url_map.go
@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 func resourceComputeUrlMap() *schema.Resource {
diff --git a/google-beta/resource_compute_vpn_gateway.go b/google-beta/resource_compute_vpn_gateway.go
@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 func resourceComputeVpnGateway() *schema.Resource {
diff --git a/google-beta/resource_compute_vpn_tunnel.go b/google-beta/resource_compute_vpn_tunnel.go
@@ -25,7 +25,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	compute "google.golang.org/api/compute/v1"
+	"google.golang.org/api/compute/v1"
 )
 
 // validatePeerAddr returns false if a tunnel's peer_ip property
diff --git a/google-beta/resource_container_cluster.go b/google-beta/resource_container_cluster.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/errwrap"
-	"github.com/hashicorp/go-version"
+	version "github.com/hashicorp/go-version"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
diff --git a/google-beta/resource_service_networking_connection.go b/google-beta/resource_service_networking_connection.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	"google.golang.org/api/servicenetworking/v1beta"
+	servicenetworking "google.golang.org/api/servicenetworking/v1beta"
 )
 
 func resourceServiceNetworkingConnection() *schema.Resource {
diff --git a/google-beta/resource_sql_database_instance_test.go b/google-beta/resource_sql_database_instance_test.go
@@ -9,8 +9,7 @@ import (
 	"github.com/hashicorp/terraform/helper/acctest"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
-
-	"google.golang.org/api/sqladmin/v1beta4"
+	sqladmin "google.golang.org/api/sqladmin/v1beta4"
 )
 
 // Fields that should be ignored in import tests because they aren't returned
diff --git a/google-beta/service_networking_operation.go b/google-beta/service_networking_operation.go
@@ -1,7 +1,7 @@
 package google
 
 import (
-	"google.golang.org/api/servicenetworking/v1beta"
+	servicenetworking "google.golang.org/api/servicenetworking/v1beta"
 )
 
 type ServiceNetworkingOperationWaiter struct {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package google`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "google.golang.org/api/accesscontextmanager/v1beta"`
	`4`	`+ accesscontextmanager "google.golang.org/api/accesscontextmanager/v1beta"`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`type AccessContextManagerOperationWaiter struct {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`
`23`	`23`	`"github.com/hashicorp/terraform/helper/schema"`
`24`	`24`	`"github.com/hashicorp/terraform/helper/validation"`
`25`		`- compute "google.golang.org/api/compute/v1"`
	`25`	`+ "google.golang.org/api/compute/v1"`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`func resourceComputeAddress() *schema.Resource {`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ import (`
`23`	`23`
`24`	`24`	`"github.com/hashicorp/terraform/helper/schema"`
`25`	`25`	`"github.com/hashicorp/terraform/helper/validation"`
`26`		`- compute "google.golang.org/api/compute/v1"`
	`26`	`+ "google.golang.org/api/compute/v1"`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`func resourceComputeAutoscaler() *schema.Resource {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`	`"time"`
`22`	`22`
`23`	`23`	`"github.com/hashicorp/terraform/helper/schema"`
`24`		`- compute "google.golang.org/api/compute/v1"`
	`24`	`+ "google.golang.org/api/compute/v1"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`func resourceComputeBackendBucket() *schema.Resource {`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`
`26`	`26`	`"github.com/hashicorp/terraform/helper/customdiff"`
`27`	`27`	`"github.com/hashicorp/terraform/helper/schema"`
`28`		`- compute "google.golang.org/api/compute/v1"`
	`28`	`+ "google.golang.org/api/compute/v1"`
`29`	`29`	`"google.golang.org/api/googleapi"`
`30`	`30`	`)`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import (`
`26`	`26`	`"github.com/hashicorp/terraform/helper/hashcode"`
`27`	`27`	`"github.com/hashicorp/terraform/helper/schema"`
`28`	`28`	`"github.com/hashicorp/terraform/helper/validation"`
`29`		`- compute "google.golang.org/api/compute/v1"`
	`29`	`+ "google.golang.org/api/compute/v1"`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`func resourceComputeFirewallRuleHash(v interface{}) int {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`
`25`	`25`	`"github.com/hashicorp/terraform/helper/customdiff"`
`26`	`26`	`"github.com/hashicorp/terraform/helper/schema"`
`27`		`- compute "google.golang.org/api/compute/v1"`
	`27`	`+ "google.golang.org/api/compute/v1"`
`28`	`28`	`"google.golang.org/api/googleapi"`
`29`	`29`	`)`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"strings"`
`9`	`9`
`10`	`10`	`"github.com/hashicorp/terraform/helper/schema"`
`11`		`- "google.golang.org/api/servicenetworking/v1beta"`
	`11`	`+ servicenetworking "google.golang.org/api/servicenetworking/v1beta"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`func resourceServiceNetworkingConnection() *schema.Resource {`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,7 @@ import (`
`9`	`9`	`"github.com/hashicorp/terraform/helper/acctest"`
`10`	`10`	`"github.com/hashicorp/terraform/helper/resource"`
`11`	`11`	`"github.com/hashicorp/terraform/terraform"`
`12`		`-`
`13`		`- "google.golang.org/api/sqladmin/v1beta4"`
	`12`	`+ sqladmin "google.golang.org/api/sqladmin/v1beta4"`
`14`	`13`	`)`
`15`	`14`
`16`	`15`	`// Fields that should be ignored in import tests because they aren't returned`