@rancher/shell 0.2.5 → 0.3.1

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

@@ -0,0 +1,213 @@
+<script>
+import { LabeledInput } from '@components/Form/LabeledInput';
+import LabeledSelect from '@shell/components/form/LabeledSelect';
+import SecretSelector from '@shell/components/form/SecretSelector';
+import { Checkbox } from '@components/Form/Checkbox';
+import { _CREATE } from '@shell/config/query-params';
+import { updatePort, protocol, sslVersions } from './utils';
+
+export default {
+  components: {
+    LabeledInput, LabeledSelect, SecretSelector, Checkbox
+  },
+  props: {
+    value: {
+      type:    Object,
+      default: () => {
+        return {};
+      }
+    },
+    disabled: {
+      type:    Boolean,
+      default: false
+    },
+    mode: {
+      type:     String,
+      required: true,
+    },
+    namespace: {
+      type:     String,
+      required: true
+    }
+  },
+  data() {
+    if (this.mode === _CREATE) {
+      // Set default values only if no values are already
+      // present. This allows changes to default values to persist
+      // after navigating to YAML and back.
+
+      // Require SSL verification by default
+      if (typeof this.value.ssl_verify === 'undefined') {
+        this.$set(this.value, 'ssl_verify', true);
+      }
+
+      // Use the SSL version TLSv1_2 by default to match Ember
+      if (typeof this.value.ssl_version === 'undefined') {
+        this.$set(this.value, 'ssl_version', sslVersions[0]);
+      }
+    }
+
+    return { protocolOptions: protocol, sslVersions };
+  },
+  computed: {
+    port: {
+      get() {
+        return this.value.port;
+      },
+      set(port) {
+        updatePort(value => this.$set(this.value, 'port', value), port);
+      }
+    }
+  }
+};
+</script>
+
+<template>
+  <div class="opensearch">
+    <div class="row">
+      <div class="col span-6">
+        <h3>{{ t('logging.output.sections.target') }}</h3>
+      </div>
+    </div>
+    <div class="row mb-10">
+      <div class="col span-2">
+        <LabeledSelect
+          v-model="value.scheme"
+          :mode="mode"
+          :disabled="disabled"
+          class="scheme"
+          :options="protocolOptions"
+          :label="t('logging.elasticsearch.scheme')"
+        />
+      </div>
+      <div class="col span-8">
+        <LabeledInput
+          v-model="value.host"
+          :mode="mode"
+          :disabled="disabled"
+          class="host"
+          :label="t('logging.elasticsearch.host')"
+        />
+      </div>
+      <div class="col span-2">
+        <LabeledInput
+          v-model.number="port"
+          :mode="mode"
+          :disabled="disabled"
+          class="port"
+          type="number"
+          min="1"
+          max="65535"
+          :label="t('logging.elasticsearch.port')"
+        />
+      </div>
+    </div>
+    <div class="row">
+      <div class="col span-6">
+        <LabeledInput
+          v-model="value.index_name"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.elasticsearch.indexName')"
+        />
+      </div>
+    </div>
+    <div class="spacer" />
+    <div class="row">
+      <div class="col span-6">
+        <h3>{{ t('logging.output.sections.access') }}</h3>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col span-6">
+        <LabeledInput
+          v-model="value.user"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.elasticsearch.user')"
+        />
+      </div>
+      <div class="col span-6">
+        <SecretSelector
+          v-model="value.password"
+          :secret-name-label="t('logging.elasticsearch.password')"
+          :mode="mode"
+          :namespace="namespace"
+          :disabled="disabled"
+          :show-key-selector="true"
+        />
+      </div>
+    </div>
+    <div class="spacer" />
+    <div class="row">
+      <div class="col span-6">
+        <h3>{{ t('logging.output.sections.certificate') }}</h3>
+      </div>
+    </div>
+    <div class="row mb-10">
+      <div class="col span-6">
+        <SecretSelector
+          v-model="value.ca_file"
+          mount-key="mountFrom"
+          :mode="mode"
+          :namespace="namespace"
+          :disabled="disabled"
+          :secret-name-label="t('logging.elasticsearch.caFile.label')"
+          :show-key-selector="true"
+        />
+      </div>
+      <div class="col span-6">
+        <SecretSelector
+          v-model="value.client_cert"
+          mount-key="mountFrom"
+          :mode="mode"
+          :namespace="namespace"
+          :disabled="disabled"
+          :secret-name-label="t('logging.elasticsearch.clientCert.label')"
+          :show-key-selector="true"
+        />
+      </div>
+    </div>
+    <div class="row">
+      <div class="col span-6">
+        <SecretSelector
+          v-model="value.client_key"
+          mount-key="mountFrom"
+          :mode="mode"
+          :namespace="namespace"
+          :disabled="disabled"
+          :secret-name-label="t('logging.elasticsearch.clientKey.label')"
+          :show-key-selector="true"
+        />
+      </div>
+      <div class="col span-6">
+        <SecretSelector
+          v-model="value.client_key_pass"
+          :mode="mode"
+          :namespace="namespace"
+          :disabled="disabled"
+          :secret-name-label="t('logging.elasticsearch.clientKeyPass')"
+          :show-key-selector="true"
+        />
+      </div>
+    </div>
+    <div class="row mb-10">
+      <div class="col span-6 vertically-center">
+        <Checkbox
+          v-model="value.ssl_verify"
+          :label="t('logging.elasticsearch.verifySsl')"
+          :disabled="disabled"
+          :mode="mode"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+<style>
+.row {
+  margin-bottom: 5px;
+}
+.vertically-center {
+  padding: 20px 0;
+}
+</style>

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

