Change initial Azure Region Key 'location' to 'Region' in AdminWeb Re…

…gion Page
MZC-CSC · Apr 11, 2024 · fafe0d6 · fafe0d6
1 parent 0451e20
commit fafe0d6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/api-runtime/rest-runtime/admin-web/AdminWeb-CIM.go b/api-runtime/rest-runtime/admin-web/AdminWeb-CIM.go
@@ -625,7 +625,7 @@ func makeOnchangeRegionProviderFunc_js() string {
             region = '(ohio)us-east-2a'
             break;
           case "AZURE":
-            regionInfo = '[{"Key":"location", "Value":"northeurope"}, {"Key":"Zone", "Value":"1"}]'
+            regionInfo = '[{"Key":"Region", "Value":"northeurope"}, {"Key":"Zone", "Value":"1"}]'
             region = 'northeurope'
             break;
           case "GCP":

diff --git a/api-runtime/rest-runtime/test/connect-config/2.azure-conn-config.sh b/api-runtime/rest-runtime/test/connect-config/2.azure-conn-config.sh
@@ -8,7 +8,7 @@ curl -X POST http://$RESTSERVER:1024/spider/driver -H 'Content-Type: application
 curl -X POST http://$RESTSERVER:1024/spider/credential -H 'Content-Type: application/json' -d '{"CredentialName":"azure-credential01","ProviderName":"AZURE", "KeyValueInfoList": [{"Key":"ClientId", "Value":"XXXX-XXXX"}, {"Key":"ClientSecret", "Value":"xxxx-xxxx"}, {"Key":"TenantId", "Value":"xxxx-xxxx"}, {"Key":"SubscriptionId", "Value":"xxxx-xxxx"}]}'
 
  # for Cloud Region Info
-curl -X POST http://$RESTSERVER:1024/spider/region -H 'Content-Type: application/json' -d '{"RegionName":"azure-northeu","ProviderName":"AZURE", "KeyValueInfoList": [{"Key":"location", "Value":"northeurope"}, {"Key":"Zone", "Value":"1"}]}'
+curl -X POST http://$RESTSERVER:1024/spider/region -H 'Content-Type: application/json' -d '{"RegionName":"azure-northeu","ProviderName":"AZURE", "KeyValueInfoList": [{"Key":"Region", "Value":"northeurope"}, {"Key":"Zone", "Value":"1"}]}'
 
  # for Cloud Connection Config Info
 curl -X POST http://$RESTSERVER:1024/spider/connectionconfig -H 'Content-Type: application/json' -d '{"ConfigName":"azure-northeu-config","ProviderName":"AZURE", "DriverName":"azure-driver01", "CredentialName":"azure-credential01", "RegionName":"azure-northeu"}'