address review comments

Author: marco-m-pix4d

go.sum

@@ -16,6 +16,7 @@ github.com/scylladb/go-set v1.0.3-0.20200225121959-cc7b2070d91e h1:7q6NSFZDeGfvv
 github.com/scylladb/go-set v1.0.3-0.20200225121959-cc7b2070d91e/go.mod h1:DkpGd78rljTxKAnTDPFqXSGxvETQnJyuSOQwsHycqfs=
 github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=

main.go

@@ -26,7 +26,7 @@ var (
 
 func main() {
 	if err := run(os.Args[1:]); err != nil {
-		fmt.Fprintf(os.Stderr, "%v\n", err)
+		fmt.Fprintf(os.Stderr, "error: %v\n", err)
 		os.Exit(1)
 	}
 }
@@ -83,21 +83,21 @@ func run(args []string) error {
 		return fmt.Errorf("parse: %v", err)
 	}
 
-	upMatches, downMatches := match_exact(create, destroy)
+	upMatches, downMatches := matchExact(create, destroy)
 
 	msg := collectErrors(create, destroy)
 	if msg != "" && !fuzzyMatch {
-		return fmt.Errorf("match_exact:%v", msg)
+		return fmt.Errorf("matchExact:%v", msg)
 	}
 
 	if fuzzyMatch && create.Size() == 0 && destroy.Size() == 0 {
-		return fmt.Errorf("required fuzzy-match but there is nothing to fuzzy")
+		return fmt.Errorf("required fuzzy-match but there is nothing left to match")
 	}
 	if fuzzyMatch {
-		upMatches, downMatches = match_fuzzy(create, destroy)
+		upMatches, downMatches = matchFuzzy(create, destroy)
 		msg := collectErrors(create, destroy)
 		if msg != "" {
-			return fmt.Errorf("match_fuzzy:%v", msg)
+			return fmt.Errorf("matchFuzzy: %v", msg)
 		}
 	}
 
@@ -179,10 +179,10 @@ func parse(rd io.Reader) (*strset.Set, *strset.Set, error) {
 //
 // Modify the two input sets so that they contain only the remaining (if any) unmatched elements.
 //
-// The criterium used to perform a match_exact is that one of the two elements must be a
+// The criterium used to perform a matchExact is that one of the two elements must be a
 // prefix of the other.
 // Note that the longest element could be the old or the new one, it depends on the inputs.
-func match_exact(create, destroy *strset.Set) (map[string]string, map[string]string) {
+func matchExact(create, destroy *strset.Set) (map[string]string, map[string]string) {
 	// old -> new (or equvalenty: destroy -> create)
 	upMatches := map[string]string{}
 	downMatches := map[string]string{}
@@ -211,18 +211,18 @@ func match_exact(create, destroy *strset.Set) (map[string]string, map[string]str
 }
 
 // Given two unordered sets create and destroy, that have already been processed by
-// match_exact(), perform a fuzzy match from destroy to create.
+// matchExact(), perform a fuzzy match from destroy to create.
 //
 // Return two maps, the first that fuzzy matches each old element in destroy to the
 // corresponding  new element in create (up), the second that matches in the opposite
 // direction (down).
 //
 // Modify the two input sets so that they contain only the remaining (if any) unmatched elements.
 //
-// The criterium used to perform a match_fuzzy is that one of the two elements must be a
+// The criterium used to perform a matchFuzzy is that one of the two elements must be a
 // fuzzy match of the other, according to some definition of fuzzy.
 // Note that the longest element could be the old or the new one, it depends on the inputs.
-func match_fuzzy(create, destroy *strset.Set) (map[string]string, map[string]string) {
+func matchFuzzy(create, destroy *strset.Set) (map[string]string, map[string]string) {
 	// old -> new (or equvalenty: destroy -> create)
 	upMatches := map[string]string{}
 	downMatches := map[string]string{}

main_test.go

@@ -111,7 +111,7 @@ func TestFailure(t *testing.T) {
 		},
 		{
 			"testdata/02_fuzzy-match.plan.txt",
-			fmt.Errorf(`match_exact:
+			fmt.Errorf(`matchExact:
 unmatched create:
   aws_route53_record.localhostnames_public["artifactory"]
   aws_route53_record.loopback["artifactory"]
@@ -252,7 +252,7 @@ func TestMatchExactZeroUnmatched(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.description, func(t *testing.T) {
-			gotUpMatches, gotDownMatches := match_exact(tc.create, tc.destroy)
+			gotUpMatches, gotDownMatches := matchExact(tc.create, tc.destroy)
 
 			if diff := cmp.Diff(tc.wantUpMatches, gotUpMatches); diff != "" {
 				t.Errorf("\nupMatches: mismatch (-want +got):\n%s", diff)
@@ -300,7 +300,7 @@ func TestMatchExactSomeUnmatched(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.description, func(t *testing.T) {
-			match_exact(tc.create, tc.destroy)
+			matchExact(tc.create, tc.destroy)
 
 			if diff := cmp.Diff(tc.wantCreate, tc.create, cmpOpt); diff != "" {
 				t.Errorf("\nUnmatched create: (-want +got):\n%s", diff)
@@ -330,26 +330,26 @@ func TestMatchFuzzyZeroUnmatched(t *testing.T) {
 			set.NewStringSet(
 				`foo.loopback["bar"]`,
 				`foo.private["bar"]`,
-				`foo.localhostnames_public["bar"]`),
+				`foo.public["bar"]`),
 			set.NewStringSet(
 				`foo.bar_loopback`,
 				`foo.bar_private`,
 				`foo.bar`),
 			map[string]string{
 				`foo.bar_loopback`: `foo.loopback["bar"]`,
 				`foo.bar_private`:  `foo.private["bar"]`,
-				`foo.bar`:          `foo.localhostnames_public["bar"]`},
+				`foo.bar`:          `foo.public["bar"]`},
 			map[string]string{
-				`foo.loopback["bar"]`:              `foo.bar_loopback`,
-				`foo.private["bar"]`:               `foo.bar_private`,
-				`foo.localhostnames_public["bar"]`: `foo.bar`},
+				`foo.loopback["bar"]`: `foo.bar_loopback`,
+				`foo.private["bar"]`:  `foo.bar_private`,
+				`foo.public["bar"]`:   `foo.bar`},
 		},
 	}
 
 	for _, tc := range testCases {
 		t.Run(tc.description, func(t *testing.T) {
 
-			gotUpMatches, gotDownMatches := match_fuzzy(tc.create, tc.destroy)
+			gotUpMatches, gotDownMatches := matchFuzzy(tc.create, tc.destroy)
 
 			if diff := cmp.Diff(tc.wantUpMatches, gotUpMatches); diff != "" {
 				t.Errorf("\nupMatches: mismatch (-want +got):\n%s", diff)

testdata/03_fuzzy-match.plan.txt

@@ -19,4 +19,3 @@
   # aws_route53_record.localhostnames_public["anka"] will be created
   # aws_route53_record.localhostnames_public["anka-api"] will be created
   # aws_route53_record.localhostnames_public["anka-test"] will be created
-