@@ -0,0 +1,142 @@
+<script>
+import { LabeledInput } from '@components/Form/LabeledInput';
+import SecretSelector from '@shell/components/form/SecretSelector';
+import { updatePort } from './utils';
+import LabeledSelect from '@shell/components/form/LabeledSelect';
+
+export default {
+  components: {
+    LabeledInput, LabeledSelect, SecretSelector
+  },
+  props: {
+    value: {
+      type:    Object,
+      default: () => {
+        return {};
+      }
+    },
+    disabled: {
+      type:    Boolean,
+      default: false
+    },
+    mode: {
+      type:     String,
+      required: true,
+    },
+    namespace: {
+      type:     String,
+      required: true
+    }
+  },
+  data() {
+    const formatTypeOptions = ['json', 'out_file', 'ltsv', 'csv', 'msgpack', 'hash', 'single_value'];
+
+    this.$set(this.value, 'format', this.value.format || { type: formatTypeOptions[0] });
+
+    return { formatTypeOptions };
+  },
+  computed: {
+    port: {
+      get() {
+        return this.value.port;
+      },
+      set(port) {
+        updatePort(value => this.$set(this.value, 'port', value), port);
+      }
+    }
+  }
+};
+</script>
+
+<template>
+  <div class="opensearch">
+    <div class="row">
+      <div class="col span-6">
+        <h3>{{ t('logging.output.sections.target') }}</h3>
+      </div>
+    </div>
+    <div class="row mb-10">
+      <div class="col span-8">
+        <LabeledInput
+          v-model="value.host"
+          :mode="mode"
+          :disabled="disabled"
+          class="host"
+          :label="t('logging.redis.host')"
+        />
+      </div>
+      <div class="col span-2">
+        <LabeledInput
+          v-model.number="port"
+          :mode="mode"
+          :disabled="disabled"
+          class="port"
+          type="number"
+          min="1"
+          max="65535"
+          :label="t('logging.redis.port')"
+        />
+      </div>
+    </div>
+    <div class="row">
+      <div class="col span-6">
+        <LabeledInput
+          v-model.number="value.db_number"
+          :mode="mode"
+          :disabled="disabled"
+          type="number"
+          :label="t('logging.redis.dbNumber')"
+        />
+      </div>
+      <div class="col span-6">
+        <LabeledInput
+          v-model.number="value.ttl"
+          :mode="mode"
+          :disabled="disabled"
+          type="number"
+          :label="t('logging.redis.ttl')"
+        />
+      </div>
+    </div>
+    <div class="spacer" />
+    <div class="row">
+      <div class="col span-6">
+        <h3>{{ t('logging.redis.format.title') }}</h3>
+      </div>
+    </div>
+    <div class="row mb-10">
+      <div class="col span-6">
+        <LabeledSelect
+          v-model="value.format.type"
+          :options="formatTypeOptions"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.redis.format.type')"
+        />
+      </div>
+    </div>
+    <div class="spacer" />
+    <div class="row">
+      <div class="col span-6">
+        <h3>{{ t('logging.output.sections.access') }}</h3>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col span-6">
+        <SecretSelector
+          v-model="value.password"
+          :secret-name-label="t('logging.elasticsearch.password')"
+          :mode="mode"
+          :namespace="namespace"
+          :disabled="disabled"
+          :show-key-selector="true"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+<style>
+.row {
+  margin-bottom: 5px;
+}
+</style>

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

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

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

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

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

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

