@rancher/shell 3.0.5-rc.3 → 3.0.5-rc.6

package/config/product/auth.js

@@ -62,8 +62,19 @@ export function init(store) {
       }
     }
   });
+
   configureType(MANAGEMENT.USER, { showListMasthead: false });
 
+  configureType(MANAGEMENT.OIDC_CLIENT, {
+    listCreateButtonLabelKey: 'oidcclient.listViewCreate',
+    isCreatable:              true,
+    isEditable:               true,
+    isRemovable:              true,
+    showAge:                  true,
+    showState:                true,
+    canYaml:                  true,
+  });
+
   spoofedType({
     labelKey:          'typeLabel."group.principal"',
     type:              NORMAN.SPOOFED.GROUP_PRINCIPAL,
@@ -132,6 +143,7 @@ export function init(store) {
         }));
     }
   });
+
   configureType(NORMAN.SPOOFED.GROUP_PRINCIPAL, {
     isCreatable:      false,
     showAge:          false,
@@ -139,9 +151,11 @@ export function init(store) {
     isRemovable:      false,
     showListMasthead: false,
   });
+
   // Use labelFor... so lookup succeeds with .'s in path.... and end result is 'trimmed' as per other entries
   mapType(NORMAN.SPOOFED.GROUP_PRINCIPAL, store.getters['type-map/labelFor']({ id: NORMAN.SPOOFED.GROUP_PRINCIPAL }, 2));
   weightType(NORMAN.SPOOFED.GROUP_PRINCIPAL, 101, true);
+  weightType(MANAGEMENT.OIDC_CLIENT, 90, true);
 
   virtualType({
     labelKey:   'auth.roleTemplate',
@@ -175,12 +189,14 @@ export function init(store) {
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/azuread`, 'auth/azuread');
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/keycloakoidc`, 'auth/oidc');
   componentForType(`${ MANAGEMENT.AUTH_CONFIG }/genericoidc`, 'auth/oidc');
+  componentForType(`${ MANAGEMENT.AUTH_CONFIG }/cognito`, 'auth/oidc');
 
   basicType([
     'config',
     USERS_VIRTUAL_TYPE,
     NORMAN.SPOOFED.GROUP_PRINCIPAL,
-    ROLES_VIRTUAL_TYPE
+    ROLES_VIRTUAL_TYPE,
+    MANAGEMENT.OIDC_CLIENT
   ]);
 
   headers(NORMAN.SPOOFED.GROUP_PRINCIPAL, [

package/config/product/{cis.js → compliance.js}

@@ -1,9 +1,9 @@
 import { DSL } from '@shell/store/type-map';
-import { CIS } from '@shell/config/types';
+import { COMPLIANCE } from '@shell/config/types';
 import { STATE, NAME as NAME_HEADER, AGE } from '@shell/config/table-headers';
 
-export const NAME = 'cis';
-export const CHART_NAME = 'rancher-cis-benchmark';
+export const NAME = 'compliance';
+export const CHART_NAME = 'rancher-compliance';
 
 export function init(store) {
   const {
@@ -14,24 +14,21 @@ export function init(store) {
     headers
   } = DSL(store, NAME);
 
-  product({
-    ifHaveGroup: /^(.*\.)*cis\.cattle\.io$/,
-    icon:        'cis',
-  });
+  product({ ifHaveGroup: /^(.*\.)*compliance\.cattle\.io$/ });
 
-  weightType(CIS.CLUSTER_SCAN, 3, true);
-  weightType(CIS.CLUSTER_SCAN_PROFILE, 2, true);
-  weightType(CIS.BENCHMARK, 1, true);
+  weightType(COMPLIANCE.CLUSTER_SCAN, 3, true);
+  weightType(COMPLIANCE.CLUSTER_SCAN_PROFILE, 2, true);
+  weightType(COMPLIANCE.BENCHMARK, 1, true);
 
   basicType([
-    'cis.cattle.io.clusterscan',
-    'cis.cattle.io.clusterscanprofile',
-    'cis.cattle.io.clusterscanbenchmark',
+    'compliance.cattle.io.clusterscan',
+    'compliance.cattle.io.clusterscanprofile',
+    'compliance.cattle.io.clusterscanbenchmark',
   ]);
 
-  configureType(CIS.CLUSTER_SCAN, { canYaml: false, showAge: false });
+  configureType(COMPLIANCE.CLUSTER_SCAN, { canYaml: false, showAge: false });
 
-  headers(CIS.CLUSTER_SCAN, [
+  headers(COMPLIANCE.CLUSTER_SCAN, [
     STATE,
     NAME_HEADER,
     {
@@ -44,7 +41,7 @@ export function init(store) {
     },
     {
       name:      'total',
-      labelKey:  'cis.scan.total',
+      labelKey:  'compliance.scan.total',
       value:     'status.summary.total',
       formatter: 'ScanResult'
 
@@ -52,34 +49,34 @@ export function init(store) {
     {
       name:      'pass',
       value:     'status.summary.pass',
-      labelKey:  'cis.scan.pass',
+      labelKey:  'compliance.scan.pass',
       formatter: 'ScanResult'
 
     },
     {
       name:      'fail',
-      labelKey:  'cis.scan.fail',
+      labelKey:  'compliance.scan.fail',
       value:     'status.summary.fail',
       formatter: 'ScanResult'
 
     },
     {
       name:      'warn',
-      labelKey:  'cis.scan.warn',
+      labelKey:  'compliance.scan.warn',
       value:     'status.summary.warn',
       formatter: 'ScanResult'
 
     },
     {
       name:      'skip',
-      labelKey:  'cis.scan.skip',
+      labelKey:  'compliance.scan.skip',
       value:     'status.summary.skip',
       formatter: 'ScanResult'
 
     },
     {
       name:      'notApplicable',
-      labelKey:  'cis.scan.notApplicable',
+      labelKey:  'compliance.scan.notApplicable',
       value:     'status.summary.notApplicable',
       formatter: 'ScanResult'
 
@@ -107,12 +104,12 @@ export function init(store) {
     },
   ]);
 
-  headers(CIS.CLUSTER_SCAN_PROFILE, [
+  headers(COMPLIANCE.CLUSTER_SCAN_PROFILE, [
     STATE,
     NAME_HEADER,
     {
       name:          'benchmarkVersion',
-      labelKey:      'cis.benchmarkVersion',
+      labelKey:      'compliance.benchmarkVersion',
       value:         'spec.benchmarkVersion',
       formatter:     'Link',
       formatterOpts: { options: { internal: true }, urlKey: 'benchmarkVersionLink' },
@@ -120,18 +117,18 @@ export function init(store) {
     },
     {
       name:     'skippedTests',
-      labelKey: 'cis.testsSkipped',
+      labelKey: 'compliance.testsSkipped',
       value:    'numberTestsSkipped',
       sort:     ['numberTestsSkipped']
     }
   ]);
 
-  headers(CIS.BENCHMARK, [
+  headers(COMPLIANCE.BENCHMARK, [
     STATE,
     NAME_HEADER,
     {
       name:     'clusterProvider',
-      labelKey: 'cis.clusterProvider',
+      labelKey: 'compliance.clusterProvider',
       value:    'spec.clusterProvider',
     },
     {

package/config/product/explorer.js

@@ -106,6 +106,10 @@ export function init(store) {
     POD,
   ], 'workload');
 
+  setGroupDefaultType('workload', () => {
+    return store.getters['features/get'](STEVE_CACHE) ? WORKLOAD_TYPES.DEPLOYMENT : undefined;
+  });
+
   weightGroup('cluster', 99, true);
   weightGroup('workload', 98, true);
   weightGroup('serviceDiscovery', 96, true);
@@ -160,7 +164,7 @@ export function init(store) {
   mapGroup(/^(.*\.)?(k3s)\.cattle\.io$/, 'K3s');
   mapGroup(/^(.*\.)?(helm)\.cattle\.io$/, 'Helm');
   mapGroup(/^(.*\.)?upgrade\.cattle\.io$/, 'Upgrade Controller');
-  mapGroup(/^(.*\.)?cis\.cattle\.io$/, 'CIS');
+  mapGroup(/^(.*\.)?compliance\.cattle\.io$/, 'Compliance');
   mapGroup(/^(.*\.)?traefik\.containo\.us$/, 'Træfik');
   mapGroup(/^(catalog|management|project|ui)\.cattle\.io$/, 'Rancher');
   mapGroup(/^(.*\.)?istio\.io$/, 'Istio');

package/config/product/fleet.js

@@ -1,10 +1,16 @@
 import { DSL } from '@shell/store/type-map';
 import { FLEET } from '@shell/config/types';
-import { STATE, NAME as NAME_COL, AGE } from '@shell/config/table-headers';
+import { STATE, NAME as NAME_COL, AGE, FLEET_APPLICATION_TYPE } from '@shell/config/table-headers';
 import { FLEET as FLEET_FEATURE } from '@shell/store/features';
-import { gitRepoGraphConfig } from '@shell/pages/c/_cluster/fleet/GitRepoGraphConfig';
+import { graphConfig } from '@shell/pages/c/_cluster/fleet/graph/config';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 
+export const SOURCE_TYPE = {
+  REPO:    'repo',
+  OCI:     'oci',
+  TARBALL: 'tarball',
+};
+
 export const NAME = 'fleet';
 export const CHART_NAME = 'fleet';
 
@@ -20,7 +26,7 @@ export function init(store) {
   } = DSL(store, NAME);
 
   product({
-    ifHaveType:            FLEET.GIT_REPO,
+    ifHaveType:            new RegExp(`${ FLEET.GIT_REPO }|${ FLEET.HELM_OP }`, 'i'),
     ifFeature:             FLEET_FEATURE,
     icon:                  'fleet',
     inStore:               'management',
@@ -39,7 +45,7 @@ export function init(store) {
     group:      'Root',
     namespaced: false,
     name:       FLEET.DASHBOARD,
-    weight:     110,
+    weight:     112,
     route:      {
       name:   'c-cluster-fleet',
       params: { resource: FLEET.DASHBOARD, cluster: BLANK_CLUSTER }
@@ -47,30 +53,58 @@ export function init(store) {
     exact: true,
   });
 
+  virtualType({
+    labelKey:   'fleet.application.menuLabel',
+    group:      'Root',
+    namespaced: true,
+    name:       FLEET.APPLICATION,
+    weight:     111,
+    route:      {
+      name:   'c-cluster-fleet-application',
+      params: { resource: FLEET.APPLICATION, cluster: BLANK_CLUSTER }
+    },
+    exact: false,
+  });
+
+  configureType(FLEET.APPLICATION, {
+    subTypes: [
+      FLEET.GIT_REPO,
+      FLEET.HELM_OP
+    ],
+    location: {
+      name:   'c-cluster-fleet-application',
+      params: { resource: FLEET.APPLICATION, cluster: BLANK_CLUSTER }
+    },
+    listGroups: [
+      {
+        icon:       'icon-list-flat',
+        value:      'none',
+        tooltipKey: 'resourceTable.groupBy.none',
+      },
+      {
+        icon:       'icon-repository',
+        value:      'kind',
+        field:      'kind',
+        tooltipKey: 'fleet.application.groupBy',
+        hideColumn: FLEET_APPLICATION_TYPE.name,
+      }
+    ],
+    listGroupsWillOverride: true,
+  });
+
   basicType([
     FLEET.DASHBOARD,
+    FLEET.APPLICATION,
     FLEET.CLUSTER,
     FLEET.CLUSTER_GROUP,
-    FLEET.GIT_REPO,
+    FLEET.WORKSPACE,
   ]);
 
   configureType(FLEET.CLUSTER, { isCreatable: false });
-  configureType(FLEET.GIT_REPO, {
-    showListMasthead: false, hasGraph: true, graphConfig: gitRepoGraphConfig
-  });
 
-  weightType(FLEET.GIT_REPO, 109, true);
   weightType(FLEET.CLUSTER, 108, true);
   weightType(FLEET.CLUSTER_GROUP, 107, true);
 
-  basicType([
-    FLEET.WORKSPACE,
-    FLEET.BUNDLE,
-    FLEET.TOKEN,
-    FLEET.BUNDLE_NAMESPACE_MAPPING,
-    FLEET.GIT_REPO_RESTRICTION
-  ], 'advanced');
-
   headers(FLEET.WORKSPACE, [
     STATE,
     NAME_COL,
@@ -81,6 +115,13 @@ export function init(store) {
       sort:      'counts.gitRepos',
       formatter: 'Number',
     },
+    {
+      name:      'helmOps',
+      labelKey:  'tableHeaders.helmOps',
+      value:     'counts.helmOps',
+      sort:      'counts.helmOps',
+      formatter: 'Number',
+    },
     {
       name:      'clusters',
       labelKey:  'tableHeaders.clusters',
@@ -97,4 +138,23 @@ export function init(store) {
     },
     AGE
   ]);
+
+  basicType([
+    FLEET.GIT_REPO,
+    FLEET.HELM_OP,
+    FLEET.BUNDLE,
+    FLEET.TOKEN,
+    FLEET.BUNDLE_NAMESPACE_MAPPING,
+    FLEET.GIT_REPO_RESTRICTION
+  ], 'resources');
+
+  configureType(FLEET.GIT_REPO, {
+    showListMasthead: false, hasGraph: true, graphConfig
+  });
+  configureType(FLEET.HELM_OP, {
+    showListMasthead: false, hasGraph: true, graphConfig
+  });
+
+  weightType(FLEET.GIT_REPO, 110, true);
+  weightType(FLEET.HELM_OP, 109, true);
 }

package/config/product/settings.js

@@ -1,5 +1,5 @@
 import { DSL } from '@shell/store/type-map';
-import { MANAGEMENT, HELM } from '@shell/config/types';
+import { FLEET, MANAGEMENT, HELM } from '@shell/config/types';
 import {
   STATE,
   FEATURE_DESCRIPTION,
@@ -35,7 +35,7 @@ export function init(store) {
     labelKey:   'advancedSettings.label',
     name:       'settings',
     namespaced: false,
-    weight:     100,
+    weight:     101,
     icon:       'folder',
     route:      {
       name:   'c-cluster-product-resource',
@@ -51,7 +51,7 @@ export function init(store) {
     labelKey:   'featureFlags.label',
     name:       'features',
     namespaced: false,
-    weight:     99,
+    weight:     100,
     icon:       'folder',
     route:      {
       name:   'c-cluster-product-resource',
@@ -64,22 +64,22 @@ export function init(store) {
 
   virtualType({
     ifHaveType: MANAGEMENT.SETTING,
-    labelKey:   'branding.label',
-    name:       'brand',
+    labelKey:   'banner.settingName',
+    name:       'banners',
     namespaced: false,
-    weight:     98,
+    weight:     99,
     icon:       'folder',
-    route:      { name: 'c-cluster-settings-brand' }
+    route:      { name: 'c-cluster-settings-banners' }
   });
 
   virtualType({
     ifHaveType: MANAGEMENT.SETTING,
-    labelKey:   'banner.settingName',
-    name:       'banners',
+    labelKey:   'branding.label',
+    name:       'brand',
     namespaced: false,
     weight:     98,
     icon:       'folder',
-    route:      { name: 'c-cluster-settings-banners' }
+    route:      { name: 'c-cluster-settings-brand' }
   });
 
   virtualType({
@@ -102,13 +102,24 @@ export function init(store) {
     route:      { name: 'c-cluster-settings-links' }
   });
 
+  virtualType({
+    ifHaveType: FLEET.GIT_REPO,
+    labelKey:   'fleet.settings.label',
+    name:       'fleet-settings',
+    namespaced: false,
+    weight:     95,
+    icon:       'folder',
+    route:      { name: 'c-cluster-settings-fleet' }
+  });
+
   basicType([
     'settings',
     'features',
     'brand',
     'banners',
     'performance',
-    'links'
+    'links',
+    'fleet-settings'
   ]);
 
   configureType(MANAGEMENT.SETTING, {

package/config/query-params.js

@@ -36,6 +36,7 @@ export const _LIST = 'list';
 export const _CLONE = 'clone';
 export const _STAGE = 'stage';
 export const _IMPORT = 'import';
+export const LEGACY = 'legacy';
 
 export const AS = 'as';
 export const _DETAIL = 'detail';
@@ -63,7 +64,8 @@ export const NAME = 'name';
 export const NAMESPACE = 'namespace';
 export const DESCRIPTION = 'description';
 export const CATEGORY = 'category';
-export const OPERATING_SYSTEM = 'os';
+export const TAG = 'tag';
+export const STATUS = 'status';
 export const DEPRECATED = 'deprecated';
 export const HIDDEN = 'hidden';
 export const FROM_TOOLS = 'tools';
@@ -77,3 +79,6 @@ export const CLOUD_CREDENTIAL = 'cloud';
 // NAMESPACE/PROJECT
 export const PROJECT_ID = 'projectId';
 export const FLAT_VIEW = 'flatView';
+
+// RANCHER OIDC CLIENT
+export const RANCHER_AS_OIDC_QUERY_PARAMS = ['scope', 'client_id', 'redirect_uri', 'response_type'];

package/config/roles.ts

@@ -57,6 +57,7 @@ export const SCOPED_RESOURCES = {
         'Contents',
         'GitRepos',
         'GitRepoRestrictions',
+        'HelmOps',
       ],
     },
     'gitjob.cattle.io': {
@@ -263,7 +264,7 @@ export const SCOPED_RESOURCES = {
         'Jobs',
       ]
     },
-    'cis.cattle.io': {
+    'compliance.cattle.io': {
       resources: [
         'ClusterScans',
         'ClusterScanReports'

package/config/router/navigation-guards/authentication.js

@@ -1,12 +1,58 @@
 import { routeRequiresAuthentication } from '@shell/utils/router';
 import { isLoggedIn, notLoggedIn, noAuth, findMe } from '@shell/utils/auth';
+import { RANCHER_AS_OIDC_QUERY_PARAMS } from '@shell/config/query-params';
+
+const R_OIDC_PROV_PARAMS = 'rancher-as-oidc-prov-params';
+
+/**
+ * Detect if we've come from an OIDC client
+ */
+function isRancherOidcProviderLogin(queryParams) {
+  return queryParams && Object.keys(queryParams).length && RANCHER_AS_OIDC_QUERY_PARAMS.every((item) => Object.keys(queryParams).includes(item));
+}
+
+/**
+ * If we've logged in on a request from an OIDC client return to it
+ */
+function handleOidcRedirectToCallbackUrl() {
+  const rancherAsOidcProvider = sessionStorage.getItem(R_OIDC_PROV_PARAMS);
+
+  if (rancherAsOidcProvider) {
+    window.location.href = `${ window.location.origin }/oidc/authorize${ rancherAsOidcProvider }&code_challenge_method=S256`;
+    sessionStorage.removeItem(R_OIDC_PROV_PARAMS);
+  }
+}
 
 export function install(router, context) {
   router.beforeEach(async(to, from, next) => await authenticate(to, from, next, context));
 }
 
+/**
+ * Generate an object that includes both the v3User and the me data
+ * @param {*} v3User V3 user information
+ * @param {*} me Me user data
+ * @returns User info to be passed to `isLoggedIn`
+ */
+function getUserObject(v3User, me) {
+  return {
+    id: me.id,
+    me,
+    v3User,
+  };
+}
+
 export async function authenticate(to, from, next, { store }) {
   if (!routeRequiresAuthentication(to)) {
+    if (to.name === 'auth-login') {
+      if (isRancherOidcProviderLogin(to.query)) {
+        // If redirected here from an oidc client persist the values we need to return to it once rancher auth is complete...
+        sessionStorage.setItem(R_OIDC_PROV_PARAMS, window.location.search);
+      } else if (sessionStorage.getItem(R_OIDC_PROV_PARAMS)) {
+        // ... otherwise clear it (to avoid a redirect to it on successful log in)
+        sessionStorage.removeItem(R_OIDC_PROV_PARAMS);
+      }
+    }
+
     return next();
   }
 
@@ -25,10 +71,12 @@ export async function authenticate(to, from, next, { store }) {
 
     if ( fromHeader === 'none' ) {
       noAuth(store);
+      handleOidcRedirectToCallbackUrl();
     } else if ( fromHeader === 'true' ) {
       const me = await findMe(store);
 
-      isLoggedIn(store, me);
+      await isLoggedIn(store, getUserObject(v3User, me));
+      handleOidcRedirectToCallbackUrl();
     } else if ( fromHeader === 'false' ) {
       notLoggedIn(store, next, to);
 
@@ -38,7 +86,8 @@ export async function authenticate(to, from, next, { store }) {
       try {
         const me = await findMe(store);
 
-        isLoggedIn(store, me);
+        await isLoggedIn(store, getUserObject(v3User, me));
+        handleOidcRedirectToCallbackUrl();
       } catch (e) {
         const status = e?._status;