include gke zone in list of extra locations (rancher#12289)

rak-phillip · Oct 21, 2024 · 83e250b · 83e250b
1 parent 69c1080
commit 83e250b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 12 deletions.
diff --git a/pkg/gke/components/Config.vue b/pkg/gke/components/Config.vue
@@ -204,7 +204,7 @@ export default defineComponent({
           this.$emit('update:region', this.defaultRegion);
         } else {
           this.$emit('update:region', null);
-          this.$emit('update:zone', this.defaultZone);
+          this.setZone({ name: this.defaultZone });
         }
       }
     },
@@ -389,6 +389,8 @@ export default defineComponent({
     setZone(neu: {name: string}) {
       this.selectedZone = neu;
       this.$emit('update:zone', neu.name);
+
+      this.$emit('update:locations', [neu.name]);
     },
 
     setExtraZone(add: boolean, zone: string) {
@@ -443,6 +445,7 @@ export default defineComponent({
           :value="zone"
           :disabled="!isNewOrUnprovisioned"
           :loading="loadingZones"
+          data-testid="gke-zone-select"
           @selecting="setZone"
         />
       </div>
@@ -462,7 +465,7 @@ export default defineComponent({
           :label="zoneOpt.name"
           :value="locations.includes(zoneOpt.name)"
           :data-testid="`gke-extra-zones-${zoneOpt.name}`"
-          :disabled="!isNewOrUnprovisioned"
+          :disabled="isView"
           class="extra-zone-checkbox"
           @update:value="e=>setExtraZone(e, zoneOpt.name)"
         />

diff --git a/pkg/gke/components/CruGKE.vue b/pkg/gke/components/CruGKE.vue
@@ -100,7 +100,7 @@ const defaultGkeConfig = {
   },
   kubernetesVersion:        '',
   labels:                   {},
-  locations:                [],
+  locations:                [DEFAULT_GCP_ZONE],
   loggingService:           'logging.googleapis.com/kubernetes',
   maintenanceWindow:        '',
   masterAuthorizedNetworks: { enabled: false, cidrBlocks: [] },

diff --git a/pkg/gke/components/__tests__/Config.test.ts b/pkg/gke/components/__tests__/Config.test.ts
@@ -4,15 +4,6 @@ import flushPromises from 'flush-promises';
 import Config from '@pkg/gke/components/Config.vue';
 import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
 
-// const mockedValidationMixin = {
-//   computed: {
-//     fvFormIsValid:                jest.fn(),
-//     type:                         jest.fn(),
-//     fvUnreportedValidationErrors: jest.fn(),
-//   },
-//   methods: { fvGetAndReportPathRules: jest.fn() }
-// };
-
 const mockedStore = (versionSetting: any) => {
   return {
     getters: {
@@ -208,4 +199,29 @@ describe('gke Config', () => {
 
     expect(Object.keys(checkedNotInLocations)).toHaveLength(0);
   });
+
+  it('should add newly selected zone to the list of extra zones (gkeConfig.locations) and remove old extra zones', async() => {
+    const setup = requiredSetup();
+
+    const wrapper = shallowMount(Config, {
+      propsData: {
+        zone:              'us-east1-b',
+        region:            '',
+        cloudCredentialId: '',
+        projectId:         'test-project',
+        locations:         ['us-east1-a']
+      },
+      ...setup
+    });
+
+    wrapper.setProps({ cloudCredentialId: 'abc' });
+    await flushPromises();
+
+    const zoneSelect = wrapper.getComponent('[data-testid="gke-zone-select"]');
+
+    zoneSelect.vm.$emit('selecting', { name: 'us-east4-b' });
+
+    await flushPromises();
+    expect(wrapper.emitted('update:locations')[0][0]).toStrictEqual(['us-east4-b']);
+  });
 });