From 1ce320d021d2f434914a778e61e92f3615ef4488 Mon Sep 17 00:00:00 2001 From: Albert Yu Date: Mon, 4 Nov 2019 21:15:52 -0800 Subject: [PATCH] add cfg.LoadAndValidate back --- converters/google/convert.go | 8 +++++++- tfgcv/planned_assets.go | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/converters/google/convert.go b/converters/google/convert.go index aea27864e..0f6654ea7 100644 --- 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 index 10570289d..c0e39c582 100644 --- 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") }