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

remote: Simplify RemoteClient setup

This commit is contained in:
Armon Dadgar 2014-12-04 16:57:11 -08:00 committed by Mitchell Hashimoto
parent c1ecdd1e3d
commit 0c4e4297e1
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
remote/client.go
View File

@ -3,6 +3,8 @@ package remote
import ( import (
"fmt" "fmt"
"strings" "strings"
"github.com/hashicorp/terraform/terraform"
) )
var ( var (
@ -40,6 +42,12 @@ type RemoteStatePayload struct {
State []byte State []byte
} }
// NewClientByState is used to construct a client from
// our remote state.
func NewClientByState(remote *terraform.RemoteState) (RemoteClient, error) {
return NewClientByType(remote.Type, remote.Config)
}
// NewClientByType is used to construct a RemoteClient // NewClientByType is used to construct a RemoteClient
// based on the configured type. // based on the configured type.
func NewClientByType(ctype string, conf map[string]string) (RemoteClient, error) { func NewClientByType(ctype string, conf map[string]string) (RemoteClient, error) {

6
remote/remote.go
View File

@ -188,7 +188,7 @@ func ValidConfig(conf *terraform.RemoteState) error {
if conf.Type == "" { if conf.Type == "" {
conf.Type = "atlas" conf.Type = "atlas"
} }
_, err := NewClientByType(conf.Type, conf.Config) _, err := NewClientByState(conf)
if err != nil { if err != nil {
return err return err
} }
@ -228,7 +228,7 @@ func RefreshState(conf *terraform.RemoteState) (StateChangeResult, error) {
} }
// Read the state from the server // Read the state from the server
client, err := NewClientByType(conf.Type, conf.Config) client, err := NewClientByState(conf)
if err != nil { if err != nil {
return StateChangeNoop, return StateChangeNoop,
fmt.Errorf("Failed to create remote client: %v", err) fmt.Errorf("Failed to create remote client: %v", err)
@ -334,7 +334,7 @@ func PushState(conf *terraform.RemoteState, force bool) (StateChangeResult, erro
} }
// Push the state to the server // Push the state to the server
client, err := NewClientByType(conf.Type, conf.Config) client, err := NewClientByState(conf)
if err != nil { if err != nil {
return StateChangeNoop, return StateChangeNoop,
fmt.Errorf("Failed to create remote client: %v", err) fmt.Errorf("Failed to create remote client: %v", err)