enable get

google · Jan 30, 2024 · 9591bf8 · 9591bf8
1 parent c62c9b0
commit 9591bf8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/pkg/v1/remote/descriptor.go b/pkg/v1/remote/descriptor.go
@@ -69,9 +69,9 @@ func (d *Descriptor) RawManifest() ([]byte, error) {
 // querying what kind of artifact a reference represents.
 //
 // See Head if you don't need the response body.
-// func Get(ref name.Reference, options ...Option) (*Descriptor, error) {
-// 	return get(ref, allManifestMediaTypes, options...)
-// }
+func Get(ref name.Reference, options ...Option) (*Descriptor, error) {
+	return get(ref, allManifestMediaTypes, options...)
+}
 
 // Head returns a v1.Descriptor for the given reference by issuing a HEAD
 // request.
@@ -89,13 +89,13 @@ func Head(ref name.Reference, options ...Option) (*v1.Descriptor, error) {
 
 // Handle options and fetch the manifest with the acceptable MediaTypes in the
 // Accept header.
-// func get(ref name.Reference, acceptable []types.MediaType, options ...Option) (*Descriptor, error) {
-// 	o, err := makeOptions(options...)
-// 	if err != nil {
-// 		return nil, err
-// 	}
-// 	return newPuller(o).get(o.context, ref, acceptable, o.platform)
-// }
+func get(ref name.Reference, acceptable []types.MediaType, options ...Option) (*Descriptor, error) {
+	o, err := makeOptions(append(options, WithAcceptableMediaTypes(acceptable))...)
+	if err != nil {
+		return nil, err
+	}
+	return newPuller(o).Get(o.context, ref)
+}
 
 // Image converts the Descriptor into a v1.Image.
 //

diff --git a/pkg/v1/remote/options.go b/pkg/v1/remote/options.go
@@ -129,14 +129,15 @@ var DefaultTransport http.RoundTripper = &http.Transport{
 
 func makeOptions(opts ...Option) (*options, error) {
 	o := &options{
-		transport:        DefaultTransport,
-		platform:         defaultPlatform,
-		context:          context.Background(),
-		jobs:             defaultJobs,
-		pageSize:         defaultPageSize,
-		retryPredicate:   defaultRetryPredicate,
-		retryBackoff:     defaultRetryBackoff,
-		retryStatusCodes: defaultRetryStatusCodes,
+		transport:            DefaultTransport,
+		platform:             defaultPlatform,
+		acceptableMediaTypes: allManifestMediaTypes,
+		context:              context.Background(),
+		jobs:                 defaultJobs,
+		pageSize:             defaultPageSize,
+		retryPredicate:       defaultRetryPredicate,
+		retryBackoff:         defaultRetryBackoff,
+		retryStatusCodes:     defaultRetryStatusCodes,
 	}
 
 	for _, option := range opts {

diff --git a/pkg/v1/remote/puller.go b/pkg/v1/remote/puller.go
@@ -106,7 +106,7 @@ func (p *puller) Head(ctx context.Context, ref name.Reference) (*v1.Descriptor,
 
 // Get is like remote.Get, but avoids re-authenticating when possible.
 func (p *puller) Get(ctx context.Context, ref name.Reference) (*Descriptor, error) {
-	return p.get(ctx, ref, allManifestMediaTypes, p.o.platform)
+	return p.get(ctx, ref, p.o.acceptableMediaTypes, p.o.platform)
 }
 
 func (p *puller) get(ctx context.Context, ref name.Reference, acceptable []types.MediaType, platform v1.Platform) (*Descriptor, error) {