resilien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backend/remote-state/gcloud: Coding style changes. 

Refactorings to make the code more idiomatic.
This commit is contained in:
Florian Forster 2017-09-07 13:54:12 +02:00 committed by James Bardin
parent f33005faba
commit 2e5fca78c2
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
backend/remote-state/gcloud/backend.go
View File

@ -25,7 +25,9 @@ type Backend struct {
}
func New() backend.Backend {
s := &schema.Backend{
be := &Backend{}
be.Backend = &schema.Backend{
ConfigureFunc: be.configure,
Schema: map[string]*schema.Schema{
"bucket": {
Type: schema.TypeString,
@ -48,9 +50,7 @@ func New() backend.Backend {
},
}
result := &Backend{Backend: s}
result.Backend.ConfigureFunc = result.configure
return result
return be
}
func (b *Backend) configure(ctx context.Context) error {
@ -64,11 +64,9 @@ func (b *Backend) configure(ctx context.Context) error {
b.stateDir = data.Get("state_dir").(string)
b.storageContext = googleContext.Background()
credentials := data.Get("credentials").(string)
var tokenSource oauth2.TokenSource
if credentials != "" {
if credentials := data.Get("credentials").(string); credentials != "" {
credentialsJson, _, err := pathorcontents.Read(data.Get("credentials").(string))
if err != nil {
return fmt.Errorf("Error loading credentials: %v", err)
@ -81,12 +79,11 @@ func (b *Backend) configure(ctx context.Context) error {
tokenSource = jwtConfig.TokenSource(b.storageContext)
} else {
defaultTokenSource, err := google.DefaultTokenSource(b.storageContext, storage.ScopeReadWrite)
var err error
tokenSource, err = google.DefaultTokenSource(b.storageContext, storage.ScopeReadWrite)
if err != nil {
return fmt.Errorf("Failed to get Google Application Default Credentials: %v", err)
}
tokenSource = defaultTokenSource
}
client, err := storage.NewClient(b.storageContext, option.WithTokenSource(tokenSource))

4
backend/remote-state/gcloud/client.go
View File

@ -65,9 +65,7 @@ func (c *RemoteClient) Put(data []byte) error {
}
func (c *RemoteClient) Delete() error {
err := c.stateFile().Delete(c.storageContext)
if err != nil {
if err := c.stateFile().Delete(c.storageContext); err != nil {
return fmt.Errorf("Failed to delete state file %v: %v", c.stateFileURL(), err)
}