add cfg.LoadAndValidate back

GoogleCloudPlatform · Nov 5, 2019 · 1ce320d · 1ce320d
1 parent 1fe01ae
commit 1ce320d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/converters/google/convert.go b/converters/google/convert.go
@@ -85,11 +85,17 @@ type AssetResource struct {
 }
 
 // NewConverter is a factory function for Converter.
-func NewConverter(ancestryManager ancestrymanager.AncestryManager, project, credentials string) (*Converter, error) {
+func NewConverter(ancestryManager ancestrymanager.AncestryManager, project, credentials string, offline bool) (*Converter, error) {
 	cfg := &converter.Config{
 		Project:     project,
 		Credentials: credentials,
 	}
+	if !offline {
+		converter.ConfigureBasePaths(cfg)
+		if err := cfg.LoadAndValidate(); err != nil {
+			return nil, errors.Wrap(err, "load and validate config")	
+		}
+	}
 	p := provider.Provider().(*schema.Provider)
 	return &Converter{
 		schema:          p,

diff --git a/tfgcv/planned_assets.go b/tfgcv/planned_assets.go
@@ -42,7 +42,7 @@ func ReadPlannedAssets(path, project, ancestry string, offline bool) ([]google.A
 	if err != nil {
 		return nil, errors.Wrap(err, "constructing resource manager client")
 	}
-	converter, err := google.NewConverter(ancestryManager, project, "")
+	converter, err := google.NewConverter(ancestryManager, project, "", offline)
 	if err != nil {
 		return nil, errors.Wrap(err, "building google converter")
 	}