@rancher/shell 3.0.7 → 3.0.8-rc.10

package/machine-config/components/__tests__/utils/vpcSubnetMockData.js

@@ -0,0 +1,294 @@
+export const vpcInfo = {
+  $metadata: {
+    httpStatusCode:  200,
+    requestId:       '12345',
+    attempts:        1,
+    totalRetryDelay: 0
+  },
+  Vpcs: [
+    {
+      CidrBlock:               '192.168.0.0/16',
+      DhcpOptionsId:           'dopt-1234',
+      State:                   'available',
+      VpcId:                   'vpc-123',
+      OwnerId:                 '54321',
+      InstanceTenancy:         'default',
+      CidrBlockAssociationSet: [
+        {
+          AssociationId:  'vpc-cidr-assoc-123',
+          CidrBlock:      '192.168.0.0/16',
+          CidrBlockState: { State: 'associated' }
+        }
+      ],
+      IsDefault: false,
+      Tags:      [
+        {
+          Key:   'displayName',
+          Value: 'test'
+        },
+        {
+          Key:   'Name',
+          Value: 'test-eks-vpc-VPC'
+        }
+      ]
+    },
+    {
+      CidrBlock:               '172.31.0.0/16',
+      DhcpOptionsId:           'dopt-12345',
+      State:                   'available',
+      VpcId:                   'vpc-1234',
+      OwnerId:                 '54321',
+      InstanceTenancy:         'default',
+      CidrBlockAssociationSet: [
+        {
+          AssociationId:  'vpc-cidr-assoc-12345',
+          CidrBlock:      '172.31.0.0/16',
+          CidrBlockState: { State: 'associated' }
+        }
+      ],
+      IsDefault: false,
+      Tags:      [
+        {
+          Key:   'Name',
+          Value: 'aws-controltower-VPC'
+        }
+      ]
+    },
+    {
+      CidrBlock:                   '192.168.0.0/16',
+      DhcpOptionsId:               'dopt-123456',
+      State:                       'available',
+      VpcId:                       'vpc-12345',
+      OwnerId:                     '54321',
+      InstanceTenancy:             'default',
+      Ipv6CidrBlockAssociationSet: ['1234'],
+      CidrBlockAssociationSet:     [
+        {
+          AssociationId:  'vpc-cidr-assoc-123456',
+          CidrBlock:      '192.168.0.0/16',
+          CidrBlockState: { State: 'associated' }
+        }
+      ],
+      IsDefault: false,
+      Tags:      [
+
+        {
+          Key:   'Name',
+          Value: 'mo-eks-eks-vpc-VPC'
+        },
+        {
+          Key:   'displayName',
+          Value: 'mo-eks'
+        }
+      ]
+    }
+  ]
+};
+
+export const subnetInfo = {
+  $metadata: {
+    httpStatusCode:  200,
+    requestId:       '123456',
+    attempts:        1,
+    totalRetryDelay: 0
+  },
+  Subnets: [
+    {
+      AvailabilityZone:            'us-west-2b',
+      AvailabilityZoneId:          'usw2-az1',
+      AvailableIpAddressCount:     4091,
+      CidrBlock:                   '172.31.32.0/20',
+      DefaultForAz:                false,
+      MapPublicIpOnLaunch:         false,
+      MapCustomerOwnedIpOnLaunch:  false,
+      State:                       'available',
+      SubnetId:                    'subnet-1234',
+      VpcId:                       'vpc-1234',
+      OwnerId:                     '1234',
+      AssignIpv6AddressOnCreation: false,
+      Tags:                        [
+        {
+          Key:   'Name',
+          Value: 'aws-controltower-PrivateSubnet2A'
+        },
+
+        {
+          Key:   'Network',
+          Value: 'Private'
+        },
+
+        {
+          Key:   'aws:cloudformation:logical-id',
+          Value: 'PrivateSubnet2A'
+        }
+      ],
+      SubnetArn: 'arn:aws:ec2:us-west-2:821532311898:subnet/subnet-1234'
+    },
+    {
+      AvailabilityZone:            'us-west-2c',
+      AvailabilityZoneId:          'usw2-az3',
+      AvailableIpAddressCount:     4091,
+      CidrBlock:                   '172.31.80.0/20',
+      DefaultForAz:                false,
+      MapPublicIpOnLaunch:         false,
+      MapCustomerOwnedIpOnLaunch:  false,
+      State:                       'available',
+      SubnetId:                    'subnet-321',
+      VpcId:                       'vpc-1234',
+      OwnerId:                     '1234',
+      AssignIpv6AddressOnCreation: false,
+      Tags:                        [
+        {
+          Key:   'Name',
+          Value: 'aws-controltower-PrivateSubnet3A'
+        },
+        {
+          Key:   'aws:cloudformation:logical-id',
+          Value: 'PrivateSubnet3A'
+        },
+        {
+          Key:   'Network',
+          Value: 'Private'
+        },
+      ],
+      SubnetArn: 'arn:aws:ec2:us-west-2:821532311898:subnet/subnet-321'
+    },
+    {
+      AvailabilityZone:            'us-west-2a',
+      AvailabilityZoneId:          'usw2-az2',
+      AvailableIpAddressCount:     16379,
+      CidrBlock:                   '192.168.64.0/18',
+      DefaultForAz:                false,
+      MapPublicIpOnLaunch:         true,
+      MapCustomerOwnedIpOnLaunch:  false,
+      State:                       'available',
+      SubnetId:                    'subnet-4321',
+      VpcId:                       'vpc-12345',
+      OwnerId:                     '1234',
+      AssignIpv6AddressOnCreation: false,
+      Ipv6CidrBlockAssociationSet: ['1234'],
+      Tags:                        [
+        {
+          Key:   'Name',
+          Value: 'test-eks-vpc-Subnet01'
+        },
+        {
+          Key:   'displayName',
+          Value: 'test'
+        },
+        {
+          Key:   'aws:cloudformation:stack-name',
+          Value: 'test-eks-vpc'
+        },
+        {
+          Key:   'aws:cloudformation:logical-id',
+          Value: 'Subnet01'
+        },
+        {
+          Key:   'kubernetes.io/role/elb',
+          Value: '1'
+        }
+      ],
+      SubnetArn: 'arn:aws:ec2:us-west-2:821532311898:subnet/subnet-4321'
+    },
+    {
+      AvailabilityZone:            'us-west-2b',
+      AvailabilityZoneId:          'usw2-az1',
+      AvailableIpAddressCount:     16379,
+      CidrBlock:                   '192.168.128.0/18',
+      DefaultForAz:                false,
+      MapPublicIpOnLaunch:         true,
+      MapCustomerOwnedIpOnLaunch:  false,
+      State:                       'available',
+      SubnetId:                    'subnet-21',
+      VpcId:                       'vpc-12345',
+      OwnerId:                     '1234',
+      AssignIpv6AddressOnCreation: false,
+      Ipv6CidrBlockAssociationSet: ['1234'],
+      Tags:                        [
+        {
+          Key:   'aws:cloudformation:logical-id',
+          Value: 'Subnet02'
+        },
+        {
+          Key:   'displayName',
+          Value: 'test'
+        },
+        {
+          Key:   'aws:cloudformation:stack-name',
+          Value: 'test-eks-vpc'
+        },
+        {
+          Key:   'kubernetes.io/role/elb',
+          Value: '1'
+        },
+        {
+          Key:   'Name',
+          Value: 'test-eks-vpc-Subnet02'
+        }
+      ],
+      SubnetArn: 'arn:aws:ec2:us-west-2:821532311898:subnet/subnet-21'
+    },
+    {
+      AvailabilityZone:            'us-west-2c',
+      AvailabilityZoneId:          'usw2-az3',
+      AvailableIpAddressCount:     16379,
+      CidrBlock:                   '192.168.192.0/18',
+      DefaultForAz:                false,
+      MapPublicIpOnLaunch:         true,
+      MapCustomerOwnedIpOnLaunch:  false,
+      State:                       'available',
+      SubnetId:                    'subnet-123',
+      VpcId:                       'vpc-12345',
+      OwnerId:                     '1234',
+      AssignIpv6AddressOnCreation: false,
+      Ipv6CidrBlockAssociationSet: ['1234'],
+      Tags:                        [
+
+        {
+          Key:   'aws:cloudformation:stack-name',
+          Value: 'test-eks-vpc'
+        },
+        {
+          Key:   'displayName',
+          Value: 'test'
+        },
+        {
+          Key:   'kubernetes.io/role/elb',
+          Value: '1'
+        },
+        {
+          Key:   'Name',
+          Value: 'test-eks-vpc-Subnet03'
+        }
+      ],
+      SubnetArn: 'arn:aws:ec2:us-west-2:821532311898:subnet/subnet-123'
+    },
+    {
+      AvailabilityZone:            'us-west-2a',
+      AvailabilityZoneId:          'usw2-az2',
+      AvailableIpAddressCount:     4091,
+      CidrBlock:                   '172.31.64.0/20',
+      DefaultForAz:                false,
+      MapPublicIpOnLaunch:         false,
+      MapCustomerOwnedIpOnLaunch:  false,
+      State:                       'available',
+      SubnetId:                    'subnet-12',
+      VpcId:                       'vpc-12',
+      OwnerId:                     '1234',
+      AssignIpv6AddressOnCreation: false,
+      Tags:                        [
+        {
+          Key:   'Name',
+          Value: 'aws-controltower-PrivateSubnet1A'
+        },
+
+        {
+          Key:   'Network',
+          Value: 'Private'
+        }
+      ],
+      SubnetArn: 'arn:aws:ec2:us-west-2:821532311898:subnet/subnet-12'
+    }
+  ]
+};

