@ -18,26 +18,31 @@ package registry // import "helm.sh/helm/v4/pkg/registry"
import ( import (
"context"
"context"
"encoding/base64"
"crypto/tls"
"crypto/x509"
"encoding/json"
"encoding/json"
"fmt"
"fmt"
"io"
"io"
"net/http"
"net/http"
"net/url"
"net/url"
"os"
"sort"
"sort"
"strings"
"strings"
"sync"
"github.com/Masterminds/semver/v3"
"github.com/Masterminds/semver/v3"
"github.com/containerd/containerd/remotes"
"github.com/containerd/containerd/remotes"
"github.com/opencontainers/image-spec/specs-go"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors"
"github.com/pkg/errors"
"oras.land/oras-go/pkg/auth"
"oras.land/oras-go/v2"
dockerauth "oras.land/oras-go/pkg/auth/docker"
"oras.land/oras-go/v2/content"
"oras.land/oras-go/pkg/content"
"oras.land/oras-go/v2/content/memory"
"oras.land/oras-go/pkg/oras"
"oras.land/oras-go/v2/registry"
"oras.land/oras-go/pkg/registry"
"oras.land/oras-go/v2/registry/remote"
registryremote "oras.land/oras-go/pkg/registry/remote"
"oras.land/oras-go/v2/registry/remote/auth"
registryauth "oras.land/oras-go/pkg/registry/remote/auth"
"oras.land/oras-go/v2/registry/remote/credentials"
"oras.land/oras-go/v2/registry/remote/retry"
"helm.sh/helm/v4/internal/version"
"helm.sh/helm/v4/internal/version"
"helm.sh/helm/v4/pkg/chart"
"helm.sh/helm/v4/pkg/chart"
@ -51,6 +56,8 @@ storing semantic versions, Helm adopts the convention of changing plus (+) to
an underscore ( _ ) in chart version tags when pushing to a registry and back to an underscore ( _ ) in chart version tags when pushing to a registry and back to
a plus ( + ) when pulling from a registry . ` a plus ( + ) when pulling from a registry . `
var errDeprecatedRemote = errors . New ( "providing github.com/containerd/containerd/remotes.Resolver via ClientOptResolver is no longer suported" )
type ( type (
// RemoteClient shadows the ORAS remote.Client interface
// RemoteClient shadows the ORAS remote.Client interface
// (hiding the ORAS type from Helm client visibility)
// (hiding the ORAS type from Helm client visibility)
@ -68,11 +75,12 @@ type (
username string
username string
password string
password string
out io . Writer
out io . Writer
authorizer auth . Client
authorizer * auth . Client
registryAuthorizer RemoteClient
registryAuthorizer RemoteClient
resolver func ( ref registry . Reference ) ( remotes . Resolver , error )
credentialsStore credentials . Store
httpClient * http . Client
httpClient * http . Client
plainHTTP bool
plainHTTP bool
err error // pass any errors from the ClientOption functions
}
}
// ClientOption allows specifying various settings configurable by the user for overriding the defaults
// ClientOption allows specifying various settings configurable by the user for overriding the defaults
@ -87,101 +95,70 @@ func NewClient(options ...ClientOption) (*Client, error) {
}
}
for _ , option := range options {
for _ , option := range options {
option ( client )
option ( client )
if client . err != nil {
return nil , client . err
}
}
}
if client . credentialsFile == "" {
if client . credentialsFile == "" {
client . credentialsFile = helmpath . ConfigPath ( CredentialsFileBasename )
client . credentialsFile = helmpath . ConfigPath ( CredentialsFileBasename )
}
}
if client . authorizer == nil {
if client . httpClient == nil {
authClient , err := dockerauth . NewClientWithDockerFallback ( client . credentialsFile )
type cloner [ T any ] interface {
if err != nil {
Clone ( ) T
return nil , err
}
client . authorizer = authClient
}
}
resolverFn := client . resolver // copy for avoiding recursive call
// try to copy (clone) the http.DefaultTransport so any mutations we
client . resolver = func ( ref registry . Reference ) ( remotes . Resolver , error ) {
// perform on it (e.g. TLS config) are not reflected globally
if resolverFn != nil {
// follow https://github.com/golang/go/issues/39299 for a more elegant
// validate if the resolverFn returns a valid resolver
// solution in the future
if resolver , err := resolverFn ( ref ) ; resolver != nil && err == nil {
transport := http . DefaultTransport
return resolver , nil
if t , ok := transport . ( cloner [ * http . Transport ] ) ; ok {
transport = t . Clone ( )
} else if t , ok := transport . ( cloner [ http . RoundTripper ] ) ; ok {
// this branch will not be used with go 1.20, it was added
// optimistically to try to clone if the http.DefaultTransport
// implementation changes, still the Clone method in that case
// might not return http.RoundTripper...
transport = t . Clone ( )
}
}
client . httpClient = & http . Client {
Transport : retry . NewTransport ( transport ) ,
}
}
headers := http . Header { }
headers . Set ( "User-Agent" , version . GetUserAgent ( ) )
opts := [ ] auth . ResolverOption { auth . WithResolverHeaders ( headers ) }
if client . httpClient != nil {
opts = append ( opts , auth . WithResolverClient ( client . httpClient ) )
}
if client . plainHTTP {
opts = append ( opts , auth . WithResolverPlainHTTP ( ) )
}
}
// if username and password are set, use them for authentication
storeOptions := credentials . StoreOptions {
// by adding the basic auth Authorization header to the resolver
AllowPlaintextPut : true ,
if client . username != "" && client . password != "" {
DetectDefaultNativeStore : true ,
concat := client . username + ":" + client . password
encodedAuth := base64 . StdEncoding . EncodeToString ( [ ] byte ( concat ) )
opts = append ( opts , auth . WithResolverHeaders (
http . Header {
"Authorization" : [ ] string { "Basic " + encodedAuth } ,
} ,
) )
}
}
store , err := credentials . NewStore ( client . credentialsFile , storeOptions )
resolver , err := client . authorizer . ResolverWithOpts ( opts ... )
if err != nil {
if err != nil {
return nil , err
return nil , err
}
}
return resolver , nil
dockerStore , err := credentials . NewStoreFromDocker ( storeOptions )
if err != nil {
// should only fail if user home directory can't be determined
client . credentialsStore = store
} else {
// use Helm credentials with fallback to Docker
client . credentialsStore = credentials . NewStoreWithFallbacks ( store , dockerStore )
}
}
// allocate a cache if option is set
if client . authorizer == nil {
var cache registryauth . Cache
authorizer := auth . Client {
if client . enableCache {
cache = registryauth . DefaultCache
}
if client . registryAuthorizer == nil {
client . registryAuthorizer = & registryauth . Client {
Client : client . httpClient ,
Client : client . httpClient ,
Header : http . Header {
"User-Agent" : { version . GetUserAgent ( ) } ,
} ,
Cache : cache ,
Credential : func ( _ context . Context , reg string ) ( registryauth . Credential , error ) {
if client . username != "" && client . password != "" {
return registryauth . Credential {
Username : client . username ,
Password : client . password ,
} , nil
}
}
authorizer . SetUserAgent ( version . GetUserAgent ( ) )
dockerClient , ok := client . authorizer . ( * dockerauth . Client )
authorizer . Credential = credentials . Credential ( client . credentialsStore )
if ! ok {
return registryauth . EmptyCredential , errors . New ( "unable to obtain docker client" )
}
username , password , err := dockerClient . Credential ( reg )
if err != nil {
return registryauth . EmptyCredential , errors . New ( "unable to retrieve credentials" )
}
// A blank returned username and password value is a bearer token
if client . enableCache {
if username == "" && password != "" {
authorizer . Cache = auth . NewCache ( )
return registryauth . Credential {
RefreshToken : password ,
} , nil
}
}
return registryauth . Credential {
client . authorizer = & authorizer
Username : username ,
Password : password ,
} , nil
} ,
}
}
}
return client , nil
return client , nil
} }
@ -220,7 +197,7 @@ func ClientOptWriter(out io.Writer) ClientOption {
// Depending on the use-case you may need to set both ClientOptAuthorizer and ClientOptRegistryAuthorizer.
// Depending on the use-case you may need to set both ClientOptAuthorizer and ClientOptRegistryAuthorizer.
func ClientOptAuthorizer ( authorizer auth . Client ) ClientOption { func ClientOptAuthorizer ( authorizer auth . Client ) ClientOption {
return func ( client * Client ) {
return func ( client * Client ) {
client . authorizer = authorizer
client . authorizer = & authorizer
}
}
} }
@ -254,12 +231,9 @@ func ClientOptPlainHTTP() ClientOption {
}
}
} }
// ClientOptResolver returns a function that sets the resolver setting on a client options set
func ClientOptResolver ( _ remotes . Resolver ) ClientOption {
func ClientOptResolver ( resolver remotes . Resolver ) ClientOption { return func ( c * Client ) {
return func ( client * Client ) {
c . err = errDeprecatedRemote
client . resolver = func ( _ registry . Reference ) ( remotes . Resolver , error ) {
return resolver , nil
}
}
}
} }
@ -268,60 +242,128 @@ type (
LoginOption func ( * loginOperation )
LoginOption func ( * loginOperation )
loginOperation struct {
loginOperation struct {
username string
host string
password string
client * Client
insecure bool
certFile string
keyFile string
caFile string
}
}
) )
// Login logs into a registry
// Login logs into a registry
func ( c * Client ) Login ( host string , options ... LoginOption ) error { func ( c * Client ) Login ( host string , options ... LoginOption ) error {
operation := & loginOperation { }
for _ , option := range options {
for _ , option := range options {
option ( )
option ( & l oginO peration{ host , c } )
}
}
authorizerLoginOpts := [ ] auth . LoginOption {
auth . WithLoginContext ( ctx ( c . out , c . debug ) ) ,
reg , err := remote . NewRegistry ( host )
auth . WithLoginHostname ( host ) ,
if err != nil {
auth . WithLoginUsername ( operation . username ) ,
return err
auth . WithLoginSecret ( operation . password ) ,
}
auth . WithLoginUserAgent ( version . GetUserAgent ( ) ) ,
reg . PlainHTTP = c . plainHTTP
auth . WithLoginTLS ( operation . certFile , operation . keyFile , operation . caFile ) ,
reg . Client = c . authorizer
ctx := context . Background ( )
cred , err := c . authorizer . Credential ( ctx , host )
if err != nil {
return fmt . Errorf ( "fetching credentials for %q: %w" , host , err )
}
}
if operation . insecure {
authorizerLoginOpts = append ( authorizerLoginOpts , auth . WithLoginInsecure ( ) )
if err := reg . Ping ( ctx ) ; err != nil {
return fmt . Errorf ( "authenticating to %q: %w" , host , err )
}
}
if err := c . authorizer . LoginWithOpts ( authorizerLoginOpts ... ) ; err != nil {
key := credentials . ServerAddressFromRegistry ( host )
if err := c . credentialsStore . Put ( ctx , key , cred ) ; err != nil {
return err
return err
}
}
fmt . Fprintln ( c . out , "Login Succeeded" )
fmt . Fprintln ( c . out , "Login Succeeded" )
return nil
return nil
} }
// LoginOptBasicAuth returns a function that sets the username/password settings on login
// LoginOptBasicAuth returns a function that sets the username/password settings on login
func LoginOptBasicAuth ( username string , password string ) LoginOption { func LoginOptBasicAuth ( username string , password string ) LoginOption {
return func ( operation * loginOperation ) {
return func ( o * loginOperation ) {
operation . username = username
o . client . username = username
operation . password = password
o . client . password = password
o . client . authorizer . Credential = auth . StaticCredential ( o . host , auth . Credential { Username : username , Password : password } )
}
}
} }
// LoginOptPlainText returns a function that allows plaintext (HTTP) login
func LoginOptPlainText ( isPlainText bool ) LoginOption {
return func ( o * loginOperation ) {
o . client . plainHTTP = isPlainText
}
}
func ensureTLSConfig ( client * auth . Client ) ( * tls . Config , error ) {
var transport * http . Transport
switch t := client . Client . Transport . ( type ) {
case * http . Transport :
transport = t
case * retry . Transport :
switch t := t . Base . ( type ) {
case * http . Transport :
transport = t
}
}
if transport == nil {
// we don't know how to access the http.Transport, most likely the
// auth.Client.Client was provided by API user
return nil , fmt . Errorf ( "unable to access TLS client configuration, the provided HTTP Transport is not supported, given: %T" , client . Client . Transport )
}
if transport . TLSClientConfig == nil {
transport . TLSClientConfig = & tls . Config { }
}
return transport . TLSClientConfig , nil
}
// LoginOptInsecure returns a function that sets the insecure setting on login
// LoginOptInsecure returns a function that sets the insecure setting on login
func LoginOptInsecure ( insecure bool ) LoginOption { func LoginOptInsecure ( insecure bool ) LoginOption {
return func ( operation * loginOperation ) {
return func ( o * loginOperation ) {
operation . insecure = insecure
tlsConfig , err := ensureTLSConfig ( o . client . authorizer )
if err != nil {
panic ( err )
}
tlsConfig . InsecureSkipVerify = insecure
}
}
} }
// LoginOptTLSClientConfig returns a function that sets the TLS settings on login.
// LoginOptTLSClientConfig returns a function that sets the TLS settings on login.
func LoginOptTLSClientConfig ( certFile , keyFile , caFile string ) LoginOption { func LoginOptTLSClientConfig ( certFile , keyFile , caFile string ) LoginOption {
return func ( operation * loginOperation ) {
return func ( o * loginOperation ) {
operation . certFile = certFile
if ( certFile == "" || keyFile == "" ) && caFile == "" {
operation . keyFile = keyFile
return
operation . caFile = caFile
}
tlsConfig , err := ensureTLSConfig ( o . client . authorizer )
if err != nil {
panic ( err )
}
if certFile != "" && keyFile != "" {
authCert , err := tls . LoadX509KeyPair ( certFile , keyFile )
if err != nil {
panic ( err )
}
tlsConfig . Certificates = [ ] tls . Certificate { authCert }
}
if caFile != "" {
certPool := x509 . NewCertPool ( )
ca , err := os . ReadFile ( caFile )
if err != nil {
panic ( err )
}
if ! certPool . AppendCertsFromPEM ( ca ) {
panic ( fmt . Errorf ( "unable to parse CA file: %q" , caFile ) )
}
tlsConfig . RootCAs = certPool
}
}
}
} }
@ -338,7 +380,8 @@ func (c *Client) Logout(host string, opts ...LogoutOption) error {
for _ , opt := range opts {
for _ , opt := range opts {
opt ( operation )
opt ( operation )
}
}
if err := c . authorizer . Logout ( ctx ( c . out , c . debug ) , host ) ; err != nil {
if err := credentials . Logout ( context . Background ( ) , c . credentialsStore , host ) ; err != nil {
return err
return err
}
}
fmt . Fprintf ( c . out , "Removing login credentials for %s\n" , host )
fmt . Fprintf ( c . out , "Removing login credentials for %s\n" , host )
@ -393,8 +436,9 @@ func (c *Client) Pull(ref string, options ...PullOption) (*PullResult, error) {
return nil , errors . New (
return nil , errors . New (
"must specify at least one layer to pull (chart/prov)" )
"must specify at least one layer to pull (chart/prov)" )
}
}
memoryStore := content. NewMemory ( )
memoryStore := memory. New ( )
allowedMediaTypes := [ ] string {
allowedMediaTypes := [ ] string {
ocispec . MediaTypeImageManifest ,
ConfigMediaType ,
ConfigMediaType ,
}
}
minNumDescriptors := 1 // 1 for the config
minNumDescriptors := 1 // 1 for the config
@ -410,18 +454,34 @@ func (c *Client) Pull(ref string, options ...PullOption) (*PullResult, error) {
}
}
var descriptors , layers [ ] ocispec . Descriptor
var descriptors , layers [ ] ocispec . Descriptor
remotesResolver , err := c . resolver ( parsedRef . orasReference )
repository , err := remote . NewRepository ( parsedRef . String ( ) )
if err != nil {
if err != nil {
return nil , err
return nil , err
}
}
registryStore := content . Registry { Resolver : remotesResolver }
repository . PlainHTTP = c . plainHTTP
repository . Client = c . authorizer
manifest , err := oras . Copy ( ctx ( c . out , c . debug ) , registryStore , parsedRef . String ( ) , memoryStore , "" ,
ctx := context . Background ( )
oras . WithPullEmptyNameAllowed ( ) ,
oras . WithAllowedMediaTypes ( allowedMediaTypes ) ,
sort . Strings ( allowedMediaTypes )
oras . WithLayerDescriptors ( func ( l [ ] ocispec . Descriptor ) {
layers = l
var mu sync . Mutex
} ) )
manifest , err := oras . Copy ( ctx , repository , parsedRef . String ( ) , memoryStore , "" , oras . CopyOptions {
CopyGraphOptions : oras . CopyGraphOptions {
PreCopy : func ( _ context . Context , desc ocispec . Descriptor ) error {
mediaType := desc . MediaType
if i := sort . SearchStrings ( allowedMediaTypes , mediaType ) ; i >= len ( allowedMediaTypes ) || allowedMediaTypes [ i ] != mediaType {
return errors . Errorf ( "media type %q is not allowed, found in descriptor with digest: %q" , mediaType , desc . Digest )
}
mu . Lock ( )
layers = append ( layers , desc )
mu . Unlock ( )
return nil
} ,
} ,
} )
if err != nil {
if err != nil {
return nil , err
return nil , err
}
}
@ -480,55 +540,38 @@ func (c *Client) Pull(ref string, options ...PullOption) (*PullResult, error) {
Prov : & DescriptorPullSummary { } ,
Prov : & DescriptorPullSummary { } ,
Ref : parsedRef . String ( ) ,
Ref : parsedRef . String ( ) ,
}
}
var getManifestErr error
if _ , manifestData , ok := memoryStore . Get ( manifest ) ; ! ok {
result . Manifest . Data , err = content . FetchAll ( ctx , memoryStore , manifest )
getManifestErr = errors . Errorf ( "Unable to retrieve blob with digest %s" , manifest . Digest )
if err != nil {
} else {
return nil , fmt . Errorf ( "unable to retrieve blob with digest %s: %w" , manifest . Digest , err )
result . Manifest . Data = manifestData
}
}
if getManifestErr != nil {
return nil , getManifestErr
result . Config . Data , err = content . FetchAll ( ctx , memoryStore , * configDescriptor )
if err != nil {
return nil , fmt . Errorf ( "unable to retrieve blob with digest %s: %w" , configDescriptor . Digest , err )
}
}
var getConfigDescriptorErr error
if _ , configData , ok := memoryStore . Get ( * configDescriptor ) ; ! ok {
if err := json . Unmarshal ( result . Config . Data , & result . Chart . Meta ) ; err != nil {
getConfigDescriptorErr = errors . Errorf ( "Unable to retrieve blob with digest %s" , configDescriptor . Digest )
} else {
result . Config . Data = configData
var meta * chart . Metadata
if err := json . Unmarshal ( configData , & meta ) ; err != nil {
return nil , err
return nil , err
}
}
result . Chart . Meta = meta
}
if getConfigDescriptorErr != nil {
return nil , getConfigDescriptorErr
}
if operation . withChart {
if operation . withChart {
var getChartDescriptorErr error
result . Chart . Data , err = content . FetchAll ( ctx , memoryStore , * chartDescriptor )
if _ , chartData , ok := memoryStore . Get ( * chartDescriptor ) ; ! ok {
if err != nil {
getChartDescriptorErr = errors . Errorf ( "Unable to retrieve blob with digest %s" , chartDescriptor . Digest )
return nil , fmt . Errorf ( "unable to retrieve blob with digest %s: %w" , chartDescriptor . Digest , err )
} else {
}
result . Chart . Data = chartData
result . Chart . Digest = chartDescriptor . Digest . String ( )
result . Chart . Digest = chartDescriptor . Digest . String ( )
result . Chart . Size = chartDescriptor . Size
result . Chart . Size = chartDescriptor . Size
}
}
if getChartDescriptorErr != nil {
return nil , getChartDescriptorErr
}
}
if operation . withProv && ! provMissing {
if operation . withProv && ! provMissing {
var getProvDescriptorErr error
result . Prov . Data , err = content . FetchAll ( ctx , memoryStore , * provDescriptor )
if _ , provData , ok := memoryStore . Get ( * provDescriptor ) ; ! ok {
if err != nil {
getProvDescriptorErr = errors . Errorf ( "Unable to retrieve blob with digest %s" , provDescriptor . Digest )
return nil , fmt . Errorf ( "unable to retrieve blob with digest %s: %w" , provDescriptor . Digest , err )
} else {
}
result . Prov . Data = provData
result . Prov . Digest = provDescriptor . Digest . String ( )
result . Prov . Digest = provDescriptor . Digest . String ( )
result . Prov . Size = provDescriptor . Size
result . Prov . Size = provDescriptor . Size
}
}
if getProvDescriptorErr != nil {
return nil , getProvDescriptorErr
}
}
fmt . Fprintf ( c . out , "Pulled: %s\n" , result . Ref )
fmt . Fprintf ( c . out , "Pulled: %s\n" , result . Ref )
fmt . Fprintf ( c . out , "Digest: %s\n" , result . Manifest . Digest )
fmt . Fprintf ( c . out , "Digest: %s\n" , result . Manifest . Digest )
@ -615,8 +658,11 @@ func (c *Client) Push(data []byte, ref string, options ...PushOption) (*PushResu
"strict mode enabled, ref basename and tag must match the chart name and version" )
"strict mode enabled, ref basename and tag must match the chart name and version" )
}
}
}
}
memoryStore := content . NewMemory ( )
chartDescriptor , err := memoryStore . Add ( "" , ChartLayerMediaType , data )
ctx := context . Background ( )
memoryStore := memory . New ( )
chartDescriptor , err := oras . PushBytes ( ctx , memoryStore , ChartLayerMediaType , data )
if err != nil {
if err != nil {
return nil , err
return nil , err
}
}
@ -626,43 +672,57 @@ func (c *Client) Push(data []byte, ref string, options ...PushOption) (*PushResu
return nil , err
return nil , err
}
}
configDescriptor , err := . Add ( "" , ConfigMediaType , configData )
configDescriptor , err := oras. PushBytes ( ctx , memoryStore, ConfigMediaType , configData )
if err != nil {
if err != nil {
return nil , err
return nil , err
}
}
descripto rs := [ ] ocispec . Descriptor { chartDescriptor }
laye rs := [ ] ocispec . Descriptor { chartDescriptor }
var provDescriptor ocispec . Descriptor
var provDescriptor ocispec . Descriptor
if operation . provData != nil {
if operation . provData != nil {
provDescriptor , err = . Add ( "" , ProvLayerMediaType , operation . provData )
provDescriptor , err = oras. PushBytes ( ctx , memoryStore, ProvLayerMediaType , operation . provData )
if err != nil {
if err != nil {
return nil , err
return nil , err
}
}
descriptors = append ( descripto rs, provDescriptor )
layers = append ( laye rs, provDescriptor )
}
}
// sort layers for determinism, similar to how ORAS v1 does it
sort . Slice ( layers , func ( i , j int ) bool {
return layers [ i ] . Digest < layers [ j ] . Digest
} )
ociAnnotations := generateOCIAnnotations ( meta , operation . creationTime )
ociAnnotations := generateOCIAnnotations ( meta , operation . creationTime )
manifest := ocispec . Manifest {
Versioned : specs . Versioned { SchemaVersion : 2 } ,
Config : configDescriptor ,
Layers : layers ,
Annotations : ociAnnotations ,
}
manifestData , manifest , err := content . GenerateManifest ( & configDescriptor , ociAnnotations , descriptors ... )
manifestData , err := json . Marshal ( manifest )
if err != nil {
if err != nil {
return nil , err
return nil , err
}
}
if err := memoryStore . StoreManifest ( parsedRef . String ( ) , manifest , manifestData ) ; err != nil {
manifestDescriptor , err := oras . TagBytes ( ctx , memoryStore , ocispec . MediaTypeImageManifest , manifestData , ref )
if err != nil {
return nil , err
return nil , err
}
}
re motesResolver, err := c . resolver ( parsedRef . orasReference )
re pository, err := remote . NewRepository ( parsedRef . String ( ) )
if err != nil {
if err != nil {
return nil , err
return nil , err
}
}
registryStore := content . Registry { Resolver : remotesResolver }
repository . PlainHTTP = c . plainHTTP
_ , err = oras . Copy ( ctx ( c . out , c . debug ) , memoryStore , parsedRef . orasReference . String ( ) , registryStore , "" ,
repository . Client = c . authorizer
oras . WithNameValidation ( nil ) )
manifestDescriptor , err = oras . ExtendedCopy ( ctx , memoryStore , parsedRef . String ( ) , repository , parsedRef . String ( ) , oras . DefaultExtendedCopyOptions )
if err != nil {
if err != nil {
return nil , err
return nil , err
}
}
chartSummary := & descriptorPushSummaryWithMeta {
chartSummary := & descriptorPushSummaryWithMeta {
Meta : meta ,
Meta : meta ,
}
}
@ -670,8 +730,8 @@ func (c *Client) Push(data []byte, ref string, options ...PushOption) (*PushResu
chartSummary . Size = chartDescriptor . Size
chartSummary . Size = chartDescriptor . Size
result := & PushResult {
result := & PushResult {
Manifest : & descriptorPushSummary {
Manifest : & descriptorPushSummary {
Digest : manifest . Digest . String ( ) ,
Digest : manifest Descriptor . Digest . String ( ) ,
Size : manifest . Size ,
Size : manifest Descriptor . Size ,
} ,
} ,
Config : & descriptorPushSummary {
Config : & descriptorPushSummary {
Digest : configDescriptor . Digest . String ( ) ,
Digest : configDescriptor . Digest . String ( ) ,
@ -725,21 +785,17 @@ func (c *Client) Tags(ref string) ([]string, error) {
return nil , err
return nil , err
}
}
repository := registryremote . Repository {
ctx := context . Background ( )
Reference : parsedReference ,
repository , err := remote . NewRepository ( parsedReference . String ( ) )
Client : c . registryAuthorizer ,
PlainHTTP : c . plainHTTP ,
}
var registryTags [ ] string
registryTags , err = registry . Tags ( ctx ( c . out , c . debug ) , & repository )
if err != nil {
if err != nil {
return nil , err
return nil , err
}
}
repository . PlainHTTP = c . plainHTTP
repository . Client = c . authorizer
var tagVersions [ ] * semver . Version
var tagVersions [ ] * semver . Version
for _ , tag := range registryTags {
err = repository . Tags ( ctx , "" , func ( tags [ ] string ) error {
for _ , tag := range tags {
// Change underscore (_) back to plus (+) for Helm
// Change underscore (_) back to plus (+) for Helm
// See https://github.com/helm/helm/issues/10166
// See https://github.com/helm/helm/issues/10166
tagVersion , err := semver . StrictNewVersion ( strings . ReplaceAll ( tag , "_" , "+" ) )
tagVersion , err := semver . StrictNewVersion ( strings . ReplaceAll ( tag , "_" , "+" ) )
@ -748,6 +804,12 @@ func (c *Client) Tags(ref string) ([]string, error) {
}
}
}
}
return nil
} )
if err != nil {
return nil , err
}
// Sort the collection
// Sort the collection
sort . Sort ( sort . Reverse ( semver . Collection ( tagVersions ) ) )
sort . Sort ( sort . Reverse ( semver . Collection ( tagVersions ) ) )
@ -762,30 +824,28 @@ func (c *Client) Tags(ref string) ([]string, error) {
} }
// Resolve a reference to a descriptor.
// Resolve a reference to a descriptor.
func ( c * Client ) Resolve ( ref string ) ( * ocispec . Descriptor , error ) { func ( c * Client ) Resolve ( ref string ) ( desc ocispec . Descriptor , err error ) {
ctx := context . Background ( )
remoteRepository , err := remote . NewRepository ( ref )
parsedRef , err := newReference ( ref )
if err != nil {
if err != nil {
return nil , err
return desc , err
}
if parsedRef . Registry == "" {
return nil , nil
}
}
remoteRepository . PlainHTTP = c . plainHTTP
remotesResolver, err := c . resolver ( parsedRef . orasReference )
parsedReference, err := newReference ( ref )
if err != nil {
if err != nil {
return nil , err
return desc , err
}
}
_ , desc , err := remotesResolver . Resolve ( ctx , ref )
ctx := context . Background ( )
return & desc , err
parsedString := parsedReference . String ( )
return remoteRepository . Resolve ( ctx , parsedString )
} }
// ValidateReference for path and version
// ValidateReference for path and version
func ( c * Client ) ValidateReference ( ref , version string , u * url . URL ) ( * url . URL , error ) { func ( c * Client ) ValidateReference ( ref , version string , u * url . URL ) ( * url . URL , error ) {
var tag string
var tag string
registryReference , err := newReference ( u . )
registryReference , err := newReference ( u . Host + u . Path)
if err != nil {
if err != nil {
return nil , err
return nil , err
}
}
@ -800,19 +860,20 @@ func (c *Client) ValidateReference(ref, version string, u *url.URL) (*url.URL, e
}
}
if registryReference . Digest != "" {
if registryReference . Digest != "" {
if registryReference. Tag == "" {
if version == "" {
// Install by digest only
// Install by digest only
return u , nil
return u , nil
}
}
u . Path = fmt . Sprintf ( "%s@%s" , registryReference . Repository , registryReference . Digest )
// Validate the tag if it was specified
// Validate the tag if it was specified
path := registryReference . Registry + "/" + registryReference . Repository + ":" + registryReference. Tag
path := registryReference . Registry + "/" + registryReference . Repository + ":" + version
desc , err := c . Resolve ( path )
desc , err := c . Resolve ( path )
if err != nil {
if err != nil {
// The resource does not have to be tagged when digest is specified
// The resource does not have to be tagged when digest is specified
return u , nil
return u , nil
}
}
if desc != nil && desc . Digest . String ( ) != registryReference . Digest {
if desc . Digest . String ( ) != registryReference . Digest {
return nil , errors . Errorf ( "chart reference digest mismatch: %s is not %s" , desc . Digest . String ( ) , registryReference . Digest )
return nil , errors . Errorf ( "chart reference digest mismatch: %s is not %s" , desc . Digest . String ( ) , registryReference . Digest )
}
}
return u , nil
return u , nil
@ -842,7 +903,7 @@ func (c *Client) ValidateReference(ref, version string, u *url.URL) (*url.URL, e
}
}
}
}
u . Path = fmt . Sprintf ( "%s /%s :%s", registryReference . Registry , registryReference . Repository , tag )
u . Path = fmt . Sprintf ( "%s :%s", registryReference . Repository , tag )
return u , err
return u , err
} }
Terry Howe
8 months ago