Debug commit

Signed-off-by: Jagpreet Singh Tamber <[email protected]>

pkg/apis/application/v1alpha1/repository_types.go

@@ -228,6 +228,7 @@ func (repo *Repository) GetGitCreds(store git.CredsStore) git.Creds {
 func (repo *Repository) GetHelmCreds() helm.Creds {
 	if repo.UseAzureWorkloadIdentity {
 		return helm.NewAzureWorkloadIdentityCreds(
+			repo.Repo,
 			getCAPath(repo.Repo),
 			[]byte(repo.TLSClientCertData),
 			[]byte(repo.TLSClientCertKey),

util/helm/cmd.go

@@ -7,6 +7,7 @@ import (
 	"os/exec"
 	"path"
 	"path/filepath"
+	"reflect"
 	"regexp"
 	"strings"
 
@@ -271,6 +272,10 @@ func (c *Cmd) PullOCI(repo string, chart string, version string, destination str
 		"--destination",
 		destination,
 	}
+
+	fmt.Printf("Repo: %s, Chart: %s, Version: %s, Destination: %s, Creds: %s\n", repo, chart, version, destination, reflect.TypeOf(creds))
+	fmt.Printf("UserName: %s, Password: %s\n", creds.GetUsername(), creds.GetPassword())
+
 	if creds.GetCAPath() != "" {
 		args = append(args, "--ca-file", creds.GetCAPath())
 	}

util/helm/creds.go

@@ -77,7 +77,11 @@ func (creds AzureWorkloadIdentityCreds) GetUsername() string {
 }
 
 func (creds AzureWorkloadIdentityCreds) GetPassword() string {
-	token, _ := creds.GetAccessToken(creds.repoUrl) // TODO: propagate error
+	token, err := creds.GetAccessToken(creds.repoUrl) // TODO: propagate error
+	if err != nil {
+		fmt.Println("Erooorororororororororrorororororororororororo")
+		fmt.Println(err)
+	}
 
 	return token
 }
@@ -98,8 +102,9 @@ func (creds AzureWorkloadIdentityCreds) GetInsecureSkipVerify() bool {
 	return creds.InsecureSkipVerify
 }
 
-func NewAzureWorkloadIdentityCreds(caPath string, certData []byte, keyData []byte, insecureSkipVerify bool) AzureWorkloadIdentityCreds {
+func NewAzureWorkloadIdentityCreds(repoUrl string, caPath string, certData []byte, keyData []byte, insecureSkipVerify bool) AzureWorkloadIdentityCreds {
 	return AzureWorkloadIdentityCreds{
+		repoUrl:            repoUrl,
 		CAPath:             caPath,
 		CertData:           certData,
 		KeyData:            keyData,
@@ -108,8 +113,11 @@ func NewAzureWorkloadIdentityCreds(caPath string, certData []byte, keyData []byt
 }
 
 func (c AzureWorkloadIdentityCreds) GetAccessToken(azureContainerRegistry string) (string, error) {
+
+	registryHost := strings.Split(azureContainerRegistry, "/")[0]
+
 	// Compute hash as key for refresh token in the cache
-	key, err := argoutils.GenerateCacheKey("accesstoken-%s", azureContainerRegistry)
+	key, err := argoutils.GenerateCacheKey("accesstoken-%s", registryHost)
 	if err != nil {
 		return "", fmt.Errorf("failed to compute key for cache: %w", err)
 	}
@@ -121,7 +129,7 @@ func (c AzureWorkloadIdentityCreds) GetAccessToken(azureContainerRegistry string
 		return t.(string), nil
 	}
 
-	tokenParams, err := c.challengeAzureContainerRegistry(azureContainerRegistry)
+	tokenParams, err := c.challengeAzureContainerRegistry(registryHost)
 	if err != nil {
 		return "", fmt.Errorf("failed to challenge Azure Container Registry: %w", err)
 	}