package/machine-config/digitalocean.vue

@@ -16,6 +16,8 @@ export default {
 
   mixins: [CreateEditView],
 
+  emits: ['update:hasIpv6'],
+
   props: {
     credentialId: {
       type:     String,
@@ -26,6 +28,11 @@ export default {
       type:    Boolean,
       default: false
     },
+
+    hasIpv6: {
+      type:    Boolean,
+      default: false
+    },
   },
 
   async fetch() {
@@ -110,6 +117,10 @@ export default {
     },
 
     'value.image': 'updateUsername',
+
+    'value.ipv6'(neu) {
+      this.$emit('update:hasIpv6', neu);
+    }
   },
 
   computed: {

package/machine-config/google.vue

@@ -515,7 +515,7 @@ export default {
           :options="subnetworkOptions"
           :disabled="!poolCreateMode"
           option-key="name"
-          option-label="name"
+          option-label="label"
           :loading="loadingNetworks"
           data-testid="gce-subnetwork-select"
         />

package/mixins/__tests__/brand.spec.ts

@@ -99,9 +99,9 @@ describe('brandMixin', () => {
             filters: [{
               equals: true,
               fields: [{
-                equals: true, exact: true, exists: false, field: 'metadata.name', value: 'rancher-csp-adapter'
+                equality: '=', equals: true, exact: true, exists: false, field: 'metadata.name', value: 'rancher-csp-adapter'
               }, {
-                equals: true, exact: true, exists: false, field: 'metadata.name', value: 'rancher-csp-billing-adapter'
+                equality: '=', equals: true, exact: true, exists: false, field: 'metadata.name', value: 'rancher-csp-billing-adapter'
               }],
               param: 'filter'
             }],

package/mixins/__tests__/chart.test.ts

@@ -238,5 +238,26 @@ describe('chartMixin', () => {
         icon: 'icon-downgrade-alt',
       });
     });
+
+    it('should return "upgrade" action when upgrading from a pre-release to a stable version', () => {
+      const wrapper = mount(DummyComponent, {
+        data: () => ({
+          existing: { spec: { chart: { metadata: { version: '1.0.0-rc1' } } } },
+          version:  { version: '1.0.0' }
+        }),
+        global: {
+          mocks: {
+            $store: mockStore,
+            $route: { query: {} }
+          }
+        }
+      });
+
+      expect(wrapper.vm.action).toStrictEqual({
+        name: 'upgrade',
+        tKey: 'upgrade',
+        icon: 'icon-upgrade-alt',
+      });
+    });
   });
 });

