From 00d9b5fa5916726db77dbc203b7eb5cae46d2a7b Mon Sep 17 00:00:00 2001 From: ioito Date: Mon, 18 Jul 2022 15:20:52 +0800 Subject: [PATCH] fix(region): azure account read only --- pkg/apis/compute/dbinstance_const.go | 2 ++ pkg/multicloud/azure/azure.go | 2 +- pkg/multicloud/azure/rds_sqlserver.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/apis/compute/dbinstance_const.go b/pkg/apis/compute/dbinstance_const.go index 3071fcf411..43b1c1b405 100644 --- a/pkg/apis/compute/dbinstance_const.go +++ b/pkg/apis/compute/dbinstance_const.go @@ -156,6 +156,8 @@ const ( QCLOUD_DBINSTANCE_STORAGE_TYPE_LOCAL_SSD = "local_ssd" //本地盘SSD盘 QCLOUD_DBINSTANCE_STORAGE_TYPE_CLOUD_SSD = "cloud_ssd" //SSD云盘 + // Azure + AZURE_DBINSTANCE_STORAGE_TYPE_DEFAULT = "default" ) var ( diff --git a/pkg/multicloud/azure/azure.go b/pkg/multicloud/azure/azure.go index c22accfc82..fe1a8dd258 100644 --- a/pkg/multicloud/azure/azure.go +++ b/pkg/multicloud/azure/azure.go @@ -161,7 +161,7 @@ func (self *SAzureClient) getClient(resource TAzureResource) (*autorest.Client, transport, _ := httpClient.Transport.(*http.Transport) httpClient.Transport = cloudprovider.GetCheckTransport(transport, func(req *http.Request) (func(resp *http.Response), error) { if self.cpcfg.ReadOnly { - if req.Method == "GET" { + if req.Method == "GET" || (req.Method == "POST" && strings.HasSuffix(req.URL.Path, "oauth2/token")) { return nil, nil } return nil, errors.Wrapf(cloudprovider.ErrAccountReadOnly, "%s %s", req.Method, req.URL.Path) diff --git a/pkg/multicloud/azure/rds_sqlserver.go b/pkg/multicloud/azure/rds_sqlserver.go index fc5a562625..0fdaa43737 100644 --- a/pkg/multicloud/azure/rds_sqlserver.go +++ b/pkg/multicloud/azure/rds_sqlserver.go @@ -142,7 +142,7 @@ func (self *SSQLServer) GetStatus() string { } func (self *SSQLServer) GetStorageType() string { - return "" + return api.AZURE_DBINSTANCE_STORAGE_TYPE_DEFAULT } func (self *SSQLServer) fetchDatabase() ([]SSQLServerDatabase, error) {