WIP

Author: bryan-cox

pkg/storage/azure/azureclient/azureclient.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"os"
 	"strings"
 	"sync"
 
@@ -22,8 +21,6 @@ import (
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container"
 	autorestazure "github.com/Azure/go-autorest/autorest/azure"
 	"github.com/Azure/go-autorest/autorest/to"
-	"github.com/Azure/msi-dataplane/pkg/dataplane"
-	"k8s.io/klog/v2"
 )
 
 const (
@@ -97,7 +94,7 @@ func New(opts *Options) (*Client, error) {
 	}, nil
 }
 
-func (c *Client) getCreds(ctx context.Context) (azcore.TokenCredential, error) {
+func (c *Client) getCreds(_ context.Context) (azcore.TokenCredential, error) {
 	if c.creds != nil {
 		return c.creds, nil
 	}
@@ -106,29 +103,7 @@ func (c *Client) getCreds(ctx context.Context) (azcore.TokenCredential, error) {
 		err   error
 		creds azcore.TokenCredential
 	)
-	userAssignedIdentityCredentialsFilePath := os.Getenv("MANAGED_AZURE_HCP_CREDENTIALS_FILE_PATH")
-	if userAssignedIdentityCredentialsFilePath != "" {
-		var ok bool
-
-		// We need to only store the Azure credentials once and reuse them after that.
-		storedCreds, found := c.azureCredentials.Load(userAssignedIdentityCredentialsFilePath)
-		if !found {
-			klog.V(2).Info("Using UserAssignedIdentityCredentials for Azure authentication for managed Azure HCP")
-			clientOptions := azcore.ClientOptions{
-				Cloud: c.clientOpts.Cloud,
-			}
-			creds, err = dataplane.NewUserAssignedIdentityCredential(ctx, userAssignedIdentityCredentialsFilePath, dataplane.WithClientOpts(clientOptions))
-			if err != nil {
-				return nil, err
-			}
-			c.azureCredentials.Store(azureCredentialsKey, creds)
-		} else {
-			creds, ok = storedCreds.(azcore.TokenCredential)
-			if !ok {
-				return nil, fmt.Errorf("expected %T to be a TokenCredential", storedCreds)
-			}
-		}
-	} else if strings.TrimSpace(c.opts.ClientSecret) == "" {
+	if strings.TrimSpace(c.opts.ClientSecret) == "" {
 		options := azidentity.WorkloadIdentityCredentialOptions{
 			ClientOptions: *c.clientOpts,
 			ClientID:      c.opts.ClientID,
@@ -154,7 +129,7 @@ func (c *Client) getCreds(ctx context.Context) (azcore.TokenCredential, error) {
 		}
 	}
 	if creds == nil {
-		return nil, errors.New("Unknown authentication method")
+		return nil, errors.New("unknown authentication method")
 	}
 	c.creds = creds
 	return c.creds, nil