opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): vender update (#16367)

Browse Source
This commit is contained in:
屈轩
2023-04-06 20:39:27 +08:00
committed by GitHub
parent acb4ee9942
commit 6ef007c32d
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1 -1
View File
@@ -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.20230406094637-4e0df02b927b
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230406105729-f8da6df0afdb
yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656
yunion.io/x/jsonutils v1.0.1-0.20220819091305-3bab322ab4fd
yunion.io/x/log v1.0.0
go.sum
+2 -2
View File
@@ -1164,8 +1164,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.20230406094637-4e0df02b927b h1:aS3UHG+XprXjgm/jIzz6IpdOc9m4uf+3fr47HmE3iDg=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230406094637-4e0df02b927b/go.mod h1:VBAtfyGMDW11x5JmF0vUEmn/PmNpZ8CKBAQCiyz+cDY=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230406105729-f8da6df0afdb h1:GKybau2Ra065D8jAa1XiBi3inXxhPAfHvy94B4g30e0=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230406105729-f8da6df0afdb/go.mod h1:VBAtfyGMDW11x5JmF0vUEmn/PmNpZ8CKBAQCiyz+cDY=
yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656 h1:0zlZD5uhZoIHgLVAWCz2aHaYk2ZrNsACCYD7R6EIBII=
yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=
vendor/modules.txt
Vendored
+1 -1
View File
@@ -1442,7 +1442,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.20230406094637-4e0df02b927b
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230406105729-f8da6df0afdb
## explicit; go 1.18
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
vendor/yunion.io/x/cloudmux/pkg/cloudprovider/errors.go
Generated Vendored
-1
View File
@@ -26,7 +26,6 @@ const (
ErrUnsupportedProtocol = errors.Error("UnsupportedProtocol")
ErrInvalidAccessKey = errors.Error("InvalidAccessKey")
ErrUnauthorized = errors.Error("UnauthorizedError")
ErrInvalidCredential = errors.Error("InvalidCredentialError")
ErrNoPermission = errors.Error("NoPermission")
ErrNoSuchProvder = errors.Error("no such provider")
vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/provider/provider.go
Generated Vendored
+2 -2
View File
@@ -194,11 +194,11 @@ func validateClientCloudenv(client *aliyun.SAliyunClient) error {
if isFinanceAccount {
if regions[0].GetCloudEnv() != "FinanceCloud" {
return errors.Wrap(cloudprovider.ErrInvalidCredential, "aksk is aliyun finance account")
return errors.Wrap(cloudprovider.ErrInvalidAccessKey, "aksk is aliyun finance account")
}
} else {
if regions[0].GetCloudEnv() == "FinanceCloud" {
return errors.Wrap(cloudprovider.ErrInvalidCredential, "aksk is not aliyun finance account")
return errors.Wrap(cloudprovider.ErrInvalidAccessKey, "aksk is not aliyun finance account")
}
}