From d3e2999ef4a11f22ce284e722dbbee207c6f0047 Mon Sep 17 00:00:00 2001
From: mhf <mhf1018763435@163.com>
Date: Thu, 15 Dec 2022 10:43:53 +0800
Subject: [PATCH] fix(cloudmon): remotefile metrice bugfix

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

diff --git a/go.mod b/go.mod
index 5d30f6d108..826dfd9843 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.20221212022832-4b47149c8131
+	yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221214123921-87b816428b1e
 	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 abdb8aea1b..7327a3c2a2 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.20221212022832-4b47149c8131 h1:al86HmU7ITd7zAV6cyQU9mRHzdbo/EKHsLlEpGSaGog=
-yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221212022832-4b47149c8131/go.mod h1:drc/WDD65r6wI1tSejk19xcl9QwmzZlgJGXN7a9o2KQ=
+yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221214123921-87b816428b1e h1:drZgFMUCXgQ3wvnrhwKleSh2KtfiemIk2m4k+pkG4ck=
+yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221214123921-87b816428b1e/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/vendor/modules.txt b/vendor/modules.txt
index 3678200dd0..9397a676ec 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.20221212022832-4b47149c8131
+# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221214123921-87b816428b1e
 ## 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/aws.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/aws.go
index 8d67a05c3c..bf6ddc659f 100644
--- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/aws.go
+++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/aws.go
@@ -280,6 +280,10 @@ func (client *SAwsClient) getAwsSession(regionId string, assumeRole bool) (*sess
 				}
 				return nil, errors.Wrapf(cloudprovider.ErrAccountReadOnly, action)
 			}
+			// organization
+			if service == "organizations" {
+				return respCheck, nil
+			}
 			// s3
 			if req.Method == "GET" || req.Method == "HEAD" {
 				return respCheck, nil
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/remotefile/remotefile.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/remotefile/remotefile.go
index dc22f1a7ce..c5bd786a46 100644
--- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/remotefile/remotefile.go
+++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/remotefile/remotefile.go
@@ -288,9 +288,10 @@ func (self *SRemoteFileClient) GetStorages() ([]SStorage, error) {
 
 func (self *SRemoteFileClient) getMetrics(resourceType cloudprovider.TResourceType, metricType cloudprovider.TMetricType) ([]cloudprovider.MetricValues, error) {
 	ret := []cloudprovider.MetricValues{}
+	self.lock.Lock()
+	defer self.lock.Unlock()
+
 	if self.metrics == nil {
-		self.lock.Lock()
-		defer self.lock.Unlock()
 		self.metrics = []map[cloudprovider.TMetricType]map[string]interface{}{}
 		resp, err := self.get("metrics")
 		if err != nil {