From bac4faf202cf5e337acd748a5e8007db7124e765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Fri, 22 Sep 2023 14:17:31 +0800 Subject: [PATCH] fix(region): aws disk type (#18133) --- go.mod | 2 +- go.sum | 4 ++-- vendor/modules.txt | 2 +- vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/disk.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index cd17ffb217..3619f52213 100644 --- a/go.mod +++ b/go.mod @@ -83,7 +83,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.20230921121036-ab3056658f2f + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230922055518-0b8dd444c8bf yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 yunion.io/x/jsonutils v1.0.1-0.20230613121553-0f3b41e2ef19 yunion.io/x/log v1.0.1-0.20230411060016-feb3f46ab361 diff --git a/go.sum b/go.sum index b1d7c6b1f8..ef59f93b30 100644 --- a/go.sum +++ b/go.sum @@ -1174,8 +1174,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.20230921121036-ab3056658f2f h1:BDjzB7nOkoLxEdcTiIUFoocafFaIEulvAnxi5grRycY= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230921121036-ab3056658f2f/go.mod h1:2sgCN7nRPQL3woLfdgqLDd92vwAHqtlz3KKiHxC5BAw= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230922055518-0b8dd444c8bf h1:7lo3kA2IZzJGLQ/jLP8h7J1e44kOoKhtsJrJv7aZRYg= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230922055518-0b8dd444c8bf/go.mod h1:2sgCN7nRPQL3woLfdgqLDd92vwAHqtlz3KKiHxC5BAw= yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 h1:v7POYkQwo1XzOxBoIoRVr/k0V9Y5JyjpshlIFa9raug= yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32/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 088ce50df4..aed8ed8a11 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1432,7 +1432,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.20230921121036-ab3056658f2f +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230922055518-0b8dd444c8bf ## explicit; go 1.18 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/disk.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/disk.go index 2af72a2549..e7e04ebd40 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/disk.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/disk.go @@ -169,7 +169,7 @@ func (self *SDisk) getDevice() string { func (self *SDisk) GetDiskType() string { device := self.getDevice() - if strings.HasSuffix(device, "a") { + if strings.HasSuffix(device, "a") || strings.HasSuffix(device, "1") { return api.DISK_TYPE_SYS } return api.DISK_TYPE_DATA