diff --git a/pkg/cmd/scan/output/console.go b/pkg/cmd/scan/output/console.go index 03b089c5b..f00c981ab 100644 --- a/pkg/cmd/scan/output/console.go +++ b/pkg/cmd/scan/output/console.go @@ -34,12 +34,11 @@ func (c *Console) Write(analysis *analyser.Analysis) error { for ty, resources := range deletedByType { fmt.Printf(" %s:\n", ty) for _, res := range resources { - stringer, ok := res.(fmt.Stringer) - fmt.Printf(" - %s", res.TerraformId()) - if ok { - fmt.Printf(" (%s)", stringer.String()) + humanString := res.TerraformId() + if stringer, ok := res.(fmt.Stringer); ok { + humanString = stringer.String() } - fmt.Println() + fmt.Printf(" - %s\n", humanString) } } } @@ -50,12 +49,11 @@ func (c *Console) Write(analysis *analyser.Analysis) error { for ty, resource := range unmanagedByType { fmt.Printf(" %s:\n", ty) for _, res := range resource { - stringer, ok := res.(fmt.Stringer) - fmt.Printf(" - %s", res.TerraformId()) - if ok { - fmt.Printf(" (%s)", stringer.String()) + humanString := res.TerraformId() + if stringer, ok := res.(fmt.Stringer); ok { + humanString = stringer.String() } - fmt.Println() + fmt.Printf(" - %s\n", humanString) } } } @@ -63,12 +61,11 @@ func (c *Console) Write(analysis *analyser.Analysis) error { if analysis.Summary().TotalDrifted > 0 { fmt.Printf("Found drifted resources:\n") for _, difference := range analysis.Differences() { - stringer, ok := difference.Res.(fmt.Stringer) - humanString := difference.Res.TerraformType() - if ok { + humanString := difference.Res.TerraformId() + if stringer, ok := difference.Res.(fmt.Stringer); ok { humanString = stringer.String() } - fmt.Printf(" - %s (%s):\n", difference.Res.TerraformId(), humanString) + fmt.Printf(" - %s (%s):\n", humanString, difference.Res.TerraformType()) for _, change := range difference.Changelog { path := strings.Join(change.Path, ".") pref := fmt.Sprintf("%s %s:", color.YellowString("~"), path) diff --git a/pkg/cmd/scan/output/testdata/output_stringer_resources.txt b/pkg/cmd/scan/output/testdata/output_stringer_resources.txt index d1e89c551..00c13263b 100644 --- a/pkg/cmd/scan/output/testdata/output_stringer_resources.txt +++ b/pkg/cmd/scan/output/testdata/output_stringer_resources.txt @@ -1,11 +1,11 @@ Found deleted resources: FakeResourceStringer: - - dfjkgnbsgj (Name: 'deleted resource') + - Name: 'deleted resource' Found unmanaged resources: FakeResourceStringer: - - duysgkfdjfdgfhd (Name: 'unmanaged resource') + - Name: 'unmanaged resource' Found drifted resources: - - gdsfhgkbn (Name: 'resource with diff'): + - Name: 'resource with diff' (FakeResourceStringer): ~ Name: "" => "resource with diff" Found 3 resource(s) - 33% coverage