public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-07-05 17:52:38 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Reconcile Magician formatting changes due to Go tools upgrade
This commit is contained in:
The Magician 2019-01-14 09:40:18 -08:00 committed by Riley Karson
parent e97fb95b36
commit 97347e5de5
32 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
google/config.go
View File

@ -22,12 +22,12 @@ import (
"google.golang.org/api/cloudkms/v1" "google.golang.org/api/cloudkms/v1"
"google.golang.org/api/cloudresourcemanager/v1" "google.golang.org/api/cloudresourcemanager/v1"
resourceManagerV2Beta1 "google.golang.org/api/cloudresourcemanager/v2beta1" 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" computeBeta "google.golang.org/api/compute/v0.beta"
"google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
"google.golang.org/api/container/v1" "google.golang.org/api/container/v1"
containerBeta "google.golang.org/api/container/v1beta1" 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/dataproc/v1"
"google.golang.org/api/dns/v1" "google.golang.org/api/dns/v1"
dnsBeta "google.golang.org/api/dns/v1beta2" dnsBeta "google.golang.org/api/dns/v1beta2"
@ -35,13 +35,13 @@ import (
"google.golang.org/api/iam/v1" "google.golang.org/api/iam/v1"
cloudlogging "google.golang.org/api/logging/v2" cloudlogging "google.golang.org/api/logging/v2"
"google.golang.org/api/pubsub/v1" "google.golang.org/api/pubsub/v1"
"google.golang.org/api/redis/v1beta1" redis "google.golang.org/api/redis/v1beta1"
"google.golang.org/api/runtimeconfig/v1beta1" runtimeconfig "google.golang.org/api/runtimeconfig/v1beta1"
"google.golang.org/api/servicemanagement/v1" "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/sourcerepo/v1"
"google.golang.org/api/spanner/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/storage/v1"
"google.golang.org/api/storagetransfer/v1" "google.golang.org/api/storagetransfer/v1"
) )

2
google/resource_composer_environment.go
View File

