Merge pull request #1384 from thedadams/mink-bump-04bf81884e15

Ensure list types are correct for all public objects (#1383)

Author: thedadams

go.mod

@@ -18,7 +18,7 @@ require (
 	github.com/AlecAivazis/survey/v2 v2.3.6
 	github.com/acorn-io/aml v0.0.0-20230325055444-afdc93f2ebb4
 	github.com/acorn-io/baaah v0.0.0-20230314011022-8b20d035baa2
-	github.com/acorn-io/mink v0.0.0-20230322170736-9b5c9bdef8c4
+	github.com/acorn-io/mink v0.0.0-20230324184309-04bf81884e15
 	github.com/acorn-io/namegenerator v0.0.0-20220915160418-9e3d5a0ffe78
 	github.com/adrg/xdg v0.4.0
 	github.com/containerd/console v1.0.3

go.sum

@@ -92,8 +92,8 @@ github.com/acorn-io/component-base v0.25.2-ot-1/go.mod h1:/5qYr5BXGNPs+cRd6+WL1N
 github.com/acorn-io/etcd/server/v3 v3.5.4-ot-1 h1:sQMBy/UImb1923toh9U0oIxlpO7crLrD7eKE/orB/pQ=
 github.com/acorn-io/lasso v0.0.0-20220519152917-47b14aceb5cf h1:y2vkS4R2O+iRDUP8QLvS10i7RoVaMP4spSPGdM93jXo=
 github.com/acorn-io/lasso v0.0.0-20220519152917-47b14aceb5cf/go.mod h1:T6WoUopOHBWTGjnphruTJAgoZ+dpm6llvn6GDYaa7Kw=
-github.com/acorn-io/mink v0.0.0-20230322170736-9b5c9bdef8c4 h1:V9mP+/fVxP+j9W0ks4qMedibaC2g7XICqrWMMadwZqc=
-github.com/acorn-io/mink v0.0.0-20230322170736-9b5c9bdef8c4/go.mod h1:vhGespZm+y5YRTQ9L/zDFrOuzIbouVbA8sbykaPbzhE=
+github.com/acorn-io/mink v0.0.0-20230324184309-04bf81884e15 h1:b5AKbjnT9P1210EGeuFh2sy5uL8/GYJyoGtNxSw2ICo=
+github.com/acorn-io/mink v0.0.0-20230324184309-04bf81884e15/go.mod h1:vhGespZm+y5YRTQ9L/zDFrOuzIbouVbA8sbykaPbzhE=
 github.com/acorn-io/namegenerator v0.0.0-20220915160418-9e3d5a0ffe78 h1:5zs9L/CXNkuTdJSbhFWczAorbmx67nqlqswx5CQi7XI=
 github.com/acorn-io/namegenerator v0.0.0-20220915160418-9e3d5a0ffe78/go.mod h1:/5647+1/L7m7Aq7upTLtfLznTLYttURzH7Y23LKrW0M=
 github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls=

integration/client/credentials/credentials_test.go

@@ -93,8 +93,17 @@ func TestCredentialList(t *testing.T) {
 		return creds[i].Username < creds[j].Username
 	})
 
-	assert.Equal(t, cred1, &creds[0])
-	assert.Equal(t, cred2, &creds[1])
+	assert.Equal(t, cred1.ObjectMeta, creds[0].ObjectMeta)
+	assert.Equal(t, cred1.ServerAddress, creds[0].ServerAddress)
+	assert.Equal(t, cred1.Username, creds[0].Username)
+	assert.Equal(t, cred1.Password, creds[0].Password)
+	assert.Equal(t, cred1.SkipChecks, creds[0].SkipChecks)
+
+	assert.Equal(t, cred2.ObjectMeta, creds[1].ObjectMeta)
+	assert.Equal(t, cred2.ServerAddress, creds[1].ServerAddress)
+	assert.Equal(t, cred2.Username, creds[1].Username)
+	assert.Equal(t, cred2.Password, creds[1].Password)
+	assert.Equal(t, cred2.SkipChecks, creds[1].SkipChecks)
 }
 
 func TestCredentialGet(t *testing.T) {

integration/client/secrets/secrets_test.go

@@ -65,8 +65,15 @@ func TestSecretList(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	assert.Equal(t, secret1, &secrets[1])
-	assert.Equal(t, secret2, &secrets[0])
+	assert.Equal(t, secret1.ObjectMeta, secrets[1].ObjectMeta)
+	assert.Equal(t, secret1.Type, secrets[1].Type)
+	assert.Equal(t, secret1.Keys, secrets[1].Keys)
+	assert.Equal(t, secret1.Data, secrets[1].Data)
+
+	assert.Equal(t, secret2.ObjectMeta, secrets[0].ObjectMeta)
+	assert.Equal(t, secret2.Type, secrets[0].Type)
+	assert.Equal(t, secret2.Keys, secrets[0].Keys)
+	assert.Equal(t, secret2.Data, secrets[0].Data)
 }
 
 func TestSecretGet(t *testing.T) {