Add MSI Support for Azure plugin.

yanggang · yanggang · commit 4de800a75b72 · 2023-10-10T13:41:17.000+01:00
Signed-off-by: yanggang &lt;gang.yang@daocloud.io&gt;
diff --git a/changelogs/unreleased/6927-yanggangtony b/changelogs/unreleased/6927-yanggangtony
@@ -0,0 +1 @@
+Add MSI Support for Azure plugin.
diff --git a/pkg/util/azure/credential.go b/pkg/util/azure/credential.go
@@ -129,5 +129,14 @@ func newConfigCredential(creds map[string]string, options configCredentialOption
 		return nil, errors.Errorf("%s is required", CredentialKeyPassword)
 	}
 
+	//msiEndpoint
+	msiEndpoint := creds[CredentialMSI_ENDPOINT]
+	identityEndpoint := creds[CredentialIDENTITY_ENDPOINT]
+
+	if msiEndpoint != "" || identityEndpoint != "" {
+		o := &azidentity.ManagedIdentityCredentialOptions{ClientOptions: options.ClientOptions, ID: azidentity.ClientID(clientID)}
+		return azidentity.NewManagedIdentityCredential(o)
+	}
+
 	return nil, errors.New("incomplete credential configuration. Only AZURE_TENANT_ID and AZURE_CLIENT_ID are set")
 }
diff --git a/pkg/util/azure/util.go b/pkg/util/azure/util.go
@@ -49,6 +49,12 @@ const (
 	CredentialKeyUsername                   = "AZURE_USERNAME"                      // #nosec
 	CredentialKeyPassword                   = "AZURE_PASSWORD"                      // #nosec
 
+	CredentialIMDS_ENDPOINT              = "IMDS_ENDPOINT"              // #nosec
+	CredentialIDENTITY_ENDPOINT          = "IDENTITY_ENDPOINT"          // #nosec
+	CredentialIDENTITY_HEADER            = "IDENTITY_HEADER"            // #nosec
+	CredentialIDENTITY_SERVER_THUMBPRINT = "IDENTITY_SERVER_THUMBPRINT" // #nosec
+	CredentialMSI_ENDPOINT               = "MSI_ENDPOINT"               // #nosec
+
 	credentialFile = "credentialsFile"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -129,5 +129,14 @@ func newConfigCredential(creds map[string]string, options configCredentialOption`
`129`	`129`	`return nil, errors.Errorf("%s is required", CredentialKeyPassword)`
`130`	`130`	`}`
`131`	`131`
	`132`	`+ //msiEndpoint`
	`133`	`+ msiEndpoint := creds[CredentialMSI_ENDPOINT]`
	`134`	`+ identityEndpoint := creds[CredentialIDENTITY_ENDPOINT]`
	`135`	`+`
	`136`	`+ if msiEndpoint != "" \|\| identityEndpoint != "" {`
	`137`	`+ o := &azidentity.ManagedIdentityCredentialOptions{ClientOptions: options.ClientOptions, ID: azidentity.ClientID(clientID)}`
	`138`	`+ return azidentity.NewManagedIdentityCredential(o)`
	`139`	`+ }`
	`140`	`+`
`132`	`141`	`return nil, errors.New("incomplete credential configuration. Only AZURE_TENANT_ID and AZURE_CLIENT_ID are set")`
`133`	`142`	`}`