@ -9,7 +9,7 @@ import (
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation" "github.com/hashicorp/terraform/helper/validation"
"google.golang.org/api/composer/v1beta1" composer "google.golang.org/api/composer/v1beta1"
) )
const ( const (

4
google/resource_composer_environment_test.go
View File

@ -8,11 +8,11 @@ import (
"strings" "strings"
"time" "time"
"github.com/hashicorp/go-multierror" multierror "github.com/hashicorp/go-multierror"
"github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
"google.golang.org/api/composer/v1beta1" composer "google.golang.org/api/composer/v1beta1"
"google.golang.org/api/storage/v1" "google.golang.org/api/storage/v1"
) )

2
google/resource_compute_address.go
View File

@ -22,7 +22,7 @@ import (
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation" "github.com/hashicorp/terraform/helper/validation"
compute "google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
) )
func resourceComputeAddress() *schema.Resource { func resourceComputeAddress() *schema.Resource {

2
google/resource_compute_autoscaler.go
View File

@ -23,7 +23,7 @@ import (
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation" "github.com/hashicorp/terraform/helper/validation"
compute "google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
) )
func resourceComputeAutoscaler() *schema.Resource { func resourceComputeAutoscaler() *schema.Resource {

2
google/resource_compute_backend_bucket.go
View File

@ -21,7 +21,7 @@ import (
"time" "time"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
) )
func resourceComputeBackendBucket() *schema.Resource { func resourceComputeBackendBucket() *schema.Resource {

2
google/resource_compute_disk.go
View File

@ -25,7 +25,7 @@ import (
"github.com/hashicorp/terraform/helper/customdiff" "github.com/hashicorp/terraform/helper/customdiff"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
"google.golang.org/api/googleapi" "google.golang.org/api/googleapi"
) )

2
google/resource_compute_firewall.go
View File

@ -26,7 +26,7 @@ import (
"github.com/hashicorp/terraform/helper/hashcode" "github.com/hashicorp/terraform/helper/hashcode"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation" "github.com/hashicorp/terraform/helper/validation"
compute "google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
) )
func resourceComputeFirewallRuleHash(v interface{}) int { func resourceComputeFirewallRuleHash(v interface{}) int {

2
google/resource_compute_forwarding_rule.go
View File

@ -23,7 +23,7 @@ import (
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation" "github.com/hashicorp/terraform/helper/validation"
compute "google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
) )
func resourceComputeForwardingRule() *schema.Resource { func resourceComputeForwardingRule() *schema.Resource {

2
google/resource_compute_global_address.go
View File

@ -22,7 +22,7 @@ import (
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation" "github.com/hashicorp/terraform/helper/validation"
compute "google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
) )
func resourceComputeGlobalAddress() *schema.Resource { func resourceComputeGlobalAddress() *schema.Resource {

2
google/resource_compute_health_check.go
View File

@ -23,7 +23,7 @@ import (
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation" "github.com/hashicorp/terraform/helper/validation"
compute "google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
) )
func resourceComputeHealthCheck() *schema.Resource { func resourceComputeHealthCheck() *schema.Resource {

2
google/resource_compute_http_health_check.go
View File

@ -22,7 +22,7 @@ import (
"time" "time"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
) )
func resourceComputeHttpHealthCheck() *schema.Resource { func resourceComputeHttpHealthCheck() *schema.Resource {

2
google/resource_compute_https_health_check.go
View File

@ -22,7 +22,7 @@ import (
"time" "time"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
) )
func resourceComputeHttpsHealthCheck() *schema.Resource { func resourceComputeHttpsHealthCheck() *schema.Resource {

2
google/resource_compute_image.go
View File

@ -23,7 +23,7 @@ import (
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation" "github.com/hashicorp/terraform/helper/validation"
compute "google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
) )
func resourceComputeImage() *schema.Resource { func resourceComputeImage() *schema.Resource {

2
google/resource_compute_interconnect_attachment.go
View File

@ -22,7 +22,7 @@ import (
"time" "time"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
) )
func resourceComputeInterconnectAttachment() *schema.Resource { func resourceComputeInterconnectAttachment() *schema.Resource {

2
google/resource_compute_region_autoscaler.go
View File

@ -23,7 +23,7 @@ import (
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation" "github.com/hashicorp/terraform/helper/validation"
compute "google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
) )
func resourceComputeRegionAutoscaler() *schema.Resource { func resourceComputeRegionAutoscaler() *schema.Resource {

2
google/resource_compute_region_disk.go
View File

@ -24,7 +24,7 @@ import (
"github.com/hashicorp/terraform/helper/customdiff" "github.com/hashicorp/terraform/helper/customdiff"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
"google.golang.org/api/googleapi" "google.golang.org/api/googleapi"
) )

2
google/resource_compute_route.go
View File

@ -22,7 +22,7 @@ import (
"time" "time"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
) )
func resourceComputeRoute() *schema.Resource { func resourceComputeRoute() *schema.Resource {

2
google/resource_compute_router.go
View File

@ -23,7 +23,7 @@ import (
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation" "github.com/hashicorp/terraform/helper/validation"
compute "google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
) )
func resourceComputeRouter() *schema.Resource { func resourceComputeRouter() *schema.Resource {

2
google/resource_compute_snapshot.go
View File

@ -22,7 +22,7 @@ import (
"time" "time"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
) )
func resourceComputeSnapshot() *schema.Resource { func resourceComputeSnapshot() *schema.Resource {

2
google/resource_compute_ssl_certificate.go
View File

@ -23,7 +23,7 @@ import (
"github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
) )
func resourceComputeSslCertificate() *schema.Resource { func resourceComputeSslCertificate() *schema.Resource {

2
google/resource_compute_ssl_policy.go
View File

@ -22,7 +22,7 @@ import (
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation" "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 { func sslPolicyCustomizeDiff(diff *schema.ResourceDiff, v interface{}) error {

2
google/resource_compute_subnetwork.go
View File

@ -25,7 +25,7 @@ import (
"github.com/apparentlymart/go-cidr/cidr" "github.com/apparentlymart/go-cidr/cidr"
"github.com/hashicorp/terraform/helper/customdiff" "github.com/hashicorp/terraform/helper/customdiff"
"github.com/hashicorp/terraform/helper/schema" "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. // Whether the IP CIDR change shrinks the block.

2
google/resource_compute_target_http_proxy.go
View File

@ -22,7 +22,7 @@ import (
"time" "time"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
) )
func resourceComputeTargetHttpProxy() *schema.Resource { func resourceComputeTargetHttpProxy() *schema.Resource {

2
google/resource_compute_target_https_proxy.go
View File

@ -23,7 +23,7 @@ import (
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation" "github.com/hashicorp/terraform/helper/validation"
compute "google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
) )
func resourceComputeTargetHttpsProxy() *schema.Resource { func resourceComputeTargetHttpsProxy() *schema.Resource {

2
google/resource_compute_target_ssl_proxy.go
View File

@ -23,7 +23,7 @@ import (
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation" "github.com/hashicorp/terraform/helper/validation"
compute "google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
) )
func resourceComputeTargetSslProxy() *schema.Resource { func resourceComputeTargetSslProxy() *schema.Resource {

2
google/resource_compute_target_tcp_proxy.go
View File

@ -23,7 +23,7 @@ import (
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation" "github.com/hashicorp/terraform/helper/validation"
compute "google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
) )
func resourceComputeTargetTcpProxy() *schema.Resource { func resourceComputeTargetTcpProxy() *schema.Resource {

2
google/resource_compute_url_map.go
View File

@ -22,7 +22,7 @@ import (
"time" "time"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
) )
func resourceComputeUrlMap() *schema.Resource { func resourceComputeUrlMap() *schema.Resource {

2
google/resource_compute_vpn_gateway.go
View File

@ -21,7 +21,7 @@ import (
"time" "time"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
) )
func resourceComputeVpnGateway() *schema.Resource { func resourceComputeVpnGateway() *schema.Resource {

2
google/resource_compute_vpn_tunnel.go
View File

@ -25,7 +25,7 @@ import (
"time" "time"
"github.com/hashicorp/terraform/helper/schema" "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 // validatePeerAddr returns false if a tunnel's peer_ip property

2
google/resource_container_cluster.go
View File

@ -8,7 +8,7 @@ import (
"time" "time"
"github.com/hashicorp/errwrap" "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/resource"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation" "github.com/hashicorp/terraform/helper/validation"

3
google/resource_sql_database_instance_test.go
View File

@ -9,8 +9,7 @@ import (
"github.com/hashicorp/terraform/helper/acctest" "github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
sqladmin "google.golang.org/api/sqladmin/v1beta4"
"google.golang.org/api/sqladmin/v1beta4"
) )
// Fields that should be ignored in import tests because they aren't returned // Fields that should be ignored in import tests because they aren't returned