Merge pull request #1021 from flavianmissi/OCPBUGS-32328

openshift-merge-bot[bot] · web-flow · commit bc665806f167 · 2024-04-18T07:51:33.000Z
OCPBUGS-32328: azure-path-fix: support auth via account key (without clientID)
diff --git a/cmd/move-blobs/main.go b/cmd/move-blobs/main.go
@@ -367,10 +367,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
`@@ -367,10 +367,10 @@ func validate(opts *configOpts) error {`
`367`	`367`	`if len(opts.clientSecret) == 0 && len(opts.federatedTokenFile) == 0 && len(opts.accountKey) == 0 {`
`368`	`368`	`return fmt.Errorf("One of AZURE_CLIENT_SECRET or AZURE_FEDERATED_TOKEN_FILE or AZURE_ACCOUNTKEY is required for authentication")`
`369`	`369`	`}`
`370`		`- if len(opts.clientID) == 0 {`
	`370`	`+ if len(opts.clientID) == 0 && len(opts.accountKey) == 0 {`
`371`	`371`	`return fmt.Errorf("AZURE_CLIENT_ID is required for authentication")`
`372`	`372`	`}`
`373`		`- if len(opts.tenantID) == 0 {`
	`373`	`+ if len(opts.tenantID) == 0 && len(opts.accountKey) == 0 {`
`374`	`374`	`return fmt.Errorf("AZURE_TENANT_ID is required for authentication")`
`375`	`375`	`}`
`376`	`376`	`if len(opts.storageAccountName) == 0 {`