diff --git a/google/config.go b/google/config.go index 80af6b1e..6898ee13 100644 --- a/google/config.go +++ b/google/config.go @@ -22,12 +22,12 @@ 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" @@ -35,13 +35,13 @@ import ( "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/serviceusage/v1beta1" + 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/resource_composer_environment.go b/google/resource_composer_environment.go index ecf6fbcc..1c09f40e 100644 --- a/google/resource_composer_environment.go +++ b/google/resource_composer_environment.go @@ -9,7 +9,7 @@ import ( "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/resource_composer_environment_test.go b/google/resource_composer_environment_test.go index 8f83c3d4..7f6d6b22 100644 --- a/google/resource_composer_environment_test.go +++ b/google/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/resource_compute_address.go b/google/resource_compute_address.go index 40bb943d..364b06cf 100644 --- a/google/resource_compute_address.go +++ b/google/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/resource_compute_autoscaler.go b/google/resource_compute_autoscaler.go index 09920c31..5adf9b8c 100644 --- a/google/resource_compute_autoscaler.go +++ b/google/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/resource_compute_backend_bucket.go b/google/resource_compute_backend_bucket.go index b28d8270..5c31b3d0 100644 --- a/google/resource_compute_backend_bucket.go +++ b/google/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/resource_compute_disk.go b/google/resource_compute_disk.go index fc91dd3b..ece6ac40 100644 --- a/google/resource_compute_disk.go +++ b/google/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/resource_compute_firewall.go b/google/resource_compute_firewall.go index 34a419de..835bf55e 100644 --- a/google/resource_compute_firewall.go +++ b/google/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/resource_compute_forwarding_rule.go b/google/resource_compute_forwarding_rule.go index 74c825f0..46fcd447 100644 --- a/google/resource_compute_forwarding_rule.go +++ b/google/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/resource_compute_global_address.go b/google/resource_compute_global_address.go index 8e113bfc..9e6c4dee 100644 --- a/google/resource_compute_global_address.go +++ b/google/resource_compute_global_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 resourceComputeGlobalAddress() *schema.Resource { diff --git a/google/resource_compute_health_check.go b/google/resource_compute_health_check.go index ec957c9f..9a339a1b 100644 --- a/google/resource_compute_health_check.go +++ b/google/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/resource_compute_http_health_check.go b/google/resource_compute_http_health_check.go index b72f8414..c806499d 100644 --- a/google/resource_compute_http_health_check.go +++ b/google/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/resource_compute_https_health_check.go b/google/resource_compute_https_health_check.go index 0bce13b5..973d0872 100644 --- a/google/resource_compute_https_health_check.go +++ b/google/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/resource_compute_image.go b/google/resource_compute_image.go index 8c8fca9c..01926cc5 100644 --- a/google/resource_compute_image.go +++ b/google/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/resource_compute_interconnect_attachment.go b/google/resource_compute_interconnect_attachment.go index 3bb1f792..65bd304a 100644 --- a/google/resource_compute_interconnect_attachment.go +++ b/google/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/resource_compute_region_autoscaler.go b/google/resource_compute_region_autoscaler.go index 1fc08aec..c7f35fa4 100644 --- a/google/resource_compute_region_autoscaler.go +++ b/google/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/resource_compute_region_disk.go b/google/resource_compute_region_disk.go index 8436ecf0..c43b9179 100644 --- a/google/resource_compute_region_disk.go +++ b/google/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/resource_compute_route.go b/google/resource_compute_route.go index eae0a98d..546084d5 100644 --- a/google/resource_compute_route.go +++ b/google/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/resource_compute_router.go b/google/resource_compute_router.go index 50c8e487..5238ece7 100644 --- a/google/resource_compute_router.go +++ b/google/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/resource_compute_snapshot.go b/google/resource_compute_snapshot.go index f9dea381..e5163148 100644 --- a/google/resource_compute_snapshot.go +++ b/google/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/resource_compute_ssl_certificate.go b/google/resource_compute_ssl_certificate.go index 556554f2..796f23f6 100644 --- a/google/resource_compute_ssl_certificate.go +++ b/google/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/resource_compute_ssl_policy.go b/google/resource_compute_ssl_policy.go index b457963c..65215f92 100644 --- a/google/resource_compute_ssl_policy.go +++ b/google/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/resource_compute_subnetwork.go b/google/resource_compute_subnetwork.go index 56d810de..293c8138 100644 --- a/google/resource_compute_subnetwork.go +++ b/google/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/resource_compute_target_http_proxy.go b/google/resource_compute_target_http_proxy.go index d25aff0d..f3749461 100644 --- a/google/resource_compute_target_http_proxy.go +++ b/google/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/resource_compute_target_https_proxy.go b/google/resource_compute_target_https_proxy.go index 96c98057..c525301c 100644 --- a/google/resource_compute_target_https_proxy.go +++ b/google/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/resource_compute_target_ssl_proxy.go b/google/resource_compute_target_ssl_proxy.go index f9fc3062..755c57be 100644 --- a/google/resource_compute_target_ssl_proxy.go +++ b/google/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/resource_compute_target_tcp_proxy.go b/google/resource_compute_target_tcp_proxy.go index 3862e936..c806eff8 100644 --- a/google/resource_compute_target_tcp_proxy.go +++ b/google/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/resource_compute_url_map.go b/google/resource_compute_url_map.go index d8446486..5f7aa5ce 100644 --- a/google/resource_compute_url_map.go +++ b/google/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/resource_compute_vpn_gateway.go b/google/resource_compute_vpn_gateway.go index 4683f414..805a1d98 100644 --- a/google/resource_compute_vpn_gateway.go +++ b/google/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/resource_compute_vpn_tunnel.go b/google/resource_compute_vpn_tunnel.go index 4f69488d..564240f6 100644 --- a/google/resource_compute_vpn_tunnel.go +++ b/google/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/resource_container_cluster.go b/google/resource_container_cluster.go index 44ac672a..0530a840 100644 --- a/google/resource_container_cluster.go +++ b/google/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/resource_sql_database_instance_test.go b/google/resource_sql_database_instance_test.go index b750ca06..1f3bb349 100644 --- a/google/resource_sql_database_instance_test.go +++ b/google/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