@rancher/shell 0.2.5 → 0.3.1

package/edit/auth/azuread.vue

@@ -76,8 +76,8 @@ export default {
 
   data() {
     return {
-      endpoint:          'standard',
-      oldEndpoint:        false,
+      endpoint:    'standard',
+      oldEndpoint: false,
 
       // Storing the applicationSecret is necessary because norman doesn't support returning secrets and when we
       // override the steve authconfig with a norman config the applicationSecret is lost
@@ -219,8 +219,8 @@ export default {
 
     promptUpdate() {
       this.$store.dispatch('management/promptModal', {
-        component: 'GenericPrompt',
-        resources: [this.modalConfig]
+        component:      'GenericPrompt',
+        componentProps: this.modalConfig
       });
     },
 
@@ -267,10 +267,10 @@ export default {
       @cancel="cancel"
     >
       <template v-if="model.enabled && !isEnabling && !editConfig">
-        <AuthBanner
-          :t-args="tArgs"
-          :disable="disable"
-          :edit="goToEdit"
+        <AuthBanner
+          :t-args="tArgs"
+          :disable="disable"
+          :edit="goToEdit"
         >
           <template slot="rows">
             <tr>
@@ -298,9 +298,9 @@ export default {
               <td>{{ model.authEndpoint }}</td>
             </tr>
           </template>
-          <template
-            v-if="needsUpdate"
-            slot="actions"
+          <template
+            v-if="needsUpdate"
+            slot="actions"
           >
             <button
               type="button"
@@ -328,17 +328,17 @@ export default {
           color="warning"
         />
 
-        <InfoBox
-          v-if="!model.enabled"
-          id="reply-info"
-          class="mt-20 mb-20 p-10"
+        <InfoBox
+          v-if="!model.enabled"
+          id="reply-info"
+          class="mt-20 mb-20 p-10"
         >
           {{ t('authConfig.azuread.reply.info') }}
           <br>
           <label class="reply-url">{{ t('authConfig.azuread.reply.label') }} </label>
-          <CopyToClipboardText
-            :plain="true"
-            :text="replyUrl"
+          <CopyToClipboardText
+            :plain="true"
+            :text="replyUrl"
           />
         </InfoBox>
 

package/edit/auth/github.vue

@@ -39,8 +39,8 @@ export default {
 
   data() {
     return {
-      targetType:    'public',
-      targetUrl:     null,
+      targetType: 'public',
+      targetUrl:  null,
     };
   },
 
@@ -269,4 +269,12 @@ export default {
   .step-list li:not(:last-child) {
     margin-bottom: 8px;
   }
+  .banner {
+    display: block;
+
+    &::v-deep code {
+      padding: 0 3px;
+      margin: 0 3px;
+    }
+  }
 </style>

package/edit/auth/googleoauth.vue

@@ -246,7 +246,7 @@ export default {
           v-if="!model.enabled"
           class="row"
         >
-          <div class="col span-12">
+          <div class="col span-12 google">
             <Banner
               color="info"
               v-html="t('authConfig.associatedWarning', tArgs, true)"
@@ -261,4 +261,13 @@ export default {
   .step-list li:not(:last-child) {
     margin-bottom: 8px;
   }
+
+  .banner {
+    display: block;
+
+    &::v-deep code {
+      padding: 0 3px;
+      margin: 0 3px;
+    }
+  }
 </style>

package/edit/auth/ldap/index.vue

@@ -28,16 +28,16 @@ export default {
 
   data() {
     return {
-      username:      null,
-      password:      null
+      username: null,
+      password: null
     };
   },
 
   computed: {
     tArgs() {
       return {
-        provider:  this.displayName,
-        username:  this.principal.loginName || this.principal.name,
+        provider: this.displayName,
+        username: this.principal.loginName || this.principal.name,
       };
     },
 
@@ -156,3 +156,13 @@ export default {
     </CruResource>
   </div>
 </template>
+<style lang="scss" scoped>
+  .banner {
+    display: block;
+
+    &::v-deep code {
+      padding: 0 3px;
+      margin: 0 3px;
+    }
+  }
+</style>

package/edit/auth/oidc.vue

@@ -46,9 +46,9 @@ export default {
   computed: {
     tArgs() {
       return {
-        baseUrl:   this.serverSetting,
-        provider:  this.displayName,
-        username:  this.principal.loginName || this.principal.name,
+        baseUrl:  this.serverSetting,
+        provider: this.displayName,
+        username: this.principal.loginName || this.principal.name,
       };
     },
 
@@ -285,3 +285,13 @@ export default {
     </CruResource>
   </div>
 </template>
+<style lang="scss" scoped>
+  .banner {
+    display: block;
+
+    &::v-deep code {
+      padding: 0 3px;
+      margin: 0 3px;
+    }
+  }
+</style>

package/edit/auth/saml.vue

@@ -32,9 +32,9 @@ export default {
   computed: {
     tArgs() {
       return {
-        baseUrl:   this.serverSetting,
-        provider:  this.displayName,
-        username:  this.principal.loginName || this.principal.name,
+        baseUrl:  this.serverSetting,
+        provider: this.displayName,
+        username: this.principal.loginName || this.principal.name,
       };
     },
 
@@ -59,7 +59,7 @@ export default {
           servers:                      [],
           starttls:                     false,
           tls:                          false,
-          disabledStatusBitmask:          0,
+          disabledStatusBitmask:        0,
           userLoginAttribute:           'uid',
           userMemberAttribute:          'memberOf',
           userNameAttribute:            'cn',
@@ -265,3 +265,13 @@ export default {
     </CruResource>
   </div>
 </template>
+<style lang="scss" scoped>
+  .banner {
+    display: block;
+
+    &::v-deep code {
+      padding: 0 3px;
+      margin: 0 3px;
+    }
+  }
+</style>

package/edit/autoscaling.horizontalpodautoscaler/external-metric.vue

@@ -12,8 +12,8 @@ export const DEFAULT_EXTERNAL_METRIC = {
     },
   },
   target: {
-    type:               'AverageValue',
-    averageValue:       '80',
+    type:         'AverageValue',
+    averageValue: '80',
   },
 };
 

package/edit/autoscaling.horizontalpodautoscaler/index.vue

@@ -228,7 +228,7 @@ export default {
                 class="btn role-link close btn-sm"
                 @click="removeProps.remove"
               >
-                <i class="icon icon-2x icon-x" />
+                <i class="icon icon-x" />
               </button>
               <span v-else />
             </template>

package/edit/autoscaling.horizontalpodautoscaler/metric-object-reference.vue

@@ -3,7 +3,7 @@ import { LabeledInput } from '@components/Form/LabeledInput';
 export default {
   components: { LabeledInput },
 
-  props:      {
+  props: {
     value: {
       type:    Object,
       default: () => ({

package/edit/autoscaling.horizontalpodautoscaler/object-metric.vue

@@ -13,8 +13,8 @@ export const DEFAULT_OBJECT_METRIC = {
     },
   },
   target: {
-    type:               'AverageValue',
-    averageValue:       '80',
+    type:         'AverageValue',
+    averageValue: '80',
   },
   describedObject: {
     apiVersion: '',

package/edit/autoscaling.horizontalpodautoscaler/pod-metric.vue

@@ -12,8 +12,8 @@ export const DEFAULT_POD_METRIC = {
     },
   },
   target: {
-    type:               'AverageValue',
-    averageValue:       '80',
+    type:         'AverageValue',
+    averageValue: '80',
   },
 };
 

package/edit/cis.cattle.io.clusterscan.vue

@@ -39,8 +39,8 @@ export default {
 
   async fetch() {
     const hash = await allHash({
-      profiles:         this.$store.dispatch('cluster/findAll', { type: CIS.CLUSTER_SCAN_PROFILE }),
-      benchmarks:       this.$store.dispatch('cluster/findAll', { type: CIS.BENCHMARK }),
+      profiles:   this.$store.dispatch('cluster/findAll', { type: CIS.CLUSTER_SCAN_PROFILE }),
+      benchmarks: this.$store.dispatch('cluster/findAll', { type: CIS.BENCHMARK }),
     });
 
     try {

package/edit/cloudcredential.vue

@@ -10,7 +10,6 @@ import Labels from '@shell/components/form/Labels';
 import { HIDE_SENSITIVE } from '@shell/store/prefs';
 import { CAPI } from '@shell/config/labels-annotations';
 import { clear, uniq } from '@shell/utils/array';
-import { importCloudCredential } from '@shell/utils/dynamic-importer';
 import SelectIconGrid from '@shell/components/SelectIconGrid';
 import { sortBy } from '@shell/utils/sort';
 import { ucFirst } from '@shell/utils/string';
@@ -95,14 +94,11 @@ export default {
     },
 
     cloudComponent() {
-      const driver = this.driverName;
-      const haveProviders = this.$store.getters['plugins/credentialDrivers'];
-
-      if ( haveProviders.includes(driver) ) {
-        return importCloudCredential(driver);
+      if (this.$store.getters['type-map/hasCustomCloudCredentialComponent'](this.driverName)) {
+        return this.$store.getters['type-map/importCloudCredential'](this.driverName);
       }
 
-      return importCloudCredential('generic');
+      return this.$store.getters['type-map/importCloudCredential']('generic');
     },
 
     // array of id, label, description, initials for type selection step

package/edit/constraints.gatekeeper.sh.constraint/index.vue

@@ -150,7 +150,7 @@ export default {
     },
     emptyDefaults() {
       return {
-        type:  this.templateOptions[0].value,
+        type: this.templateOptions[0].value,
         spec: this.emptySpec
       };
     },

package/edit/fleet.cattle.io.clustergroup.vue

@@ -100,9 +100,9 @@ export default {
 
       this.matchingClusters = {
         matched,
-        total:   all.length,
-        isAll:   matched === all.length,
-        isNone:  matched === 0,
+        total:  all.length,
+        isAll:  matched === all.length,
+        isNone: matched === 0,
         sample,
       };
     }, 250, { leading: true }),

package/edit/fleet.cattle.io.gitrepo.vue

@@ -89,13 +89,13 @@ export default {
     }
 
     const stepRepoInfo = {
-      name:             'stepRepoInfo',
-      title:            this.t('fleet.gitRepo.add.steps.repoInfo.title'),
-      label:            this.t('fleet.gitRepo.add.steps.repoInfo.label'),
-      subtext:          this.t('fleet.gitRepo.add.steps.repoInfo.subtext'),
-      descriptionKey:   'fleet.gitRepo.add.steps.repoInfo.description',
-      ready:            false,
-      weight:           30
+      name:           'stepRepoInfo',
+      title:          this.t('fleet.gitRepo.add.steps.repoInfo.title'),
+      label:          this.t('fleet.gitRepo.add.steps.repoInfo.label'),
+      subtext:        this.t('fleet.gitRepo.add.steps.repoInfo.subtext'),
+      descriptionKey: 'fleet.gitRepo.add.steps.repoInfo.description',
+      ready:          false,
+      weight:         30
     };
 
     const stepTargetInfo = {
@@ -243,8 +243,8 @@ export default {
     targetClusterGroup:         'updateTargets',
     targetAdvanced:             'updateTargets',
 
-    tlsMode:    'updateTls',
-    caBundle:   'updateTls',
+    tlsMode:  'updateTls',
+    caBundle: 'updateTls',
 
     workspace(neu) {
       if ( this.isCreate ) {

package/edit/group.principal.vue

@@ -13,11 +13,11 @@ export default {
   mixins: [CreateEditView],
   data() {
     return {
-      errors:       [],
+      errors: [],
       valid:  false,
     };
   },
-  methods:  {
+  methods: {
     async save(buttonDone) {
       this.errors = [];
 

package/edit/helm.cattle.io.projecthelmchart.vue

@@ -49,9 +49,9 @@ export default {
 
   data() {
     return {
-      systemNamespaces:       null,
-      namespaces:             [],
-      loading:                true
+      systemNamespaces: null,
+      namespaces:       [],
+      loading:          true
     };
   },
 

package/edit/logging-flow/Match.vue

@@ -27,6 +27,16 @@ export default {
       type:    Array,
       default: () => [],
     },
+
+    namespaces: {
+      type:    Array,
+      default: () => [],
+    },
+
+    isClusterFlow: {
+      type:    Boolean,
+      default: false
+    }
   },
 
   methods: {
@@ -43,19 +53,19 @@ export default {
   <div>
     <KeyValue
       v-model="value.labels"
-      :title="value.select ? 'Include Pods' : 'Exclude Pods'"
+      :title="value.select ? t('logging.flow.matches.pods.title.include') : t('logging.flow.matches.pods.title.exclude')"
       :mode="mode"
       :initial-empty-row="true"
       :read-allowed="false"
       :title-add="true"
       protip=""
-      key-label="Pod Label Key"
-      value-label="Pod Label Value"
-      add-label="Add Pod"
+      :key-label="t('logging.flow.matches.pods.keyLabel')"
+      :value-label="t('logging.flow.matches.pods.valueLabel')"
+      :add-label="t('logging.flow.matches.pods.addLabel')"
     />
     <div class="spacer" />
     <h3>
-      Limit to specific nodes
+      {{ value.select ? t('logging.flow.matches.nodes.title.include') : t('logging.flow.matches.nodes.title.exclude') }}
     </h3>
     <div class="row">
       <div class="col span-12">
@@ -63,7 +73,7 @@ export default {
           v-model="value.hosts"
           class="lg"
           :options="nodes"
-          placeholder="Default: Any node"
+          :placeholder="t('logging.flow.matches.nodes.placeholder')"
           :multiple="true"
           :searchable="true"
           :taggable="true"
@@ -75,7 +85,7 @@ export default {
     </div>
     <div class="spacer" />
     <h3>
-      Limit to specific container names
+      {{ value.select ? t('logging.flow.matches.containerNames.title.include') : t('logging.flow.matches.containerNames.title.exclude') }}
     </h3>
     <div class="row">
       <div class="col span-12">
@@ -83,7 +93,7 @@ export default {
           v-model="value.container_names"
           class="lg"
           :options="containers"
-          placeholder="Default: Any container"
+          :placeholder="t('logging.flow.matches.containerNames.placeholder')"
           :multiple="true"
           :taggable="true"
           :clearable="true"
@@ -92,5 +102,26 @@ export default {
         />
       </div>
     </div>
+    <div v-if="isClusterFlow">
+      <div class="spacer" />
+      <h3>
+        {{ value.select ? t('logging.flow.matches.namespaces.title.include') : t('logging.flow.matches.namespaces.title.exclude') }}
+      </h3>
+      <div class="row">
+        <div class="col span-12">
+          <Select
+            v-model="value.namespaces"
+            class="lg"
+            :options="namespaces"
+            :placeholder="t('logging.flow.matches.namespaces.placeholder')"
+            :multiple="true"
+            :taggable="true"
+            :clearable="true"
+            :close-on-select="false"
+            placement="top"
+          />
+        </div>
+      </div>
+    </div>
   </div>
 </template>

package/edit/logging-flow/index.vue

@@ -6,7 +6,9 @@ import Loading from '@shell/components/Loading';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
 import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
-import { LOGGING, NODE, POD, SCHEMA } from '@shell/config/types';
+import {
+  LOGGING, NAMESPACE, NODE, POD, SCHEMA
+} from '@shell/config/types';
 import jsyaml from 'js-yaml';
 import { createYaml } from '@shell/utils/create-yaml';
 import YamlEditor, { EDITOR_MODES } from '@shell/components/YamlEditor';
@@ -51,6 +53,7 @@ export default {
   async fetch() {
     const hasAccessToClusterOutputs = this.$store.getters[`cluster/schemaFor`](LOGGING.CLUSTER_OUTPUT);
     const hasAccessToOutputs = this.$store.getters[`cluster/schemaFor`](LOGGING.OUTPUT);
+    const hasAccessToNamespaces = this.$store.getters[`cluster/schemaFor`](NAMESPACE);
     const hasAccessToNodes = this.$store.getters[`cluster/schemaFor`](NODE);
     const hasAccessToPods = this.$store.getters[`cluster/schemaFor`](POD);
     const isFlow = this.value.type === LOGGING.FLOW;
@@ -62,6 +65,7 @@ export default {
     const hash = await allHash({
       allOutputs:        getAllOrDefault(LOGGING.OUTPUT, isFlow && hasAccessToOutputs),
       allClusterOutputs: getAllOrDefault(LOGGING.CLUSTER_OUTPUT, hasAccessToClusterOutputs),
+      allNamespaces:     getAllOrDefault(NAMESPACE, hasAccessToNamespaces),
       allNodes:          getAllOrDefault(NODE, hasAccessToNodes),
       allPods:           getAllOrDefault(POD, hasAccessToPods),
     });
@@ -113,10 +117,11 @@ export default {
       matches,
       allOutputs:         null,
       allClusterOutputs:  null,
+      allNamespaces:      null,
       allNodes:           null,
       allPods:            null,
       filtersYaml,
-      initialFiltersYaml:   filtersYaml,
+      initialFiltersYaml: filtersYaml,
       globalOutputRefs,
       localOutputRefs
     };
@@ -166,6 +171,22 @@ export default {
         });
     },
 
+    namespaceChoices() {
+      if (!this.allNamespaces) {
+        // Handle the case where the user doesn't have permission
+        // to see namespaces
+        return [];
+      }
+      const out = this.allNamespaces.map((namespace) => {
+        return {
+          label: namespace.nameDisplay,
+          value: namespace.metadata.name
+        };
+      });
+
+      return out;
+    },
+
     nodeChoices() {
       if (!this.allNodes) {
         // Handle the case where the user doesn't have permission
@@ -349,7 +370,7 @@ export default {
         <Banner
           color="info"
           class="mt-0"
-          label="Configure which container logs will be pulled from"
+          :label="t('logging.flow.matches.banner')"
         />
         <ArrayListGrouped
           v-model="matches"
@@ -362,8 +383,10 @@ export default {
               class="rule mb-20"
               :value="props.row.value"
               :mode="mode"
+              :namespaces="namespaceChoices"
               :nodes="nodeChoices"
               :containers="containerChoices"
+              :is-cluster-flow="value.type === LOGGING.CLUSTER_FLOW"
               @remove="e=>removeMatch(props.row.i)"
               @input="e=>updateMatch(e,props.row.i)"
             />
@@ -394,7 +417,7 @@ export default {
       >
         <Banner
           v-if="value.type !== LOGGING.CLUSTER_FLOW"
-          label="Output must reside in same namespace as the flow."
+          :label="t('logging.flow.outputs.sameNamespaceError')"
           color="info"
         />
         <LabeledSelect
@@ -457,7 +480,7 @@ export default {
   </CruResource>
   <Banner
     v-else
-    label="This resource contains a match configuration that the form editor does not support.  Please use YAML edit."
+    :label="t('logging.flow.matches.unsupportedConfig')"
     color="error"
   />
 </template>

package/edit/logging.banzaicloud.io.output/providers/datadog.vue

@@ -7,7 +7,7 @@ export default {
   components: {
     Checkbox, LabeledInput, SecretSelector
   },
-  props:      {
+  props: {
     value: {
       type:    Object,
       default: () => {

package/edit/logging.banzaicloud.io.output/providers/elasticsearch.vue

@@ -10,7 +10,7 @@ export default {
   components: {
     LabeledInput, LabeledSelect, SecretSelector, Checkbox
   },
-  props:      {
+  props: {
     value: {
       type:    Object,
       default: () => {

package/edit/logging.banzaicloud.io.output/providers/gcs.vue

@@ -7,7 +7,7 @@ export default {
   components: {
     Checkbox, LabeledInput, SecretSelector
   },
-  props:      {
+  props: {
     value: {
       type:    Object,
       default: () => {

package/edit/logging.banzaicloud.io.output/providers/gelf.vue

@@ -7,7 +7,7 @@ export default {
   components: {
     Checkbox, LabeledInput, LabeledSelect
   },
-  props:      {
+  props: {
     value: {
       type:    Object,
       default: () => {

package/edit/logging.banzaicloud.io.output/providers/kafka.vue

@@ -8,7 +8,7 @@ export default {
   components: {
     Checkbox, LabeledInput, SecretSelector
   },
-  props:      {
+  props: {
     value: {
       type:    Object,
       default: () => {

package/edit/logging.banzaicloud.io.output/providers/logz.vue

@@ -8,7 +8,7 @@ export default {
   components: {
     Checkbox, LabeledInput, SecretSelector
   },
-  props:      {
+  props: {
     value: {
       type:    Object,
       default: () => {

package/edit/logging.banzaicloud.io.output/providers/loki.vue

@@ -7,7 +7,7 @@ export default {
   components: {
     Checkbox, LabeledInput, SecretSelector
   },
-  props:      {
+  props: {
     value: {
       type:    Object,
       default: () => {