chore: upgrade dependencies (#8431)

* fix dependency confilicts and fix tests * chore: fix tests * chore: fix tests and lint issues * chore: fix ko test and lint issues
GoogleContainerTools · Feb 14, 2023 · e1bd270 · e1bd270
1 parent 4c9c341
commit e1bd270
Show file tree

Hide file tree

Showing 46 changed files with 1,592 additions and 2,495 deletions.
diff --git a/cmd/skaffold/app/cmd/config/list_test.go b/cmd/skaffold/app/cmd/config/list_test.go
@@ -65,8 +65,8 @@ default-repo: value
 multi-level-repo: true
 local-cluster: true
 insecure-registries:
-- bad.io
-- worse.io
+  - bad.io
+  - worse.io
 `,
 		},
 		{
@@ -90,7 +90,7 @@ insecure-registries:
 multi-level-repo: true
 local-cluster: true
 insecure-registries:
-- mediocre.io
+  - mediocre.io
 `,
 		},
 		{
@@ -116,10 +116,10 @@ global:
   multi-level-repo: true
   local-cluster: true
   insecure-registries:
-  - mediocre.io
+    - mediocre.io
 kubeContexts:
-- kube-context: this_is_a_context
-  default-repo: value
+  - kube-context: this_is_a_context
+    default-repo: value
 `,
 		},
 		{

diff --git a/cmd/skaffold/app/cmd/filter_test.go b/cmd/skaffold/app/cmd/filter_test.go
@@ -99,7 +99,7 @@ spec:
 			var b bytes.Buffer
 			err := runFilter(context.TODO(), &b, false, test.buildArtifacts)
 			t.CheckNoError(err)
-			t.CheckDeepEqual(test.expected, b.String())
+			t.CheckDeepEqual(test.expected, b.String(), testutil.YamlObj(t.T))
 		})
 	}
 }
diff --git a/cmd/skaffold/app/cmd/fix_test.go b/cmd/skaffold/app/cmd/fix_test.go
@@ -22,6 +22,8 @@ import (
 	"os"
 	"testing"
 
+	"github.com/google/go-cmp/cmp"
+
 	"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/schema/latest"
 	v1 "github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/schema/v1"
 	"github.com/GoogleContainerTools/skaffold/v2/testutil"
@@ -34,10 +36,12 @@ func TestFix(t *testing.T) {
 		targetVersion string
 		output        string
 		shouldErr     bool
+		cmpOptions    cmp.Options
 	}{
 		{
 			description:   "v1alpha4 to latest",
 			targetVersion: latest.Version,
+			cmpOptions:    []cmp.Option{testutil.YamlObj(t)},
 			inputYaml: `apiVersion: skaffold/v1alpha4
 kind: Config
 build:
@@ -75,6 +79,7 @@ deploy:
 		{
 			description:   "v1alpha1 to latest",
 			targetVersion: latest.Version,
+			cmpOptions:    []cmp.Option{testutil.YamlObj(t)},
 			inputYaml: `apiVersion: skaffold/v1alpha1
 kind: Config
 build:
@@ -104,6 +109,7 @@ deploy:
 		{
 			description:   "v1alpha1 to v1",
 			targetVersion: v1.Version,
+			cmpOptions:    []cmp.Option{testutil.YamlObj(t)},
 			inputYaml: `apiVersion: skaffold/v1alpha1
 kind: Config
 build:
@@ -161,8 +167,7 @@ build:
 
 			var b bytes.Buffer
 			err := fix(&b, cfgFile, "", test.targetVersion)
-
-			t.CheckErrorAndDeepEqual(test.shouldErr, err, test.output, b.String())
+			t.CheckErrorAndDeepEqual(test.shouldErr, err, test.output, b.String(), test.cmpOptions)
 		})
 	}
 }
@@ -211,6 +216,6 @@ deploy:
 		output, _ := os.ReadFile(cfgFile)
 
 		t.CheckNoError(err)
-		t.CheckDeepEqual(expectedOutput, string(output))
+		t.CheckDeepEqual(expectedOutput, string(output), testutil.YamlObj(t.T))
 	})
 }