Merge pull request #1023 from openshift-cherrypick-robot/cherry-pick-1022-to-release-4.14

openshift-merge-bot[bot] · web-flow · commit 367570eb0bbc · 2024-04-21T08:22:33.000Z
[release-4.14] OCPBUGS-32450: azure-path-fix: support auth via account key (without clientID)
diff --git a/cmd/move-blobs/main.go b/cmd/move-blobs/main.go
@@ -366,10 +366,10 @@ func validate(opts *configOpts) error {
 	if len(opts.clientSecret) == 0 && len(opts.federatedTokenFile) == 0 && len(opts.accountKey) == 0 {
 		return fmt.Errorf("One of AZURE_CLIENT_SECRET or AZURE_FEDERATED_TOKEN_FILE or AZURE_ACCOUNTKEY is required for authentication")
 	}
-	if len(opts.clientID) == 0 {
+	if len(opts.clientID) == 0 && len(opts.accountKey) == 0 {
 		return fmt.Errorf("AZURE_CLIENT_ID is required for authentication")
 	}
-	if len(opts.tenantID) == 0 {
+	if len(opts.tenantID) == 0 && len(opts.accountKey) == 0 {
 		return fmt.Errorf("AZURE_TENANT_ID is required for authentication")
 	}
 	if len(opts.storageAccountName) == 0 {

Original file line number	Diff line number	Diff line change
`@@ -366,10 +366,10 @@ func validate(opts *configOpts) error {`
`366`	`366`	`if len(opts.clientSecret) == 0 && len(opts.federatedTokenFile) == 0 && len(opts.accountKey) == 0 {`
`367`	`367`	`return fmt.Errorf("One of AZURE_CLIENT_SECRET or AZURE_FEDERATED_TOKEN_FILE or AZURE_ACCOUNTKEY is required for authentication")`
`368`	`368`	`}`
`369`		`- if len(opts.clientID) == 0 {`
	`369`	`+ if len(opts.clientID) == 0 && len(opts.accountKey) == 0 {`
`370`	`370`	`return fmt.Errorf("AZURE_CLIENT_ID is required for authentication")`
`371`	`371`	`}`
`372`		`- if len(opts.tenantID) == 0 {`
	`372`	`+ if len(opts.tenantID) == 0 && len(opts.accountKey) == 0 {`
`373`	`373`	`return fmt.Errorf("AZURE_TENANT_ID is required for authentication")`
`374`	`374`	`}`
`375`	`375`	`if len(opts.storageAccountName) == 0 {`