[2.10.6] Added error listener to NodeGroups in EKS

pkg/eks/components/CruEKS.vue

@@ -689,6 +689,7 @@ export default defineComponent({
             :loading-launch-templates="loadingLaunchTemplates"
             :loading-ssh-key-pairs="loadingSshKeyPairs"
             :norman-cluster="normanCluster"
+            @error="errors.push($event)"
           />
         </Tab>
       </Tabbed>

pkg/eks/components/NodeGroup.vue

@@ -333,7 +333,7 @@ export default defineComponent({
     selectedLaunchTemplate: {
       get(): AWS.LaunchTemplate {
         if (this.hasRancherLaunchTemplate) {
-          return { LaunchTemplateName: this.t('eks.nodeGroups.launchTemplate.rancherManaged', { name: this.rancherTemplate }) };
+          return { LaunchTemplateId: this.rancherTemplate, LaunchTemplateName: this.t('eks.nodeGroups.launchTemplate.rancherManaged', { name: this.rancherTemplate }) };
         }
         const id = this.launchTemplate?.id;
 
@@ -356,17 +356,15 @@ export default defineComponent({
     },
 
     launchTemplateVersionOptions(): number[] {
-      if (this.selectedLaunchTemplate && this.selectedLaunchTemplate.LatestVersionNumber) {
-        const { LatestVersionNumber } = this.selectedLaunchTemplate;
-
-        return [...Array(LatestVersionNumber).keys()].map((version) => version + 1);
+      if (this.selectedLaunchTemplateInfo && this.selectedLaunchTemplateInfo?.LaunchTemplateVersions) {
+        return this.selectedLaunchTemplateInfo.LaunchTemplateVersions.map((version) => version.VersionNumber).sort();
       }
 
       return [];
     },
 
     selectedVersionInfo(): AWS.LaunchTemplateVersion | null {
-      return (this.selectedLaunchTemplateInfo?.LaunchTemplateVersions || []).find((v: any) => v.VersionNumber === this.launchTemplate.version) || null;
+      return (this.selectedLaunchTemplateInfo?.LaunchTemplateVersions || []).find((v: any) => v.VersionNumber === this.launchTemplate?.version) || null;
     },
 
     selectedVersionData(): AWS.LaunchTemplateVersionData | undefined {
@@ -455,7 +453,13 @@ export default defineComponent({
       const ec2Client = await store.dispatch('aws/ec2', { region, cloudCredentialId: amazonCredentialSecret });
 
       try {
-        this.selectedLaunchTemplateInfo = await ec2Client.describeLaunchTemplateVersions({ LaunchTemplateId: launchTemplate.LaunchTemplateId, Versions: [...this.launchTemplateVersionOptions] });
+        if (launchTemplate.LaunchTemplateName !== this.defaultTemplateOption.LaunchTemplateName) {
+          if (launchTemplate.LaunchTemplateId) {
+            this.selectedLaunchTemplateInfo = await ec2Client.describeLaunchTemplateVersions({ LaunchTemplateId: launchTemplate.LaunchTemplateId });
+          } else {
+            this.selectedLaunchTemplateInfo = await ec2Client.describeLaunchTemplateVersions({ LaunchTemplateName: launchTemplate.LaunchTemplateName });
+          }
+        }
       } catch (err) {
         this.$emit('error', err);
       }

pkg/eks/components/__tests__/NodeGroup.test.ts

@@ -1,4 +1,3 @@
-
 /* eslint-disable jest/no-mocks-import */
 import { shallowMount } from '@vue/test-utils';
 import NodeGroup from '@pkg/eks/components/NodeGroup.vue';
@@ -56,7 +55,10 @@ describe('eKS Node Groups: create', () => {
           id: 'lt-123123', name: 'test-template', version: 4
         },
         region:                 'foo',
-        amazonCredentialSecret: 'bar'
+        amazonCredentialSecret: 'bar',
+        launchTemplates:        [{
+          LaunchTemplateId: 'lt-123123', LaunchTemplateName: 'test-template', version: 4
+        }]
       },
       ...setup
     });
@@ -77,7 +79,10 @@ describe('eKS Node Groups: create', () => {
           id: 'lt-123123', name: 'test-template', version: 4
         },
         region:                 'foo',
-        amazonCredentialSecret: 'bar'
+        amazonCredentialSecret: 'bar',
+        launchTemplates:        [{
+          LaunchTemplateId: 'lt-123123', LaunchTemplateName: 'test-template', version: 4
+        }]
       },
       ...setup
     });
@@ -98,6 +103,9 @@ describe('eKS Node Groups: create', () => {
         },
         region:                 'foo',
         amazonCredentialSecret: 'bar',
+        launchTemplates:        [{
+          LaunchTemplateId: 'lt-123123', LaunchTemplateName: 'test-template', version: 4
+        }]
       },
       ...setup
     });
@@ -123,6 +131,9 @@ describe('eKS Node Groups: create', () => {
         },
         region:                 'foo',
         amazonCredentialSecret: 'bar',
+        launchTemplates:        [{
+          LaunchTemplateId: 'lt-123123', LaunchTemplateName: 'test-template', version: 4
+        }]
       },
       ...setup
     });
@@ -194,6 +205,9 @@ describe('eKS Node Groups: create', () => {
         },
         region:                 'foo',
         amazonCredentialSecret: 'bar',
+        launchTemplates:        [{
+          LaunchTemplateId: 'lt-123123', LaunchTemplateName: 'test-template', version: 4
+        }]
       },
       ...setup
     });

pkg/eks/types/aws-sdk.d.ts

@@ -55,7 +55,7 @@ export interface LaunchTemplateVersionData {
   UserData: string
 }
 export interface LaunchTemplateVersion {
-  VersionNumber: string,
+  VersionNumber: number,
   LaunchTemplateName: string,
   LaunchTemplateData: LaunchTemplateVersionData,
   LaunchTemplateId: string,