Fix azure multi-environment support

lib/global-admin/addon/components/cloud-credential-azure/component.js

@@ -1,11 +1,13 @@
 import Component from '@ember/component';
 import layout from './template';
 import { inject as service } from '@ember/service';
+import { environments } from 'ui/utils/azure-choices';
 
 export default Component.extend({
   router: service(),
 
   layout,
+  environments,
 
   tag:              null,
   config:           null,

lib/global-admin/addon/components/cloud-credential-azure/template.hbs

@@ -1,3 +1,28 @@
+<div class="row">
+  <div class="col span-6">
+    <label class="acc-label">
+      {{t "nodeDriver.azure.environment.label"}}
+    </label>
+    {{new-select
+      classNames="form-control"
+      content=environments
+      optionLabelPath="value"
+      value=config.environment
+    }}
+  </div>
+  <div class="col span-6">
+    <label class="acc-label" for="azure-subscription-id">
+      {{t "modalAddCloudKey.azure.subscriptionId.label"}}
+      <FieldRequired />
+    </label>
+    <Input
+      @classNames="form-control"
+      @id="azure-subscription-id"
+      @type="text"
+      @value={{mut config.subscriptionId}}
+    />
+  </div>
+</div>
 <div class="row">
   <div class="col span-6">
     <label class="acc-label" for="azure-client-id">
@@ -24,17 +49,3 @@
     />
   </div>
 </div>
-<div class="row">
-  <div class="col span-6">
-    <label class="acc-label" for="azure-subscription-id">
-      {{t "modalAddCloudKey.azure.subscriptionId.label"}}
-      <FieldRequired />
-    </label>
-    <Input
-      @classNames="form-control"
-      @id="azure-subscription-id"
-      @type="text"
-      @value={{mut config.subscriptionId}}
-    />
-  </div>
-</div>

lib/global-admin/addon/components/cru-cloud-credential/component.js

@@ -281,7 +281,7 @@ export default Component.extend(ViewNewEdit, {
     }
 
     const { cloudCredentialType }      = this;
-    const keysThatWeCanValidate = ['amazon', 'digitalOcean', 'linode', 'oci', 'google'];
+    const keysThatWeCanValidate = ['amazon', 'digitalOcean', 'linode', 'oci', 'google', 'azure'];
     const auth                  = {
       type:  'validate',
       token: null,
@@ -372,6 +372,26 @@ export default Component.extend(ViewNewEdit, {
           return this.setError(`${ err.message }`);
         });
       }
+
+      if (cloudCredentialType === 'azure') {
+        return get(this, 'globalStore').rawRequest({
+          url:    '/meta/aksCheckCredentials',
+          method: 'POST',
+          data:   {
+            environment:    get(this, 'config.environment'),
+            clientId:       get(this, 'config.clientId'),
+            clientSecret:   get(this, 'config.clientSecret'),
+            subscriptionId: get(this, 'config.subscriptionId'),
+          },
+          redirectUnauthorized: false,
+        }).then(() => {
+          set(this, 'validatingKeys', false);
+
+          return true;
+        }).catch((err) => {
+          return this.setError(`${ err.message }`);
+        });
+      }
     }
 
     set(this, 'validatingKeys', false);

lib/nodes/addon/components/driver-azure/component.js

@@ -63,6 +63,8 @@ export default Component.extend(NodeDriver, {
     this._super(...arguments);
 
     scheduleOnce('afterRender', this, this.setupComponent);
+
+    this.initEnvironment();
   },
 
   actions: {
@@ -75,10 +77,24 @@ export default Component.extend(NodeDriver, {
     set(this, 'config.managedDisks', get(this, 'managedDisks') === MANAGED);
   }),
 
-  evironmentChoiceObserver: observer('config.environment', function() {
-    let environment = get(this, 'config.environment');
+  cloudCredentialChoiceObserver: observer('model.cloudCredentialId', function() {
+    const cloudCredentialId = get(this, 'model.cloudCredentialId');
+
+    if (!cloudCredentialId){
+      return;
+    }
+
+    get(this, 'store').find('cloudCredential', cloudCredentialId, { forceReload: true }).then((credential) => {
+      const environment = get(credential, 'azurecredentialConfig.environment');
+
+      environment && set(this, 'config.environment', environment);
 
-    set(this, 'config.location', regions[environment][0].name);
+      const location = get(this, 'config.location');
+
+      if (!location || !regions[environment].findBy('name', location)){
+        set(this, 'config.location', regions[environment][0].name);
+      }
+    });
   }),
 
   ipChoiceObserver: observer('publicIpChoice', function() {
@@ -197,4 +213,8 @@ export default Component.extend(NodeDriver, {
     }
   },
 
+  initEnvironment(){
+    this.cloudCredentialChoiceObserver();
+  },
+
 });

lib/nodes/addon/components/driver-azure/template.hbs

@@ -42,6 +42,7 @@
           content=environments
           optionLabelPath="value"
           value=config.environment
+          disabled=true
         }}
       </div>
       <div class="col span-6">

lib/shared/addon/components/cluster-driver/driver-aks/component.js

@@ -232,6 +232,12 @@ export default Component.extend(ClusterDriver, {
 
         set(this, 'regions', filteredRegions);
 
+        const location = get(this, 'config.resourceLocation');
+
+        if (!location || !filteredRegions.findBy('name', location)){
+          set(this, 'config.resourceLocation', filteredRegions[0].name || '');
+        }
+
         cb(true);
 
         set(this, 'step', 2);
@@ -321,11 +327,11 @@ export default Component.extend(ClusterDriver, {
 
         cb(true);
       }).catch((xhr) => {
-        const err = xhr.body.message || xhr.body.code || xhr.body.error;
-
-        setProperties(this, { errors: [err], });
+        const err = get(xhr, 'body.message') || get(xhr, 'body.code') || get(xhr, 'body.error') || xhr;
+        const translation = this.intl.t('clusterNew.azureaks.location.error', { error: err });
 
-        cb(false, [err]);
+        setProperties(this, { errors: [translation], });
+        cb(true);
       });
     },
 
@@ -355,8 +361,13 @@ export default Component.extend(ClusterDriver, {
     }
   }),
 
-  resourceLocationChanged: observer('config.resourceLocation', function() {
+  resourceLocationChanged: observer('config.resourceLocation', 'regions', function() {
     const { regions, config: { resourceLocation } } = this;
+
+    if (!regions){
+      return;
+    }
+
     const match = regions.findBy('name', resourceLocation);
 
     const regionHasAz = this.regionsWithAZs.includes(match?.displayName || '');

lib/shared/addon/utils/azure-choices.js

@@ -17,6 +17,7 @@ export const regionsWithAZs = [
   'US Gov Virginia',
   'West Europe',
   'West US 2',
+  'China North 3',
 ]
 export let regions = {
   'AzurePublicCloud': [
@@ -199,6 +200,10 @@ export let regions = {
     {
       'name':        'chinaeast2',
       'displayName': 'China East 2',
+    },
+    {
+      'name':        'chinanorth3',
+      'displayName': 'China North 3',
     }
   ].sortBy('name'),
   'AzureUSGovernmentCloud': [
@@ -501,6 +506,10 @@ export let aksRegions = [
     'name':        'chinaeast2',
     'displayName': 'China East 2',
   },
+  {
+    'name':        'chinanorth3',
+    'displayName': 'China North 3',
+  },
   {
     'name':        'eastasia',
     'displayName': 'East Asia',

translations/en-us.yaml

@@ -3577,6 +3577,7 @@ clusterNew:
     location:
       label: Location
       prompt: Choose a location...
+      error: '{error}: There was a problem verifying the location. Choose valid location and try again.'
     machineType:
       label: VM Size
       prompt: Choose a size...

translations/zh-hans.yaml

@@ -3561,6 +3561,7 @@ clusterNew:
     location:
       label: 位置
       prompt: 选择位置...
+      error: '{error}: 验证位置时出现问题，请更换有效位置，然后重试。'
     accountAccessSection:
       label: 账户访问
     subscriptionId:

translations/zh-hant-tw.yaml

@@ -3416,6 +3416,7 @@ clusterNew:
     location:
       label: 位置
       prompt: 選擇一個位置...
+      error: '{error}: 驗證位置時出現問題，請更換有效位置，然後重試。'
     accountAccessSection:
       label: 帳號訪問
     subscriptionId:

translations/zh-hant.yaml

@@ -2089,6 +2089,7 @@ clusterNew:
     location:
       label: 位置
       prompt: 選擇一個位置...
+      error: '{error}: 驗證位置時出現問題，請更換有效位置，然後重試。'
     accountAccessSection:
       label: 賬戶訪問
     subscriptionId: