From 4930e191dc820b263a521c74723333bfbef3ed3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= <qu_xuan@icloud.com>
Date: Fri, 9 May 2025 14:56:13 +0800
Subject: [PATCH] fix(region): vendor update (#22499)

---
 go.mod                                                    | 2 +-
 go.sum                                                    | 4 ++--
 vendor/modules.txt                                        | 2 +-
 vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/image.go   | 4 ++++
 .../yunion.io/x/cloudmux/pkg/multicloud/aws/instance.go   | 8 +-------
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/go.mod b/go.mod
index 6ef82580b6..e5446a15c9 100644
--- a/go.mod
+++ b/go.mod
@@ -87,7 +87,7 @@ require (
 	k8s.io/client-go v0.19.3
 	k8s.io/cluster-bootstrap v0.19.3
 	moul.io/http2curl/v2 v2.3.0
-	yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250508100452-51742e9c8266
+	yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250508131448-6abefa38df57
 	yunion.io/x/executor v0.0.0-20241205080005-48f5b1212256
 	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 303166a6b1..4125d73b23 100644
--- a/go.sum
+++ b/go.sum
@@ -1274,8 +1274,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.20250508100452-51742e9c8266 h1:ci2s8wllLSZR4Zdh5FpcOfVpyBydOqEi/X8X1ePgmuw=
-yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250508100452-51742e9c8266/go.mod h1:FXxAEbdNfWXX9gjME3K2nJhkydHY5EKEUZb+RLEzVwQ=
+yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250508131448-6abefa38df57 h1:pTIqSYPPDuWsgYJ6zl9kjNNYyvrfDfySRp+2kmlcF/k=
+yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250508131448-6abefa38df57/go.mod h1:FXxAEbdNfWXX9gjME3K2nJhkydHY5EKEUZb+RLEzVwQ=
 yunion.io/x/executor v0.0.0-20241205080005-48f5b1212256 h1:kLKQ6zbgPDQflRwoHFAjxNChcbhXIFgsUVLkJwiXu/8=
 yunion.io/x/executor v0.0.0-20241205080005-48f5b1212256/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 27ccb26aa6..3b019eaa55 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1576,7 +1576,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.20250508100452-51742e9c8266
+# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250508131448-6abefa38df57
 ## explicit; go 1.21
 yunion.io/x/cloudmux/pkg/apis
 yunion.io/x/cloudmux/pkg/apis/billing
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/image.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/image.go
index bd78b955e5..d385ce2c7d 100644
--- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/image.go
+++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/image.go
@@ -24,6 +24,7 @@ import (
 	"yunion.io/x/log"
 	"yunion.io/x/pkg/errors"
 	"yunion.io/x/pkg/util/imagetools"
+	"yunion.io/x/pkg/utils"
 
 	api "yunion.io/x/cloudmux/pkg/apis/compute"
 	"yunion.io/x/cloudmux/pkg/cloudprovider"
@@ -237,6 +238,9 @@ func (self *SImage) GetBlockDeviceNames() []string {
 	ret := []string{}
 	for _, dev := range self.BlockDeviceMapping {
 		ret = append(ret, dev.DeviceName)
+		if strings.HasPrefix(dev.DeviceName, "/dev/xvd") && !utils.IsInStringArray("/dev/sda", ret) { // 系统盘是/dev/xvda, 则不能指定devName 为 /dev/sda
+			ret = append(ret, "/dev/sda")
+		}
 	}
 	return ret
 }
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/instance.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/instance.go
index fe93a31d01..8b63311a77 100644
--- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/instance.go
+++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/instance.go
@@ -654,13 +654,7 @@ func (self *SInstance) AttachDisk(ctx context.Context, diskId string) error {
 		return errors.Wrap(err, "GetImage")
 	}
 
-	deviceNames := []string{}
-	// mix in image block device names
-	for i := range img.BlockDeviceMapping {
-		if !utils.IsInStringArray(img.BlockDeviceMapping[i].DeviceName, deviceNames) {
-			deviceNames = append(deviceNames, img.BlockDeviceMapping[i].DeviceName)
-		}
-	}
+	deviceNames := img.GetBlockDeviceNames()
 
 	name, err := NextDeviceName(deviceNames)
 	if err != nil {