Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove built-in version from service client basepaths #2483

Merged
merged 2 commits into from
Oct 16, 2019
Merged

Remove built-in version from service client basepaths #2483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bd45ef
Remove built-in version from service client basepaths
rileykarson Oct 16, 2019
2962758
Update tracked submodules -> HEAD on Wed Oct 16 23:25:27 UTC 2019
modular-magician Oct 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/terraform
Open in desktop
Submodule terraform updated from 66e689 to f058c3
2 changes: 1 addition & 1 deletion build/terraform-beta
Open in desktop
Submodule terraform-beta updated from 075403 to 2e8d2b
2 changes: 1 addition & 1 deletion build/terraform-mapper
Open in desktop
Submodule terraform-mapper updated 1 files
+7 −7 google/config.go
14 changes: 7 additions & 7 deletions third_party/terraform/utils/config.go.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ func (c *Config) LoadAndValidate() error {
// while most only want the host URL, some older ones also want the version and some
// of those "projects" as well. You can find out if this is required by looking at
// the basePath value in the client library file.
computeClientBasePath := removeBasePathVersion(c.ComputeBasePath) + "v1/projects/"
computeClientBasePath := c.ComputeBasePath + "projects/"
log.Printf("[INFO] Instantiating GCE client for path %s", computeClientBasePath)
c.clientCompute, err = compute.NewService(context, option.WithHTTPClient(client))
if err != nil {
Expand All @@ -240,7 +240,7 @@ func (c *Config) LoadAndValidate() error {
c.clientCompute.UserAgent = userAgent
c.clientCompute.BasePath = computeClientBasePath

computeBetaClientBasePath := removeBasePathVersion(c.ComputeBetaBasePath) + "beta/projects/"
computeBetaClientBasePath := c.ComputeBetaBasePath + "projects/"
log.Printf("[INFO] Instantiating GCE Beta client for path %s", computeBetaClientBasePath)
c.clientComputeBeta, err = computeBeta.NewService(context, option.WithHTTPClient(client))
if err != nil {
Expand All @@ -267,7 +267,7 @@ func (c *Config) LoadAndValidate() error {
c.clientContainerBeta.UserAgent = userAgent
c.clientContainerBeta.BasePath = containerBetaClientBasePath

dnsClientBasePath := removeBasePathVersion(c.DNSBasePath) + "v1/projects/"
dnsClientBasePath := c.DNSBasePath + "projects/"
log.Printf("[INFO] Instantiating Google Cloud DNS client for path %s", dnsClientBasePath)
c.clientDns, err = dns.NewService(context, option.WithHTTPClient(client))
if err != nil {
Expand All @@ -276,7 +276,7 @@ func (c *Config) LoadAndValidate() error {
c.clientDns.UserAgent = userAgent
c.clientDns.BasePath = dnsClientBasePath

dnsBetaClientBasePath := removeBasePathVersion(c.DnsBetaBasePath) + "v1beta2/projects/"
dnsBetaClientBasePath := c.DnsBetaBasePath + "projects/"
log.Printf("[INFO] Instantiating Google Cloud DNS Beta client for path %s", dnsBetaClientBasePath)
c.clientDnsBeta, err = dnsBeta.NewService(context, option.WithHTTPClient(client))
if err != nil {
Expand All @@ -303,7 +303,7 @@ func (c *Config) LoadAndValidate() error {
c.clientLogging.UserAgent = userAgent
c.clientLogging.BasePath = loggingClientBasePath

storageClientBasePath := removeBasePathVersion(c.StorageBasePath) + "v1/"
storageClientBasePath := c.StorageBasePath
log.Printf("[INFO] Instantiating Google Storage client for path %s", storageClientBasePath)
c.clientStorage, err = storage.NewService(context, option.WithHTTPClient(client))
if err != nil {
Expand All @@ -312,7 +312,7 @@ func (c *Config) LoadAndValidate() error {
c.clientStorage.UserAgent = userAgent
c.clientStorage.BasePath = storageClientBasePath

sqlClientBasePath := removeBasePathVersion(c.SQLBasePath) + "v1beta4/"
sqlClientBasePath := c.SQLBasePath
log.Printf("[INFO] Instantiating Google SqlAdmin client for path %s", sqlClientBasePath)
c.clientSqlAdmin, err = sqladmin.NewService(context, option.WithHTTPClient(client))
if err != nil {
Expand Down Expand Up @@ -432,7 +432,7 @@ func (c *Config) LoadAndValidate() error {
c.clientBuild.UserAgent = userAgent
c.clientBuild.BasePath = cloudBuildClientBasePath

bigQueryClientBasePath := removeBasePathVersion(c.BigQueryBasePath) + "v2/"
bigQueryClientBasePath := c.BigQueryBasePath
log.Printf("[INFO] Instantiating Google Cloud BigQuery client for path %s", bigQueryClientBasePath)
c.clientBigQuery, err = bigquery.NewService(context, option.WithHTTPClient(client))
if err != nil {
Expand Down