Merge pull request #1736 from ioito/automated-cherry-pick-of-#1734-upstream-release-4.0.2

ioito · web-flow · commit b48876052be2 · 2026-03-06T13:59:35.000+08:00
Automated cherry pick of #1734: fix(aws): avoid duplicate aws account name
diff --git a/pkg/multicloud/aws/organizations.go b/pkg/multicloud/aws/organizations.go
@@ -274,7 +274,7 @@ func (awscli *SAwsClient) GetSubAccounts() ([]cloudprovider.SSubAccount, error)
 					subAccount.HealthStatus = api.CLOUD_PROVIDER_HEALTH_NO_PERMISSION
 				}
 				subAccount.Name = account.ID
-				if len(account.Name) > 0 {
+				if len(account.Name) > 0 && account.Name != account.ID {
 					subAccount.Name = fmt.Sprintf("%s/%s", account.Name, account.ID)
 				}
 				subAccount.Account = fmt.Sprintf("%s/%s", awscli.accessKey, account.ID)

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ func (awscli *SAwsClient) GetSubAccounts() ([]cloudprovider.SSubAccount, error)`
`274`	`274`	`subAccount.HealthStatus = api.CLOUD_PROVIDER_HEALTH_NO_PERMISSION`
`275`	`275`	`}`
`276`	`276`	`subAccount.Name = account.ID`
`277`		`- if len(account.Name) > 0 {`
	`277`	`+ if len(account.Name) > 0 && account.Name != account.ID {`
`278`	`278`	`subAccount.Name = fmt.Sprintf("%s/%s", account.Name, account.ID)`
`279`	`279`	`}`
`280`	`280`	`subAccount.Account = fmt.Sprintf("%s/%s", awscli.accessKey, account.ID)`