From 7108a3b237fb3310ab623ceee62cbeafb37e4ed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Sat, 7 Feb 2026 13:51:35 +0800 Subject: [PATCH] fix(region): vendor update (#24264) --- go.mod | 2 +- go.sum | 4 ++-- vendor/modules.txt | 2 +- .../yunion.io/x/cloudmux/pkg/multicloud/aws/organizations.go | 5 ++++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 2a7efdcb7d..f9719c30cf 100644 --- a/go.mod +++ b/go.mod @@ -103,7 +103,7 @@ require ( k8s.io/cri-api v0.28.15 k8s.io/klog/v2 v2.20.0 moul.io/http2curl/v2 v2.3.0 - yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260203075440-033648c3d921 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260207041949-3fbec8cd3bc8 yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0 yunion.io/x/jsonutils v1.0.1-0.20250507052344-1abcf4f443b1 yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91 diff --git a/go.sum b/go.sum index c23edfeecd..04cfdcb656 100644 --- a/go.sum +++ b/go.sum @@ -1665,8 +1665,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260203075440-033648c3d921 h1:EigYkJlFuM0jxFhil+n0P9QJ5mszpFtacvVo2PMthFU= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260203075440-033648c3d921/go.mod h1:aWRX5Phwz3nbHUNnIAm1oVogjguXPYDDgCOy/9Hnnvk= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260207041949-3fbec8cd3bc8 h1:bc4rHevOngt6ubqmUIhCFK2ZzfAInd+xlPMehSusiSY= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260207041949-3fbec8cd3bc8/go.mod h1:aWRX5Phwz3nbHUNnIAm1oVogjguXPYDDgCOy/9Hnnvk= yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0 h1:msG4SiDSVU7CrXH06WuHlNEZXIooTcmNbfrIGHuIHBU= yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws= yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634= diff --git a/vendor/modules.txt b/vendor/modules.txt index 8ea6be47ed..474108ec7d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2251,7 +2251,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.2.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260203075440-033648c3d921 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260207041949-3fbec8cd3bc8 ## explicit; go 1.24 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/organizations.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/organizations.go index 0b5251a4b9..75162c781a 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/organizations.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/organizations.go @@ -198,13 +198,16 @@ func (r *SRegion) ListAccounts() ([]SAccount, error) { for _, actPtr := range parts.Accounts { account := SAccount{ ID: *actPtr.Id, - Name: *actPtr.Name, + Name: *actPtr.Id, Arn: *actPtr.Arn, Email: *actPtr.Email, State: string(actPtr.State), JoinedMethod: string(actPtr.JoinedMethod), JoinedTimestamp: *actPtr.JoinedTimestamp, } + if actPtr.Name != nil && len(*actPtr.Name) > 0 { + account.Name = *actPtr.Name + } if *orgOutput.Organization.MasterAccountId == *actPtr.Id { account.IsMaster = true }