providers/google: Use account_file_contents if provided

builtin/providers/google/config.go

@@ -3,10 +3,12 @@ package google
 import (
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
 	"runtime"
+	"strings"
 
 
 	// TODO(dcunnin): Use version code from version.go
@@ -54,10 +56,25 @@ func (c *Config) loadAndValidate() error {
 	var client *http.Client
 
 	if c.AccountFile != "" {
-		if err := loadJSON(&account, c.AccountFile); err != nil {
+		if c.AccountFileContents != "" {
 			return fmt.Errorf(
-				"Error loading account file '%s': %s",
+				"Cannot provide both account_file and account_file_contents",
-				c.AccountFile,
+			)
+		}
+
+		b, err := ioutil.ReadFile(c.AccountFile)
+		if err != nil {
+			return err
+		}
+
+		c.AccountFileContents = string(b)
+	}
+
+	if c.AccountFileContents != "" {
+		if err := parseJSON(&account, c.AccountFileContents); err != nil {
+			return fmt.Errorf(
+				"Error parsing account file contents '%s': %s",
+				c.AccountFileContents,
 				err)
 		}
 
@@ -150,13 +167,9 @@ type accountFile struct {
 	ClientId     string `json:"client_id"`
 }
 
-func loadJSON(result interface{}, path string) error {
+func parseJSON(result interface{}, contents string) error {
-	f, err := os.Open(path)
+	r := strings.NewReader(contents)
-	if err != nil {
+	dec := json.NewDecoder(r)
-		return err
-	}
-	defer f.Close()
 
-	dec := json.NewDecoder(f)
 	return dec.Decode(result)
 }

builtin/providers/google/config_test.go

@@ -1,24 +1,63 @@
 package google
 
 import (
-	"reflect"
+	"io/ioutil"
 	"testing"
 )
 
-func TestConfigLoadJSON_account(t *testing.T) {
+const testFakeAccountFilePath = "./test-fixtures/fake_account.json"
-	var actual accountFile
+
-	if err := loadJSON(&actual, "./test-fixtures/fake_account.json"); err != nil {
+func TestConfigLoadAndValidate_accountFile(t *testing.T) {
-		t.Fatalf("err: %s", err)
+	config := Config{
+		AccountFile: testFakeAccountFilePath,
+		Project:     "my-gce-project",
+		Region:      "us-central1",
 	}
 
-	expected := accountFile{
+	err := config.loadAndValidate()
-		PrivateKeyId: "foo",
+	if err != nil {
-		PrivateKey:   "bar",
+		t.Fatalf("error: %v", err)
-		ClientEmail:  "foo@bar.com",
+	}
-		ClientId:     "id@foo.com",
+}
-	}
+
-
+func TestConfigLoadAndValidate_accountFileContents(t *testing.T) {
-	if !reflect.DeepEqual(actual, expected) {
+	contents, err := ioutil.ReadFile(testFakeAccountFilePath)
-		t.Fatalf("bad: %#v", actual)
+	if err != nil {
+		t.Fatalf("error: %v", err)
+	}
+	config := Config{
+		AccountFileContents: string(contents),
+		Project:             "my-gce-project",
+		Region:              "us-central1",
+	}
+
+	err = config.loadAndValidate()
+	if err != nil {
+		t.Fatalf("error: %v", err)
+	}
+}
+
+func TestConfigLoadAndValidate_none(t *testing.T) {
+	config := Config{
+		Project: "my-gce-project",
+		Region:  "us-central1",
+	}
+
+	err := config.loadAndValidate()
+	if err != nil {
+		t.Fatalf("error: %v", err)
+	}
+}
+
+func TestConfigLoadAndValidate_both(t *testing.T) {
+	config := Config{
+		AccountFile:         testFakeAccountFilePath,
+		AccountFileContents: "{}",
+		Project:             "my-gce-project",
+		Region:              "us-central1",
+	}
+
+	if config.loadAndValidate() == nil {
+		t.Fatalf("expected error, but got nil")
 	}
 }

builtin/providers/google/provider.go

@@ -59,9 +59,10 @@ func Provider() terraform.ResourceProvider {
 
 func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 	config := Config{
-		AccountFile: d.Get("account_file").(string),
+		AccountFile:         d.Get("account_file").(string),
-		Project:     d.Get("project").(string),
+		AccountFileContents: d.Get("account_file_contents").(string),
-		Region:      d.Get("region").(string),
+		Project:             d.Get("project").(string),
+		Region:              d.Get("region").(string),
 	}
 
 	if err := config.loadAndValidate(); err != nil {