package/mixins/brand.js

@@ -36,7 +36,7 @@ export default {
   },
 
   computed: {
-    ...mapGetters({ loggedIn: 'auth/loggedIn' }),
+    ...mapGetters({ loggedIn: 'auth/loggedIn', brand: 'management/brand' }),
 
     // added to fix https://github.com/rancher/dashboard/issues/10788
     // because on logout the brand mixin is mounted, but then a management store reset happens
@@ -46,12 +46,6 @@ export default {
       return this.$store.getters['management/all'](MANAGEMENT.SETTING);
     },
 
-    brand() {
-      const setting = this.globalSettings?.find((gs) => gs.id === SETTING.BRAND);
-
-      return setting?.value;
-    },
-
     color() {
       const setting = this.globalSettings?.find((gs) => gs.id === SETTING.PRIMARY_COLOR);
 

package/mixins/chart.js

@@ -10,7 +10,7 @@ import { NAME as MANAGER } from '@shell/config/product/manager';
 import { OPA_GATE_KEEPER_ID } from '@shell/pages/c/_cluster/gatekeeper/index.vue';
 import { formatSi, parseSi } from '@shell/utils/units';
 import { CAPI, CATALOG } from '@shell/config/types';
-import { isPrerelease, compare } from '@shell/utils/version';
+import { isPrerelease, compare, isUpgradeFromPreToStable } from '@shell/utils/version';
 import difference from 'lodash/difference';
 import { LINUX, APP_UPGRADE_STATUS } from '@shell/store/catalog';
 import { clone } from '@shell/utils/object';
@@ -220,7 +220,7 @@ export default {
     },
 
     currentVersion() {
-      return this.existing?.spec.chart.metadata.version;
+      return this.existing?.spec?.chart?.metadata?.version;
     },
 
     targetVersion() {
@@ -240,6 +240,12 @@ export default {
         };
       }
 
+      if (isUpgradeFromPreToStable(this.currentVersion, this.targetVersion)) {
+        return {
+          name: 'upgrade', tKey: 'upgrade', icon: 'icon-upgrade-alt'
+        };
+      }
+
       if (compare(this.currentVersion, this.targetVersion) < 0) {
         return {
           name: 'upgrade', tKey: 'upgrade', icon: 'icon-upgrade-alt'

package/mixins/create-edit-view/index.js

@@ -48,6 +48,11 @@ export default defineComponent({
     useTabbedHash: {
       type:    Boolean,
       default: undefined
+    },
+
+    defaultTab: {
+      type:    String,
+      default: undefined
     }
   },
 });

package/models/__tests__/chart.test.ts

@@ -2,19 +2,24 @@ import Chart from '@shell/models/chart';
 import { APP_UPGRADE_STATUS } from '@shell/store/catalog';
 import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations';
 import { ZERO_TIME } from '@shell/config/types';
+import { getLatestCompatibleVersion } from '@shell/utils/chart';
+
+jest.mock('@shell/utils/chart', () => ({ getLatestCompatibleVersion: jest.fn() }));
 
 type MockChartContext = {
   rootGetters: {
     'cluster/all': () => any[];
     'i18n/t': (key: string) => string;
+    currentCluster: { workerOSs: string[] };
+    'prefs/get': (key: string) => boolean;
   };
   dispatch?: jest.Mock;
 };
 
 interface CardContent {
-  subHeaderItems: { label: string }[];
+  subHeaderItems: { label: string, labelTooltip?: string}[];
   footerItems: { labels: string[]; icon?: string }[];
-  statuses: { tooltip: { key: string }; color: string }[];
+  statuses: { tooltip: { key?: string; text?: string }; color: string }[];
 }
 
 const t = jest.fn((key) => key); // mock translation function
@@ -58,11 +63,32 @@ describe('class Chart', () => {
   beforeEach(() => {
     ctx = {
       rootGetters: {
-        'cluster/all': () => [],
-        'i18n/t':      t
+        'cluster/all':  () => [],
+        'i18n/t':       t,
+        currentCluster: { workerOSs: [] },
+        'prefs/get':    () => false,
       },
       dispatch
     };
+    (getLatestCompatibleVersion as jest.Mock).mockImplementation((chart) => chart.versions[0]);
+  });
+
+  describe('queryParams', () => {
+    it('should return query params with the latest compatible version', () => {
+      const chart = new Chart(base, ctx);
+      const query = chart.queryParams();
+
+      expect(getLatestCompatibleVersion).toHaveBeenCalledWith(chart, [], false);
+      expect(query).toHaveProperty('version', '1.3.0');
+    });
+
+    it('should reflect a different latest version from the mock', () => {
+      (getLatestCompatibleVersion as jest.Mock).mockImplementation((chart) => chart.versions[1]);
+      const chart = new Chart(base, ctx);
+      const query = chart.queryParams();
+
+      expect(query).toHaveProperty('version', '1.2.3');
+    });
   });
 
   describe('matchingInstalledApps', () => {
@@ -188,6 +214,7 @@ describe('class Chart', () => {
 
       const result = chart.cardContent as CardContent;
 
+      expect(getLatestCompatibleVersion).toHaveBeenCalledWith(chart, [], false);
       expect(result.subHeaderItems).toHaveLength(2);
       expect(result.subHeaderItems[0].label).toBe('1.3.0');
       expect(result.subHeaderItems[1].label).toBe('Mar 10, 2024');
@@ -225,7 +252,7 @@ describe('class Chart', () => {
 
       const result = chart.cardContent as CardContent;
 
-      const deprecatedStatus = result.statuses.find((s) => s.tooltip.key === 'generic.deprecated');
+      const deprecatedStatus = result.statuses.find((s) => s.tooltip?.key === 'generic.deprecated');
 
       expect(deprecatedStatus).toBeDefined();
       expect(deprecatedStatus?.color).toBe('error');
@@ -240,10 +267,11 @@ describe('class Chart', () => {
 
       const result = chart.cardContent as CardContent;
 
-      const installedStatus = result.statuses.find((s) => s.tooltip.key === 'generic.installed');
+      const installedStatus = result.statuses.find((s) => s.tooltip?.text?.startsWith('generic.installed'));
 
       expect(installedStatus).toBeDefined();
       expect(installedStatus?.color).toBe('success');
+      expect(installedStatus?.tooltip?.text).toContain(installedApp.spec.chart.metadata.version);
     });
 
     it('includes upgradeable status when upgrade is available', () => {
@@ -255,7 +283,7 @@ describe('class Chart', () => {
 
       const result = chart.cardContent as CardContent;
 
-      const upgradeableStatus = result.statuses.find((s) => s.tooltip.key === 'generic.upgradeable');
+      const upgradeableStatus = result.statuses.find((s) => s.tooltip?.key === 'generic.upgradeable');
 
       expect(upgradeableStatus).toBeDefined();
       expect(upgradeableStatus?.color).toBe('info');
@@ -270,9 +298,16 @@ describe('class Chart', () => {
 
       const result = chart.cardContent as CardContent;
 
-      const keys = result.statuses.map((s) => s.tooltip.key);
+      const statuses = result.statuses.map((s) => {
+        if (s.tooltip?.key) {
+          return s.tooltip.key;
+        }
+        if (s.tooltip?.text?.startsWith('generic.installed')) {
+          return 'generic.installed';
+        }
+      });
 
-      expect(keys).toStrictEqual(expect.arrayContaining([
+      expect(statuses).toStrictEqual(expect.arrayContaining([
         'generic.deprecated',
         'generic.upgradeable',
         'generic.installed'
@@ -289,12 +324,14 @@ describe('class Chart', () => {
       };
       const chart = new Chart(chartWithZeroTime, {
         rootGetters: {
-          'cluster/all': () => [],
-          'i18n/t':      (key) => key
+          'cluster/all':  () => [],
+          'i18n/t':       (key: string) => key,
+          currentCluster: { workerOSs: [] },
+          'prefs/get':    () => false,
         },
       });
 
-      const result = chart.cardContent;
+      const result = chart.cardContent as CardContent;
       const lastUpdatedItem = result.subHeaderItems[1];
 
       expect(lastUpdatedItem.label).toBe('generic.na');

package/models/__tests__/compliance.cattle.io.clusterscanprofile.spec.js

@@ -0,0 +1,30 @@
+import ComplianceProfile from '@shell/models/compliance.cattle.io.clusterscanprofile';
+
+describe('class: ComplianceProfile', () => {
+  describe('getter: numberTestsSkipped', () => {
+    it('should return 0 if skipTests is not present in spec', () => {
+      const complianceProfile = new ComplianceProfile({ spec: {} });
+
+      expect(complianceProfile.numberTestsSkipped).toBe(0);
+    });
+
+    it('should return 0 if skipTests is null', () => {
+      const complianceProfile = new ComplianceProfile({ spec: { skipTests: null } });
+
+      expect(complianceProfile.numberTestsSkipped).toBe(0);
+    });
+
+    it('should return 0 if skipTests is an empty array', () => {
+      const complianceProfile = new ComplianceProfile({ spec: { skipTests: [] } });
+
+      expect(complianceProfile.numberTestsSkipped).toBe(0);
+    });
+
+    it('should return the correct number of skipped tests', () => {
+      const tests = ['test-1', 'test-2', 'test-3'];
+      const complianceProfile = new ComplianceProfile({ spec: { skipTests: tests } });
+
+      expect(complianceProfile.numberTestsSkipped).toBe(tests.length);
+    });
+  });
+});