diff --git a/pkg/content/file/file.go b/pkg/content/file/file.go index d2c369e..ac053b8 100644 --- a/pkg/content/file/file.go +++ b/pkg/content/file/file.go @@ -16,7 +16,8 @@ import ( var _ artifact.OCI = (*File)(nil) type File struct { - ref string + Ref string + client *getter.Client computed bool @@ -31,7 +32,7 @@ func NewFile(ref string, opts ...Option) *File { f := &File{ client: client, - ref: ref, + Ref: ref, } for _, opt := range opts { @@ -77,7 +78,7 @@ func (f *File) compute() error { } ctx := context.Background() - blob, err := f.client.LayerFrom(ctx, f.ref) + blob, err := f.client.LayerFrom(ctx, f.Ref) if err != nil { return err } @@ -87,9 +88,9 @@ func (f *File) compute() error { return err } - cfg := f.client.Config(f.ref) + cfg := f.client.Config(f.Ref) if cfg == nil { - cfg = f.client.Config(f.ref) + cfg = f.client.Config(f.Ref) } cfgDesc, err := partial.Descriptor(cfg) diff --git a/pkg/content/file/file_test.go b/pkg/content/file/file_test.go index 4d84b22..abfa5aa 100644 --- a/pkg/content/file/file_test.go +++ b/pkg/content/file/file_test.go @@ -68,7 +68,7 @@ func Test_file_Config(t *testing.T) { got := string(m.Config.MediaType) if got != tt.want { - t.Errorf("Expected mediatype %s | got %s", got, tt.want) + t.Errorf("unxpected mediatype; got %s, want %s", got, tt.want) } }) } @@ -96,27 +96,26 @@ func Test_file_Layers(t *testing.T) { // TODO: Add directory test } for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + t.Run(tt.name, func(it *testing.T) { f := file.NewFile(tt.ref, file.WithClient(mc)) layers, err := f.Layers() if (err != nil) != tt.wantErr { - t.Errorf("Layers() error = %v, wantErr %v", err, tt.wantErr) - return + it.Fatalf("unexpected Layers() error: got %v, want %v", err, tt.wantErr) } rc, err := layers[0].Compressed() if err != nil { - t.Fatal(err) + it.Fatal(err) } got, err := io.ReadAll(rc) if err != nil { - t.Fatal(err) + it.Fatal(err) } if !bytes.Equal(got, tt.want) { - t.Errorf("Layers() got = %v, want %v", layers, tt.want) + it.Fatalf("unexpected Layers(): got %v, want %v", layers, tt.want) } }) }