From 0db5b3716538217f0f4fce860d2fa2fe4b5f09d3 Mon Sep 17 00:00:00 2001 From: Koonwah Chen Date: Thu, 29 Jun 2017 10:42:29 -0700 Subject: [PATCH] testing fixed hack/verify-gofmt.sh and hack/verify-flags-underscore.py --- hack/verify-flags/known-flags.txt | 1 + pkg/cloudprovider/providers/gce/gce.go | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hack/verify-flags/known-flags.txt b/hack/verify-flags/known-flags.txt index b504324bb95..a4422ddce5e 100644 --- a/hack/verify-flags/known-flags.txt +++ b/hack/verify-flags/known-flags.txt @@ -297,6 +297,7 @@ gather-logs-sizes gather-metrics-at-teardown gather-resource-usage gather-suite-metrics-at-teardown +gce-api-endpoint gce-multizone gce-project gce-service-account diff --git a/pkg/cloudprovider/providers/gce/gce.go b/pkg/cloudprovider/providers/gce/gce.go index 4e60519daaf..c88064fab6d 100644 --- a/pkg/cloudprovider/providers/gce/gce.go +++ b/pkg/cloudprovider/providers/gce/gce.go @@ -194,16 +194,16 @@ func newGCECloud(config io.Reader) (*GCECloud, error) { projectID = cfg.Global.ProjectID } - if cfg.Global.NetworkName != "" && strings.Contains(cfg.Global.NetworkName, "/"){ + if cfg.Global.NetworkName != "" && strings.Contains(cfg.Global.NetworkName, "/") { networkURL = cfg.Global.NetworkName - }else { + } else { networkURL = gceNetworkURL(apiEndpoint, projectID, networkName) } - if cfg.Global.SubnetworkName != "" && strings.Contains(cfg.Global.SubnetworkName, "/"){ - subnetworkURL = cfg.Global.SubnetworkName - }else { - subnetworkURL = gceSubnetworkURL(apiEndpoint, cfg.Global.ProjectID, region, cfg.Global.SubnetworkName) + if cfg.Global.SubnetworkName != "" && strings.Contains(cfg.Global.SubnetworkName, "/") { + subnetworkURL = cfg.Global.SubnetworkName + } else { + subnetworkURL = gceSubnetworkURL(apiEndpoint, cfg.Global.ProjectID, region, cfg.Global.SubnetworkName) } if cfg.Global.TokenURL != "" { tokenSource = NewAltTokenSource(cfg.Global.TokenURL, cfg.Global.TokenBody)