@@ -11,6 +11,7 @@ import (
1111 "path/filepath"
1212 "strings"
1313
14+ "github.com/fatih/color"
1415 "github.com/magodo/aztfy/internal/armtemplate"
1516 "github.com/magodo/aztfy/schema"
1617
@@ -147,9 +148,19 @@ func (meta *Meta) ExportArmTemplate(ctx context.Context) error {
147148 if err := json .Unmarshal (raw , & meta .armTemplate ); err != nil {
148149 return fmt .Errorf ("unmarshalling the template: %w" , err )
149150 }
151+
150152 return nil
151153}
152154
155+ func (meta * Meta ) ListAzureResourceIDs () []string {
156+ var ids []string
157+ for _ , res := range meta .armTemplate .Resources {
158+ ids = append (ids , res .ID (meta .subscriptionId , meta .resourceGroup ))
159+ }
160+ ids = append (ids , armtemplate .ResourceGroupId .ID (meta .subscriptionId , meta .resourceGroup ))
161+ return ids
162+ }
163+
153164type ImportList []ImportItem
154165
155166func (l ImportList ) NonSkipped () ImportList {
@@ -163,10 +174,42 @@ func (l ImportList) NonSkipped() ImportList {
163174 return out
164175}
165176
177+ func (l ImportList ) ImportErrored () ImportList {
178+ var out ImportList
179+ for _ , item := range l {
180+ if item .ImportError == nil {
181+ continue
182+ }
183+ out = append (out , item )
184+ }
185+ return out
186+ }
187+
188+ func (l ImportList ) Imported () ImportList {
189+ var out ImportList
190+ for _ , item := range l .NonSkipped () {
191+ if item .ImportError != nil {
192+ continue
193+ }
194+ out = append (out , item )
195+ }
196+ return out
197+ }
198+
166199type ImportItem struct {
167- ResourceID string
168- Skip bool
200+ // The azure resource id
201+ ResourceID string
202+
203+ // Wether this azure resource should be skipped from importing
204+ Skip bool
205+
206+ // Whether this azure resource failed to import into terraform (this might due to the TFResourceType doesn't match the resource)
207+ ImportError error
208+
209+ // The terraform resource type
169210 TFResourceType string
211+
212+ // The terraform resource name
170213 TFResourceName string
171214}
172215
@@ -177,12 +220,7 @@ func (item *ImportItem) TFAddr() string {
177220 return item .TFResourceType + "." + item .TFResourceName
178221}
179222
180- func (meta * Meta ) ResolveImportList (ctx context.Context ) (ImportList , error ) {
181- var ids []string
182- for _ , res := range meta .armTemplate .Resources {
183- ids = append (ids , res .ID (meta .subscriptionId , meta .resourceGroup ))
184- }
185- ids = append (ids , armtemplate .ResourceGroupId .ID (meta .subscriptionId , meta .resourceGroup ))
223+ func (meta * Meta ) ResolveImportList (ids []string , ctx context.Context ) (ImportList , error ) {
186224
187225 // schema, err := meta.tf.ProvidersSchema(ctx)
188226 // if err != nil {
@@ -196,7 +234,7 @@ func (meta *Meta) ResolveImportList(ctx context.Context) (ImportList, error) {
196234 // userResourceMap is used to track the resource types and resource names that are specified by users.
197235 userResourceMap := map [string ]map [string ]bool {}
198236 reader := bufio .NewReader (os .Stdin )
199- fmt . Println ( `Please input the Terraform resource type and name for each Azure resource in form of "<resource type>.<resource name>. Press enter with no input will skip importing that resource.`
237+ color . Cyan ( " \n Please input either the Terraform resource type and name in the form of \ "\" , or simply enter to skip\n "
200238 for idx , id := range ids {
201239 item := ImportItem {
202240 ResourceID : id ,
@@ -244,7 +282,13 @@ func (meta *Meta) ResolveImportList(ctx context.Context) (ImportList, error) {
244282 return list , nil
245283}
246284
247- func (meta * Meta ) Import (ctx context.Context , list ImportList ) error {
285+ func (meta * Meta ) Import (ctx context.Context , list ImportList ) (ImportList , error ) {
286+ if len (list .NonSkipped ()) == 0 {
287+ return nil , nil
288+ }
289+
290+ color .Cyan ("\n Import Azure Resources\n " )
291+
248292 // Generate a temp Terraform config to include the empty template for each resource.
249293 // This is required for the following importing.
250294 cfgFile := filepath .Join (meta .workspace , "main.tf" )
@@ -253,27 +297,39 @@ func (meta *Meta) Import(ctx context.Context, list ImportList) error {
253297 for _ , item := range list .NonSkipped () {
254298 tpl , err := meta .tf .Add (ctx , item .TFAddr ())
255299 if err != nil {
256- return fmt .Errorf ("generating resource template for %s: %w" , item .TFAddr (), err )
300+ return nil , fmt .Errorf ("generating resource template for %s: %w" , item .TFAddr (), err )
257301 }
258302 tpls = append (tpls , tpl )
259303 }
260304 if err := os .WriteFile (cfgFile , []byte (strings .Join (tpls , "\n " )), 0644 ); err != nil {
261- return fmt .Errorf ("generating resource template cfgFile file: %w" , err )
305+ return nil , fmt .Errorf ("generating resource template cfgFile file: %w" , err )
262306 }
263307 // Remove the temp Terraform config once resources are imported.
264308 // This is due to the fact that "terraform add" will complain the resource to be added already exist in the config, even we are outputting to stdout.
265309 // This should be resolved once hashicorp/terraform#29220 is addressed.
266310 defer os .Remove (cfgFile )
267311
268312 // Import resources
313+ out := ImportList {}
269314 for idx , item := range list .NonSkipped () {
270- fmt .Printf ("[%d/%d] Importing %q as %s\n " , idx + 1 , len (list .NonSkipped ()), item .ResourceID , item .TFAddr ())
271- if err := meta .tf .Import (ctx , item .TFAddr (), item .ResourceID ); err != nil {
272- return err
315+ fmt .Printf ("[%d/%d] Importing %q as %s...\n " , idx + 1 , len (list .NonSkipped ()), item .ResourceID , item .TFAddr ())
316+ err := meta .tf .Import (ctx , item .TFAddr (), item .ResourceID )
317+ if err != nil {
318+ emsg := []string {}
319+ for _ , el := range strings .Split (err .Error (), "\n " ) {
320+ el := strings .TrimSpace (el )
321+ if el == "" {
322+ continue
323+ }
324+ emsg = append (emsg , "\t " + el )
325+ }
326+ color .Red (strings .Join (emsg , "\n " ))
273327 }
328+ item .ImportError = err
329+ out = append (out , item )
274330 }
275331
276- return nil
332+ return out , nil
277333}
278334
279335type ConfigInfos []ConfigInfo
@@ -290,10 +346,7 @@ func (cfg ConfigInfo) DumpHCL(w io.Writer) (int, error) {
290346func (meta * Meta ) StateToConfig (ctx context.Context , list ImportList ) (ConfigInfos , error ) {
291347 out := ConfigInfos {}
292348
293- for _ , item := range list .NonSkipped () {
294- if item .Skip {
295- continue
296- }
349+ for _ , item := range list .Imported () {
297350 tpl , err := meta .tf .Add (ctx , item .TFAddr (), tfexec .FromState (true ))
298351 if err != nil {
299352 return nil , fmt .Errorf ("converting terraform state to config for resource %s: %w" , item .TFAddr (), err )
@@ -335,7 +388,7 @@ func (meta *Meta) ResolveDependency(ctx context.Context, configs ConfigInfos) (C
335388 out = append (out , cfg )
336389 continue
337390 }
338- // This should never happen
391+ // This should never happen as we always ensure there is at least one implicit dependency on the resource group for each resource.
339392 if _ , ok := depInfo [armId ]; ! ok {
340393 return nil , fmt .Errorf ("can't find resource %q in the arm template" , armId .ID (meta .subscriptionId , meta .resourceGroup ))
341394 }
@@ -360,7 +413,6 @@ func (meta *Meta) GenerateConfig(cfgs ConfigInfos) error {
360413 return fmt .Errorf ("generating main configuration file: %w" , err )
361414 }
362415
363- fmt .Printf ("Please find the Terraform state and the config at: %s\n " , meta .workspace )
364416 return nil
365417}
366418
@@ -369,7 +421,7 @@ func (meta *Meta) hclBlockAppendDependency(body *hclwrite.Body, armIds []armtemp
369421 for _ , armid := range armIds {
370422 cfg , ok := cfgset [armid ]
371423 if ! ok {
372- dependencies = append (dependencies , fmt .Sprintf ("# Depending on %q, but it is not imported by Terraform. Please fix it manually ." , armid .ID (meta .subscriptionId , meta .resourceGroup )))
424+ dependencies = append (dependencies , fmt .Sprintf ("# Depending on %q, which is not imported by Terraform." , armid .ID (meta .subscriptionId , meta .resourceGroup )))
373425 continue
374426 }
375427 dependencies = append (dependencies , cfg .TFAddr ()+ "," )
0 commit comments