mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-10-04 17:51:11 +00:00
Fixing the build...
The v0.beta is removed, so I also removed it from here. Strangely enough I cannot find any code that actually used it other then in being instantiated in the provider config func.
This commit is contained in:
parent
c6db486ab8
commit
6ffbac43d7
17
config.go
17
config.go
@ -13,7 +13,6 @@ import (
|
|||||||
"golang.org/x/oauth2"
|
"golang.org/x/oauth2"
|
||||||
"golang.org/x/oauth2/google"
|
"golang.org/x/oauth2/google"
|
||||||
"golang.org/x/oauth2/jwt"
|
"golang.org/x/oauth2/jwt"
|
||||||
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"
|
||||||
"google.golang.org/api/dns/v1"
|
"google.golang.org/api/dns/v1"
|
||||||
@ -27,11 +26,10 @@ type Config struct {
|
|||||||
Project string
|
Project string
|
||||||
Region string
|
Region string
|
||||||
|
|
||||||
clientCompute *compute.Service
|
clientCompute *compute.Service
|
||||||
clientComputeBeta *computeBeta.Service
|
clientContainer *container.Service
|
||||||
clientContainer *container.Service
|
clientDns *dns.Service
|
||||||
clientDns *dns.Service
|
clientStorage *storage.Service
|
||||||
clientStorage *storage.Service
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Config) loadAndValidate() error {
|
func (c *Config) loadAndValidate() error {
|
||||||
@ -115,13 +113,6 @@ func (c *Config) loadAndValidate() error {
|
|||||||
}
|
}
|
||||||
c.clientCompute.UserAgent = userAgent
|
c.clientCompute.UserAgent = userAgent
|
||||||
|
|
||||||
log.Printf("[INFO] Instantiating Beta GCE client...")
|
|
||||||
c.clientComputeBeta, err = computeBeta.New(client)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
c.clientComputeBeta.UserAgent = userAgent
|
|
||||||
|
|
||||||
log.Printf("[INFO] Instantiating GKE client...")
|
log.Printf("[INFO] Instantiating GKE client...")
|
||||||
c.clientContainer, err = container.New(client)
|
c.clientContainer, err = container.New(client)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
Loading…
Reference in New Issue
Block a user