diff --git a/pkg/commands/resolver_test.go b/pkg/commands/resolver_test.go index af615af3a5..a04edfd752 100644 --- a/pkg/commands/resolver_test.go +++ b/pkg/commands/resolver_test.go @@ -65,6 +65,10 @@ var ( type erroringClient struct { daemon.Client + + inspectErr error + inspectResp types.ImageInspect + inspectBody []byte } func (m *erroringClient) NegotiateAPIVersion(context.Context) {} @@ -75,6 +79,10 @@ func (m *erroringClient) ImageTag(_ context.Context, _ string, _ string) error { return errImageTag } +func (m *erroringClient) ImageInspectWithRaw(_ context.Context, _ string) (types.ImageInspect, []byte, error) { + return m.inspectResp, m.inspectBody, m.inspectErr +} + func TestResolveMultiDocumentYAMLs(t *testing.T) { refs := []string{fooRef, barRef} hashes := []v1.Hash{fooHash, barHash} @@ -275,7 +283,7 @@ func TestNewPublisherCanPublish(t *testing.T) { Local: true, }, shouldError: true, - wantError: errImageLoad, + wantError: errImageTag, }, { description: "bare with local domain and repo", diff --git a/pkg/internal/testing/daemon.go b/pkg/internal/testing/daemon.go index 74c8f03fd1..620884b603 100644 --- a/pkg/internal/testing/daemon.go +++ b/pkg/internal/testing/daemon.go @@ -26,6 +26,10 @@ import ( type MockDaemon struct { daemon.Client Tags []string + + inspectErr error + inspectResp types.ImageInspect + inspectBody []byte } func (m *MockDaemon) NegotiateAPIVersion(context.Context) {} @@ -42,3 +46,7 @@ func (m *MockDaemon) ImageTag(_ context.Context, _ string, tag string) error { m.Tags = append(m.Tags, tag) return nil } + +func (m *MockDaemon) ImageInspectWithRaw(_ context.Context, _ string) (types.ImageInspect, []byte, error) { + return m.inspectResp, m.inspectBody, m.inspectErr +} diff --git a/pkg/publish/daemon_test.go b/pkg/publish/daemon_test.go index b13fe91f35..f11cc2088c 100644 --- a/pkg/publish/daemon_test.go +++ b/pkg/publish/daemon_test.go @@ -16,6 +16,7 @@ package publish_test import ( "context" + "fmt" "strings" "testing" @@ -63,7 +64,12 @@ func TestDaemonTags(t *testing.T) { t.Errorf("Publish() = %v, wanted prefix %v", got, want) } - expected := []string{"ko.local/98b8c7facdad74510a7cae0cd368eb4e:v2.0.0", "ko.local/98b8c7facdad74510a7cae0cd368eb4e:v1.2.3", "ko.local/98b8c7facdad74510a7cae0cd368eb4e:production"} + imgDigest, err := img.Digest() + if err != nil { + t.Fatalf("img.Digest() = %v", err) + } + + expected := []string{fmt.Sprintf("ko.local/98b8c7facdad74510a7cae0cd368eb4e:%s", strings.Replace(imgDigest.String(), "sha256:", "", 1)), "ko.local/98b8c7facdad74510a7cae0cd368eb4e:v2.0.0", "ko.local/98b8c7facdad74510a7cae0cd368eb4e:v1.2.3", "ko.local/98b8c7facdad74510a7cae0cd368eb4e:production"} for i, v := range expected { if client.Tags[i] != v {