package/edit/management.cattle.io.fleetworkspace.vue

@@ -33,7 +33,7 @@ export default {
 
   data() {
     return {
-      fleetClusters:      null,
+      fleetClusters:   null,
       rancherClusters: null,
     };
   },

package/edit/management.cattle.io.podsecurityadmissionconfigurationtemplate.vue

@@ -0,0 +1,107 @@
+<script lang="ts">
+import Vue, { PropType, VueConstructor } from 'vue';
+import CreateEditView from '@shell/mixins/create-edit-view';
+import CruResource from '@shell/components/CruResource.vue';
+import PodSecurityAdmission from '@shell/components/PodSecurityAdmission.vue';
+import Loading from '@shell/components/Loading.vue';
+import NameNsDescription from '@shell/components/form/NameNsDescription.vue';
+import { PSA, PSAConfig, PSADefaults, PSAExemptions } from '@shell/types/pod-security-admission';
+import { PSADimensions } from '@shell/config/pod-security-admission';
+import { MANAGEMENT } from '@shell/config/types';
+
+export default (Vue as VueConstructor<Vue & InstanceType<typeof CreateEditView>>).extend({
+  mixins:     [CreateEditView],
+  components: {
+    CruResource,
+    Loading,
+    NameNsDescription,
+    PodSecurityAdmission,
+  },
+
+  async fetch() {
+    await this.$store.dispatch('management/findAll', { type: MANAGEMENT.PSA });
+  },
+
+  props: {
+    value: {
+      type:     Object as PropType<PSA>,
+      required: true,
+      default:  () => ({}) as PSA
+    },
+
+    mode: {
+      type:     String,
+      required: true,
+    }
+  },
+  computed: {
+    /**
+     * Get or initialize exemptions if none
+     */
+    exemptions(): PSAExemptions {
+      return this.value?.configuration?.exemptions || {};
+    },
+
+    /**
+     * Get or initialize defaults labels if none
+     */
+    defaults(): PSADefaults {
+      return this.value?.configuration?.defaults || {};
+    },
+  },
+
+  methods: {
+    /**
+     * Replace exemption with new values
+     */
+    setExemptions(exemptions: PSAExemptions) {
+      this.value.configuration.exemptions = exemptions;
+    },
+
+    /**
+     * Replace defaults with new values
+     */
+    setDefaults(labels: PSADefaults) {
+      this.value.configuration.defaults = labels;
+    },
+  },
+
+  created() {
+    // Initialize configuration if none, as default value resource case
+    if (!this.value.configuration) {
+      this.value.configuration = {
+        defaults:   {},
+        exemptions: Object.assign({}, ...PSADimensions.map(dimension => ({ [dimension]: [] }))),
+      } as PSAConfig;
+    }
+  }
+});
+</script>
+
+<template>
+  <Loading v-if="$fetchState.pending" />
+  <CruResource
+    v-else
+    :mode="mode"
+    :resource="value"
+    :errors="errors"
+    :cancel-event="true"
+    @error="setErrors"
+    @finish="save"
+    @cancel="done()"
+  >
+    <NameNsDescription
+      :value="value"
+      :namespaced="false"
+      :mode="mode"
+    />
+    <PodSecurityAdmission
+      :labels="defaults"
+      :labels-always-active="true"
+      :exemptions="exemptions"
+      :mode="mode"
+      @updateLabels="setDefaults($event)"
+      @updateExemptions="setExemptions($event)"
+    />
+  </CruResource>
+</template>

package/edit/management.cattle.io.project.vue

@@ -16,7 +16,7 @@ import { NAME } from '@shell/config/product/explorer';
 import { PROJECT_ID, _VIEW, _CREATE, _EDIT } from '@shell/config/query-params';
 import ProjectMembershipEditor from '@shell/components/form/Members/ProjectMembershipEditor';
 import { canViewProjectMembershipEditor } from '@shell/components/form/Members/ProjectMembershipEditor.vue';
-import { HARVESTER_NAME as HARVESTER } from '@shell/config/product/harvester-manager';
+import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 import { Banner } from '@components/Banner';
 
 export default {
@@ -36,7 +36,7 @@ export default {
 
     return {
       allPSPs:                          [],
-      projectRoleTemplateBindingSchema:         this.$store.getters[`management/schemaFor`](MANAGEMENT.PROJECT_ROLE_TEMPLATE_BINDING),
+      projectRoleTemplateBindingSchema: this.$store.getters[`management/schemaFor`](MANAGEMENT.PROJECT_ROLE_TEMPLATE_BINDING),
       createLocation:                   {
         name:   'c-cluster-product-resource-create',
         params: {
@@ -47,11 +47,11 @@ export default {
       },
       resource:           MANAGEMENT.PROJECT_ROLE_TEMPLATE_BINDING,
       saveBindings:       null,
-      membershipHasOwner:         false,
+      membershipHasOwner: false,
       membershipUpdate:   {},
       HARVESTER_TYPES,
       RANCHER_TYPES,
-      fvFormRuleSets:       [{ path: 'spec.displayName', rules: ['required'] }],
+      fvFormRuleSets:     [{ path: 'spec.displayName', rules: ['required'] }],
     };
   },
   computed: {
@@ -146,6 +146,13 @@ export default {
         } else if (this.mode === _EDIT) {
           if (this.canEditProject) {
             await this.value.save(true);
+
+            // We updated the Norman resource - re-fetch the Steve resource so we know it is definitely updated in the store
+            await this.$store.dispatch('management/find', {
+              type: MANAGEMENT.PROJECT,
+              id:   this.value.id,
+              opt:  { force: true }
+            });
           }
 
           // // we allow users with permissions for projectroletemplatebindings to be able to manage members on projects

package/edit/management.cattle.io.projectroletemplatebinding.vue

@@ -19,7 +19,7 @@ export default {
   },
   data() {
     return {
-      binding:         {
+      binding: {
         permissionGroup: 'member',
         custom:          {},
         principalId:     '',
@@ -48,10 +48,10 @@ export default {
     },
     async saveOverride() {
       const asyncBindings = this.binding.roleTemplateIds.map(roleTemplateId => this.$store.dispatch(`management/create`, {
-        type:                  MANAGEMENT.PROJECT_ROLE_TEMPLATE_BINDING,
-        roleTemplateName:      roleTemplateId,
-        principalName:         this.member.principalId,
-        projectName:           this.member.projectId,
+        type:             MANAGEMENT.PROJECT_ROLE_TEMPLATE_BINDING,
+        roleTemplateName: roleTemplateId,
+        principalName:    this.member.principalId,
+        projectName:      this.member.projectId,
       }));
 
       const bindings = await Promise.all(asyncBindings);

package/edit/management.cattle.io.setting.vue

@@ -57,13 +57,16 @@ export default {
       // We map the setting rulesets to use values to define validation from factory
       return this.setting?.ruleSet ? mapValues(
         keyBy(this.setting.ruleSet, 'name'),
-        ({ key, name, arg }) => {
-          return formRulesGenerator(t, key ? { key } : {})[name](arg);
+        // The validation is curried and may require the factory argument for the ValidatorFactory
+        ({ key, name, factoryArg }) => {
+          const rule = formRulesGenerator(t, key ? { key } : {})[name];
+
+          return factoryArg ? rule(factoryArg) : rule;
         }) : {};
     }
   },
 
-  methods:  {
+  methods: {
     convertToString(event) {
       this.value.value = `${ event.target.value }`;
     },

package/edit/management.cattle.io.user.vue

@@ -13,7 +13,7 @@ export default {
   components: {
     ChangePassword, GlobalRoleBindings, CruResource, LabeledInput, Loading
   },
-  mixins:     [
+  mixins: [
     CreateEditView
   ],
 
@@ -22,7 +22,7 @@ export default {
 
     return {
       showGlobalRoles,
-      form:             {
+      form: {
         username:    this.value.username,
         description: this.value.description,
         displayName: this.value.displayName,
@@ -34,7 +34,7 @@ export default {
       validation: {
         password:     false,
         roles:        !showGlobalRoles,
-        rolesChanged:     false,
+        rolesChanged: false,
       },
     };
   },
@@ -145,7 +145,7 @@ export default {
       }
 
       const normanUser = await this.$store.dispatch('rancher/find', {
-        type:       NORMAN.USER,
+        type: NORMAN.USER,
         id:   this.value.id,
       });
 
@@ -167,7 +167,13 @@ export default {
       normanUser._name = this.form.displayName;
       normanUser.mustChangePassword = this.form.password.userChangeOnLogin;
 
-      return normanUser.save();
+      await normanUser.save();
+
+      return await this.$store.dispatch('management/find', {
+        type: MANAGEMENT.USER,
+        id:   this.value.id,
+        opt:  { force: true }
+      });
     },
 
     async updateRoles(userId) {