From b7cdfd38a94134d5e88746c3b1bf1500702406ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= <qu_xuan@icloud.com>
Date: Thu, 12 Oct 2023 20:17:38 +0800
Subject: [PATCH] fix(region): classify invalid access key error (#18304)

---
 go.mod                                                    | 2 +-
 go.sum                                                    | 4 ++--
 vendor/modules.txt                                        | 2 +-
 vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/ctyun.go | 3 +++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/go.mod b/go.mod
index 9ba88c5a28..fb5a44552d 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.20231012110302-e5895789bde1
+	yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231012115531-f16047235f44
 	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 f3ddc4eea8..cb006464e9 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.20231012110302-e5895789bde1 h1:Hn3EQcCwnKddW4jSWo87mQujLjLyDFBA1E/z17eoyM8=
-yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231012110302-e5895789bde1/go.mod h1:2sgCN7nRPQL3woLfdgqLDd92vwAHqtlz3KKiHxC5BAw=
+yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231012115531-f16047235f44 h1:UWU0ISJM6AL7cvxzGT6cK4EPUX7VIPp+x0V6gWcX9fg=
+yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231012115531-f16047235f44/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 63ebce64b0..9bdd07c4a4 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.20231012110302-e5895789bde1
+# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231012115531-f16047235f44
 ## 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/ctyun/ctyun.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/ctyun.go
index 4ad71735f7..b46489d1e4 100644
--- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/ctyun.go
+++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/ctyun.go
@@ -135,6 +135,9 @@ func (self *sCtyunError) ParseErrorFromJsonResponse(statusCode int, status strin
 	if body != nil {
 		body.Unmarshal(self)
 	}
+	if strings.Contains(self.Message, "signature verification failed") {
+		return errors.Wrapf(cloudprovider.ErrInvalidAccessKey, jsonutils.Marshal(self).String())
+	}
 	return self
 }