Remove non-required ClientOptResolver option usage

pkg/artifacts/helm.go

@@ -10,7 +10,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/containerd/containerd/remotes/docker"
 	"helm.sh/helm/v3/pkg/action"
 	"helm.sh/helm/v3/pkg/cli"
 	"helm.sh/helm/v3/pkg/registry"
@@ -80,7 +79,7 @@ func NewRegistryClientConfig(opts ...RegistryClientOption) *RegistryClientConfig
 
 func getRegistryClientWrap(cfg *RegistryClientConfig) (*registryClientWrap, error) {
 	wrap := &registryClientWrap{}
-	opts := []registry.ClientOption{}
+	var opts []registry.ClientOption
 	if cfg.UsePlainHTTP {
 		opts = append(opts, registry.ClientOptPlainHTTP())
 	} else {
@@ -106,17 +105,10 @@ func getRegistryClientWrap(cfg *RegistryClientConfig) (*registryClientWrap, erro
 			return nil, fmt.Errorf("error closing credentials file: %w", err)
 		}
 		opts = append(opts, registry.ClientOptCredentialsFile(f.Name()))
-		revOpts := docker.ResolverOptions{}
-		authz := docker.NewDockerAuthorizer(docker.WithAuthCreds(func(_ string) (string, string, error) {
-			return cfg.Auth.Username, cfg.Auth.Password, nil
-		}))
-		revOpts.Hosts = docker.ConfigureDefaultRegistries(
-			docker.WithAuthorizer(authz),
-			docker.WithPlainHTTP(func(_ string) (bool, error) { return cfg.UsePlainHTTP, nil }),
-		)
-		rev := docker.NewResolver(revOpts)
-
-		opts = append(opts, registry.ClientOptResolver(rev))
+
+		if cfg.UsePlainHTTP {
+			opts = append(opts, registry.ClientOptPlainHTTP())
+		}
 	}
 	r, err := registry.NewClient(opts...)
 	if err != nil {
@@ -125,31 +117,57 @@ func getRegistryClientWrap(cfg *RegistryClientConfig) (*registryClientWrap, erro
 	wrap.client = r
 
 	return wrap, nil
-
 }
 
-// PullChart retrieves the specified chart
-func PullChart(chartURL, version string, destDir string, opts ...RegistryClientOption) (string, error) {
-	u, err := url.Parse(chartURL)
+// registryClientWithLogin returns an authenticated registry client
+func registryClientWithLogin(chartURL string, opts ...RegistryClientOption) (*registry.Client, func(), error) {
+	parsedURL, err := url.Parse(chartURL)
 	if err != nil {
-		return "", fmt.Errorf("invalid url: %w", err)
+		return nil, func() {}, fmt.Errorf("invalid url: %w", err)
 	}
-	cfg := &action.Configuration{}
+
 	cc := NewRegistryClientConfig(opts...)
+
 	reg, err := getRegistryClientWrap(cc)
 	if err != nil {
-		return "", fmt.Errorf("missing registry client: %w", err)
+		return nil, func() {}, fmt.Errorf("missing registry client: %w", err)
 	}
-	cfg.RegistryClient = reg.client
+
+	var loginOpts []registry.LoginOption
+
 	if cc.Auth.Username != "" && cc.Auth.Password != "" && reg.credentialsFile != "" {
-		if err := reg.client.Login(u.Host, registry.LoginOptBasicAuth(cc.Auth.Username, cc.Auth.Password)); err != nil {
-			return "", fmt.Errorf("error logging in to %s: %w", u.Host, err)
+		loginOpts = append(loginOpts, registry.LoginOptBasicAuth(cc.Auth.Username, cc.Auth.Password))
+
+		if cc.UseInsecureHTTPS {
+			loginOpts = append(loginOpts, registry.LoginOptInsecure(true))
+		}
+
+		if err := reg.client.Login(parsedURL.Host, loginOpts...); err != nil {
+			return nil, func() {}, fmt.Errorf("error logging in to %s: %w", parsedURL.Host, err)
 		}
-		defer func() {
-			_ = reg.client.Logout(u.Host)
-			_ = os.Remove(reg.credentialsFile)
-		}()
 	}
+
+	cleanup := func() {
+		_ = reg.client.Logout(parsedURL.Host)
+		_ = os.Remove(reg.credentialsFile)
+	}
+
+	return reg.client, cleanup, nil
+}
+
+// PullChart retrieves the specified chart
+func PullChart(chartURL, version string, destDir string, opts ...RegistryClientOption) (string, error) {
+	cfg := &action.Configuration{}
+
+	registryClient, logout, err := registryClientWithLogin(chartURL, opts...)
+	if err != nil {
+		return "", fmt.Errorf("failed getting a logged in registry client: %w", err)
+	}
+
+	defer logout()
+
+	cfg.RegistryClient = registryClient
+
 	client := action.NewPullWithOpts(action.WithConfig(cfg))
 
 	dir, err := os.MkdirTemp(destDir, "chart-*")
@@ -181,11 +199,16 @@ func PullChart(chartURL, version string, destDir string, opts ...RegistryClientO
 // PushChart pushes the local chart tarFile to the remote URL provided
 func PushChart(tarFile string, pushChartURL string, opts ...RegistryClientOption) error {
 	cfg := &action.Configuration{}
-	reg, err := getRegistryClientWrap(NewRegistryClientConfig(opts...))
+
+	registryClient, logout, err := registryClientWithLogin(pushChartURL, opts...)
 	if err != nil {
-		return fmt.Errorf("missing registry client: %w", err)
+		return fmt.Errorf("failed getting a logged in registry client: %w", err)
 	}
-	cfg.RegistryClient = reg.client
+
+	defer logout()
+
+	cfg.RegistryClient = registryClient
+
 	client := action.NewPushWithOpts(action.WithPushConfig(cfg))
 
 	client.Settings = cli.New()
@@ -197,25 +220,32 @@ func PushChart(tarFile string, pushChartURL string, opts ...RegistryClientOption
 	return nil
 }
 
-func showRemoteHelmChart(chartURL string, version string, cfg *RegistryClientConfig) (string, error) {
-	client := action.NewShowWithConfig(action.ShowChart, &action.Configuration{})
-	reg, err := getRegistryClientWrap(cfg)
+func showRemoteHelmChart(chartURL string, version string, opts ...RegistryClientOption) (string, error) {
+	cfg := &action.Configuration{}
+
+	registryClient, logout, err := registryClientWithLogin(chartURL, opts...)
 	if err != nil {
-		return "", fmt.Errorf("missing registry client: %w", err)
+		return "", fmt.Errorf("failed getting a logged in registry client: %w", err)
 	}
-	client.SetRegistryClient(reg.client)
+
+	defer logout()
+
+	cfg.RegistryClient = registryClient
+
+	client := action.NewShowWithConfig(action.ShowChart, cfg)
 	client.Version = version
-	cp, err := client.ChartPathOptions.LocateChart(chartURL, cli.New())
 
+	cp, err := client.ChartPathOptions.LocateChart(chartURL, cli.New())
 	if err != nil {
 		return "", err
 	}
+
 	return client.Run(cp)
 }
 
 // RemoteChartExist checks if the provided chart exists
 func RemoteChartExist(chartURL string, version string, opts ...RegistryClientOption) bool {
-	_, err := showRemoteHelmChart(chartURL, version, NewRegistryClientConfig(opts...))
+	_, err := showRemoteHelmChart(chartURL, version, opts...)
 	return err == nil
 }