providers/google: Fix reading account_file path

hashicorp · Jul 29, 2015 · 7884456 · 7884456
1 parent 4764a55
commit 7884456
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/builtin/providers/google/config.go b/builtin/providers/google/config.go
@@ -71,13 +71,13 @@ func (c *Config) loadAndValidate() error {
 			}
 
 			contents = string(b)
-		}
 
-		if err := parseJSON(&account, contents); err != nil {
-			return fmt.Errorf(
-				"Error parsing account file '%s': %s",
-				contents,
-				err)
+			if err := parseJSON(&account, contents); err != nil {
+				return fmt.Errorf(
+					"Error parsing account file '%s': %s",
+					contents,
+					err)
+			}
 		}
 
 		clientScopes := []string{