From bcd04d5a6417d5cf13e03c93f59d577c92f81793 Mon Sep 17 00:00:00 2001
From: Eli Treuherz <et@arenko.group>
Date: Tue, 18 Jun 2024 12:05:49 +0100
Subject: [PATCH] Style fixes to test

Signed-off-by: Eli Treuherz <et@arenko.group>
---
 go.mod                         |  2 +-
 util/buildflags/export_test.go | 45 +++++++++++++++++-----------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/go.mod b/go.mod
index 14442e0b..7244a24e 100644
--- a/go.mod
+++ b/go.mod
@@ -21,7 +21,6 @@ require (
 	github.com/gofrs/flock v0.8.1
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang/protobuf v1.5.4
-	github.com/google/go-cmp v0.6.0
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/google/uuid v1.6.0
 	github.com/hashicorp/go-cty-funcs v0.0.0-20230405223818-a090f58aa992
@@ -99,6 +98,7 @@ require (
 	github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
 	github.com/gogo/googleapis v1.4.1 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
diff --git a/util/buildflags/export_test.go b/util/buildflags/export_test.go
index b39ab130..15aa7d25 100644
--- a/util/buildflags/export_test.go
+++ b/util/buildflags/export_test.go
@@ -5,7 +5,6 @@ import (
 	"slices"
 	"testing"
 
-	gocmp "github.com/google/go-cmp/cmp"
 	"github.com/moby/buildkit/exporter/containerimage/exptypes"
 	ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/stretchr/testify/assert"
@@ -86,33 +85,35 @@ func TestParseAnnotations(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			got, gotErr := ParseAnnotations(test.in)
+			got, err := ParseAnnotations(test.in)
 			if test.wantErr != "" {
-				require.ErrorContains(t, gotErr, test.wantErr)
+				require.ErrorContains(t, err, test.wantErr)
 			} else {
-				assert.NoError(t, gotErr)
+				require.NoError(t, err)
 			}
 
 			// Can't compare maps with pointer in their keys, need to extract and sort the map entries
-			type kv struct {
-				Key exptypes.AnnotationKey
-				Val string
-			}
-			var wantKVs, gotKVs []kv
-			for k, v := range test.want {
-				wantKVs = append(wantKVs, kv{k, v})
-			}
-			for k, v := range got {
-				gotKVs = append(gotKVs, kv{k, v})
-			}
+			wantKVs := entries(test.want)
+			gotKVs := entries(got)
 
-			sortFunc := func(a, b kv) int { return cmp.Compare(a.Key.String(), b.Key.String()) }
-			slices.SortFunc(wantKVs, sortFunc)
-			slices.SortFunc(gotKVs, sortFunc)
-
-			if diff := gocmp.Diff(wantKVs, gotKVs); diff != "" {
-				t.Error(diff)
-			}
+			assert.Equal(t, wantKVs, gotKVs)
 		})
 	}
 }
+
+type kv struct {
+	Key exptypes.AnnotationKey
+	Val string
+}
+
+func entries(in map[exptypes.AnnotationKey]string) []kv {
+	var out []kv
+	for k, v := range in {
+		out = append(out, kv{k, v})
+	}
+
+	sortFunc := func(a, b kv) int { return cmp.Compare(a.Key.String(), b.Key.String()) }
+	slices.SortFunc(out, sortFunc)
+
+	return out
+}