From 354028952b13b1e7d3bf8092a758c3ec547d30ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Sun, 20 Nov 2022 17:11:43 +0800 Subject: [PATCH] fix(region): cloudpods self manage check (#15398) --- go.mod | 2 +- go.sum | 4 ++-- pkg/compute/models/cloudaccounts.go | 2 +- vendor/modules.txt | 2 +- .../x/cloudmux/pkg/multicloud/cloudpods/cloudpods.go | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 09f7c39b81..c05dcf2670 100644 --- a/go.mod +++ b/go.mod @@ -84,7 +84,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.20221118075336-64c069b55cce + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221118112906-e5e896ec1090 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 diff --git a/go.sum b/go.sum index 527ebe42f4..bfebb4585d 100644 --- a/go.sum +++ b/go.sum @@ -1176,8 +1176,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.20221118075336-64c069b55cce h1:TMpMl9KYD0O3ATBnT1tI5qHRSD9iV7qvaEd3Wq+22vo= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221118075336-64c069b55cce/go.mod h1:drc/WDD65r6wI1tSejk19xcl9QwmzZlgJGXN7a9o2KQ= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221118112906-e5e896ec1090 h1:083kc0gy1qzoaNOhBS8bTkKWKstKBqOrHFmvthmh/BE= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221118112906-e5e896ec1090/go.mod h1:drc/WDD65r6wI1tSejk19xcl9QwmzZlgJGXN7a9o2KQ= 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= diff --git a/pkg/compute/models/cloudaccounts.go b/pkg/compute/models/cloudaccounts.go index 998d3d6976..bd5c8d8613 100644 --- a/pkg/compute/models/cloudaccounts.go +++ b/pkg/compute/models/cloudaccounts.go @@ -487,7 +487,7 @@ func (manager *SCloudaccountManager) validateCreateData( DefaultRegion: input.DefaultRegion, ProxyFunc: proxyFunc, - AdminProjectId: auth.GetAdminSession(ctx, options.Options.Region).GetProjectDomainId(), + AdminProjectId: auth.GetAdminSession(ctx, options.Options.Region).GetProjectId(), AliyunResourceGroupIds: options.Options.AliyunResourceGroups, Options: input.Options, diff --git a/vendor/modules.txt b/vendor/modules.txt index c4c3e17b4e..28ee9d9aac 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1439,7 +1439,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.20221118075336-64c069b55cce +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221118112906-e5e896ec1090 ## 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/cloudpods/cloudpods.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/cloudpods/cloudpods.go index fcaf99d3e9..811f709d26 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/cloudpods/cloudpods.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/cloudpods/cloudpods.go @@ -127,7 +127,7 @@ func (self *SCloudpodsClient) auth() error { if !self.s.GetToken().HasSystemAdminPrivilege() { return fmt.Errorf("no system admin privilege") } - if self.s.GetProjectDomainId() == self.adminProjectId { + if self.s.GetProjectId() == self.adminProjectId { return fmt.Errorf("You can't manage yourself environment") } return nil