@rancher/shell 2.0.1 → 3.0.0-rc.2

package/edit/logging.banzaicloud.io.output/__tests__/logging.banzaicloud.io.output.test.ts

@@ -110,33 +110,35 @@ describe('view: logging.banzaicloud.io.output', () => {
     ['not a proper URL', ['logging.loki.urlInvalid']],
   ])('should validate Loki URL on save', (url, expectation) => {
     const wrapper = mount(Banzai, {
-      data:      () => ({ selectedProvider: 'loki' }),
-      propsData: {
+      data:  () => ({ selectedProvider: 'loki' }),
+      props: {
         value: {
           save: jest.fn(),
           spec: { loki: { url } }
         }
       },
-      mocks: {
-        $fetchState: { pending: false },
-        $store:      {
-          dispatch: jest.fn(),
-          getters:  {
-            currentStore:              () => 'current_store',
-            'management/schemaFor':    jest.fn(),
-            'current_store/all':       jest.fn(),
-            'current_store/schemaFor': jest.fn(),
-            'cluster/all':             jest.fn(),
-            'type-map/isSpoofed':      jest.fn(),
-            'i18n/t':                  jest.fn().mockImplementation((key: string) => key),
-            namespaces:                () => ({}),
-          }
-        },
-        $route: {
-          name:  'whatever',
-          query: { AS: '' }
+      global: {
+        mocks: {
+          $fetchState: { pending: false },
+          $store:      {
+            dispatch: jest.fn(),
+            getters:  {
+              currentStore:              () => 'current_store',
+              'management/schemaFor':    jest.fn(),
+              'current_store/all':       jest.fn(),
+              'current_store/schemaFor': jest.fn(),
+              'cluster/all':             jest.fn(),
+              'type-map/isSpoofed':      jest.fn(),
+              'i18n/t':                  jest.fn().mockImplementation((key: string) => key),
+              namespaces:                () => ({}),
+            }
+          },
+          $route: {
+            name:  'whatever',
+            query: { AS: '' }
+          },
+          $router: { replace: jest.fn() },
         },
-        $router: { replace: jest.fn() },
       }
     });
     const fakeDone = jest.fn();
@@ -148,40 +150,42 @@ describe('view: logging.banzaicloud.io.output', () => {
 
   it('should load the default YAML data for output buffer config (from schema) in a CREATE scenario', async() => {
     const wrapper = mount(Banzai, {
-      data:      () => ({ selectedProvider: 'awsElasticsearch' }),
-      propsData: {
+      data:  () => ({ selectedProvider: 'awsElasticsearch' }),
+      props: {
         value: {
           save: jest.fn(),
           spec: {}
         }
       },
-      mocks: {
-        $fetchState: { pending: false },
-        $store:      {
-          dispatch(arg: any) {
-            if (arg === 'cluster/find') {
-              return outputSchema;
-            }
+      global: {
+        mocks: {
+          $fetchState: { pending: false },
+          $store:      {
+            dispatch(arg: any) {
+              if (arg === 'cluster/find') {
+                return outputSchema;
+              }
 
-            return jest.fn();
+              return jest.fn();
+            },
+            getters: {
+              currentStore:              () => 'current_store',
+              'management/schemaFor':    jest.fn(),
+              'current_store/all':       jest.fn(),
+              'current_store/schemaFor': jest.fn(),
+              'cluster/all':             () => [outputSchema],
+              'cluster/byId':            () => outputSchema,
+              'type-map/isSpoofed':      jest.fn(),
+              'i18n/t':                  jest.fn().mockImplementation((key: string) => key),
+              namespaces:                () => ({}),
+            }
           },
-          getters: {
-            currentStore:              () => 'current_store',
-            'management/schemaFor':    jest.fn(),
-            'current_store/all':       jest.fn(),
-            'current_store/schemaFor': jest.fn(),
-            'cluster/all':             () => [outputSchema],
-            'cluster/byId':            () => outputSchema,
-            'type-map/isSpoofed':      jest.fn(),
-            'i18n/t':                  jest.fn().mockImplementation((key: string) => key),
-            namespaces:                () => ({}),
-          }
-        },
-        $route: {
-          name:  'whatever',
-          query: { AS: '' }
+          $route: {
+            name:  'whatever',
+            query: { AS: '' }
+          },
+          $router: { replace: jest.fn() },
         },
-        $router: { replace: jest.fn() },
       }
     });
 
@@ -227,40 +231,42 @@ describe('view: logging.banzaicloud.io.output', () => {
 
   it('should load current output buffer config in an EDIT scenario', async() => {
     const wrapper = mount(Banzai, {
-      data:      () => ({ selectedProvider: 'awsElasticsearch' }),
-      propsData: {
+      data:  () => ({ selectedProvider: 'awsElasticsearch' }),
+      props: {
         value: {
           save: jest.fn(),
           spec: { awsElasticsearch: { buffer: '#chunk_limit_records: int' } }
         }
       },
-      mocks: {
-        $fetchState: { pending: false },
-        $store:      {
-          dispatch(arg: any) {
-            if (arg === 'cluster/find') {
-              return outputSchema;
-            }
+      global: {
+        mocks: {
+          $fetchState: { pending: false },
+          $store:      {
+            dispatch(arg: any) {
+              if (arg === 'cluster/find') {
+                return outputSchema;
+              }
 
-            return jest.fn();
+              return jest.fn();
+            },
+            getters: {
+              currentStore:              () => 'current_store',
+              'management/schemaFor':    jest.fn(),
+              'current_store/all':       jest.fn(),
+              'current_store/schemaFor': jest.fn(),
+              'cluster/all':             jest.fn(),
+              'cluster/byId':            () => outputSchema,
+              'type-map/isSpoofed':      jest.fn(),
+              'i18n/t':                  jest.fn().mockImplementation((key: string) => key),
+              namespaces:                () => ({}),
+            }
           },
-          getters: {
-            currentStore:              () => 'current_store',
-            'management/schemaFor':    jest.fn(),
-            'current_store/all':       jest.fn(),
-            'current_store/schemaFor': jest.fn(),
-            'cluster/all':             jest.fn(),
-            'cluster/byId':            () => outputSchema,
-            'type-map/isSpoofed':      jest.fn(),
-            'i18n/t':                  jest.fn().mockImplementation((key: string) => key),
-            namespaces:                () => ({}),
-          }
-        },
-        $route: {
-          name:  'whatever',
-          query: { AS: '' }
+          $route: {
+            name:  'whatever',
+            query: { AS: '' }
+          },
+          $router: { replace: jest.fn() },
         },
-        $router: { replace: jest.fn() },
       }
     });
 

package/edit/logging.banzaicloud.io.output/index.vue

@@ -73,7 +73,7 @@ export default {
 
     if (this.mode !== _VIEW) {
       providers.forEach((provider) => {
-        this.$set(this.value.spec, provider.name, this.value.spec[provider.name] || clone(provider.default));
+        this.value.spec[provider.name] = this.value.spec[provider.name] || clone(provider.default);
       });
     }
 
@@ -146,7 +146,7 @@ export default {
       if (!isEmpty(bufferJson)) {
         this.value.spec[this.selectedProvider].buffer = bufferJson;
       } else {
-        this.$delete(this.value.spec[this.selectedProvider], 'buffer');
+        delete this.value.spec[this.selectedProvider]['buffer'];
       }
       this.save(done);
     },
@@ -221,7 +221,7 @@ export default {
           <div class="row">
             <div class="col span-6">
               <LabeledSelect
-                v-model="selectedProvider"
+                v-model:value="selectedProvider"
                 label="Output"
                 :options="providers"
                 :mode="mode"
@@ -243,7 +243,7 @@ export default {
         >
           <YamlEditor
             ref="yaml"
-            v-model="bufferYaml"
+            v-model:value="bufferYaml"
             :scrolling="false"
             :initial-yaml-values="initialBufferYaml"
             :editor-mode="isView ? EDITOR_MODES.VIEW_CODE : EDITOR_MODES.EDIT_CODE"

package/edit/logging.banzaicloud.io.output/providers/__tests__/loki.test.ts

@@ -3,7 +3,7 @@ import Loki from '@shell/edit/logging.banzaicloud.io.output/providers/loki.vue';
 
 describe('component: Loki', () => {
   it('should display URL placeholder', () => {
-    const wrapper = shallowMount(Loki, { propsData: { mode: 'edit', namespace: 'whatever' } });
+    const wrapper = shallowMount(Loki, { props: { mode: 'edit', namespace: 'whatever' } });
     const url = 'https://127.0.0.1:8000';
 
     const placeholder = wrapper.find('[data-testid="loki-url"]').attributes('placeholder');

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

@@ -37,7 +37,7 @@ export default {
     <div class="row">
       <div class="col span-6">
         <LabeledInput
-          v-model="value.endpoint.url"
+          v-model:value="value.endpoint.url"
           :mode="mode"
           :disabled="disabled"
           :label="t('logging.awsElasticsearch.url')"
@@ -54,7 +54,7 @@ export default {
       {{ value.namespace }}
       <div class="col span-6">
         <SecretSelector
-          v-model="value.endpoint.access_key_id"
+          v-model:value="value.endpoint.access_key_id"
           :mode="mode"
           :namespace="namespace"
           :disabled="disabled"
@@ -64,7 +64,7 @@ export default {
       </div>
       <div class="col span-6">
         <SecretSelector
-          v-model="value.endpoint.secret_access_key"
+          v-model:value="value.endpoint.secret_access_key"
           :mode="mode"
           :namespace="namespace"
           :disabled="disabled"

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

@@ -37,7 +37,7 @@ export default {
     <div class="row mb-10">
       <div class="col span-6">
         <LabeledInput
-          v-model="value.azure_container"
+          v-model:value="value.azure_container"
           :mode="mode"
           :disabled="disabled"
           :label="t('logging.azurestorage.container')"
@@ -45,7 +45,7 @@ export default {
       </div>
       <div class="col span-6">
         <LabeledInput
-          v-model="value.path"
+          v-model:value="value.path"
           :mode="mode"
           :disabled="disabled"
           :label="t('logging.azurestorage.path')"
@@ -55,7 +55,7 @@ export default {
     <div class="row">
       <div class="col span-6">
         <LabeledInput
-          v-model="value.store_as"
+          v-model:value="value.store_as"
           :mode="mode"
           :disabled="disabled"
           :label="t('logging.azurestorage.storeAs')"
@@ -71,7 +71,7 @@ export default {
     <div class="row mb-10">
       <div class="col span-6">
         <SecretSelector
-          v-model="value.azure_storage_account"
+          v-model:value="value.azure_storage_account"
           :mode="mode"
           :namespace="namespace"
           :disabled="disabled"
@@ -81,7 +81,7 @@ export default {
       </div>
       <div class="col span-6">
         <SecretSelector
-          v-model="value.azure_storage_access_key"
+          v-model:value="value.azure_storage_access_key"
           :mode="mode"
           :namespace="namespace"
           :disabled="disabled"

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

@@ -37,7 +37,7 @@ export default {
     <div class="row">
       <div class="col span-6">
         <LabeledInput
-          v-model="value.region"
+          v-model:value="value.region"
           :mode="mode"
           :disabled="disabled"
           :label="t('logging.cloudwatch.region')"
@@ -45,7 +45,7 @@ export default {
       </div>
       <div class="col span-6">
         <LabeledInput
-          v-model="value.endpoint"
+          v-model:value="value.endpoint"
           :mode="mode"
           :disabled="disabled"
           :label="t('logging.cloudwatch.endpoint')"
@@ -60,7 +60,7 @@ export default {
     <div class="row mb-10">
       <div class="col span-6">
         <SecretSelector
-          v-model="value.aws_key_id"
+          v-model:value="value.aws_key_id"
           :mode="mode"
           :namespace="namespace"
           :disabled="disabled"
@@ -70,7 +70,7 @@ export default {
       </div>
       <div class="col span-6">
         <SecretSelector
-          v-model="value.aws_sec_key"
+          v-model:value="value.aws_sec_key"
           :mode="mode"
           :namespace="namespace"
           :disabled="disabled"
@@ -87,7 +87,7 @@ export default {
     <div class="row">
       <div class="col span-6">
         <LabeledInput
-          v-model="value.log_group_name"
+          v-model:value="value.log_group_name"
           :mode="mode"
           :disabled="disabled"
           :label="t('logging.cloudwatch.logGroupName')"
@@ -95,7 +95,7 @@ export default {
       </div>
       <div class="col span-6">
         <LabeledInput
-          v-model="value.log_stream_name"
+          v-model:value="value.log_stream_name"
           :mode="mode"
           :disabled="disabled"
           :label="t('logging.cloudwatch.logStreamName')"

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

@@ -40,7 +40,7 @@ export default {
     <div class="row">
       <div class="col span-6">
         <LabeledInput
-          v-model="value.host"
+          v-model:value="value.host"
           :mode="mode"
           :disabled="disabled"
           :label="t('logging.datadog.host')"
@@ -56,7 +56,7 @@ export default {
     <div class="row">
       <div class="col span-6">
         <SecretSelector
-          v-model="value.api_key"
+          v-model:value="value.api_key"
           :mode="mode"
           :namespace="namespace"
           :disabled="disabled"
@@ -74,7 +74,7 @@ export default {
     <div class="row mb-10">
       <div class="col span-6">
         <Checkbox
-          v-model="value.use_ssl"
+          v-model:value="value.use_ssl"
           :mode="mode"
           :disabled="disabled"
           :label="t('logging.datadog.useSSL')"
@@ -84,7 +84,7 @@ export default {
     <div class="row mb-10">
       <div class="col span-6">
         <Checkbox
-          v-model="value.use_compression"
+          v-model:value="value.use_compression"
           :mode="mode"
           :disabled="disabled"
           :label="t('logging.datadog.useCompression')"

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

@@ -38,17 +38,17 @@ export default {
 
       // Require SSL verification by default
       if (typeof this.value.ssl_verify === 'undefined') {
-        this.$set(this.value, 'ssl_verify', true);
+        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]);
+        this.value['ssl_version'] = sslVersions[0];
       }
 
       // Suppress type name by default
       if (typeof this.value.suppress_type_name === 'undefined') {
-        this.$set(this.value, 'suppress_type_name', true);
+        this.value['suppress_type_name'] = true;
       }
     }
 
@@ -60,7 +60,7 @@ export default {
         return this.value.port;
       },
       set(port) {
-        updatePort((value) => this.$set(this.value, 'port', value), port);
+        updatePort((value) => (this.value['port'] = value), port);
       }
     }
   }
@@ -77,7 +77,7 @@ export default {
     <div class="row mb-10">
       <div class="col span-2">
         <LabeledSelect
-          v-model="value.scheme"
+          v-model:value="value.scheme"
           :mode="mode"
           :disabled="disabled"
           class="scheme"
@@ -87,7 +87,7 @@ export default {
       </div>
       <div class="col span-8">
         <LabeledInput
-          v-model="value.host"
+          v-model:value="value.host"
           :mode="mode"
           :disabled="disabled"
           class="host"
@@ -110,7 +110,7 @@ export default {
     <div class="row">
       <div class="col span-6">
         <LabeledInput
-          v-model="value.index_name"
+          v-model:value="value.index_name"
           :mode="mode"
           :disabled="disabled"
           :label="t('logging.elasticsearch.indexName')"
@@ -126,7 +126,7 @@ export default {
     <div class="row">
       <div class="col span-6">
         <LabeledInput
-          v-model="value.user"
+          v-model:value="value.user"
           :mode="mode"
           :disabled="disabled"
           :label="t('logging.elasticsearch.user')"
@@ -134,7 +134,7 @@ export default {
       </div>
       <div class="col span-6">
         <SecretSelector
-          v-model="value.password"
+          v-model:value="value.password"
           :secret-name-label="t('logging.elasticsearch.password')"
           :mode="mode"
           :namespace="namespace"
@@ -152,7 +152,7 @@ export default {
     <div class="row mb-10">
       <div class="col span-6">
         <SecretSelector
-          v-model="value.ca_file"
+          v-model:value="value.ca_file"
           mount-key="mountFrom"
           :mode="mode"
           :namespace="namespace"
@@ -163,7 +163,7 @@ export default {
       </div>
       <div class="col span-6">
         <SecretSelector
-          v-model="value.client_cert"
+          v-model:value="value.client_cert"
           mount-key="mountFrom"
           :mode="mode"
           :namespace="namespace"
@@ -176,7 +176,7 @@ export default {
     <div class="row">
       <div class="col span-6">
         <SecretSelector
-          v-model="value.client_key"
+          v-model:value="value.client_key"
           mount-key="mountFrom"
           :mode="mode"
           :namespace="namespace"
@@ -187,7 +187,7 @@ export default {
       </div>
       <div class="col span-6">
         <SecretSelector
-          v-model="value.client_key_pass"
+          v-model:value="value.client_key_pass"
           :mode="mode"
           :namespace="namespace"
           :disabled="disabled"
@@ -199,7 +199,7 @@ export default {
     <div class="row mb-10">
       <div class="col span-6">
         <LabeledSelect
-          v-model="value.ssl_version"
+          v-model:value="value.ssl_version"
           :mode="mode"
           :disabled="disabled"
           :options="sslVersions"
@@ -208,13 +208,13 @@ export default {
       </div>
       <div class="col span-6 vertically-center">
         <Checkbox
-          v-model="value.ssl_verify"
+          v-model:value="value.ssl_verify"
           :label="t('logging.elasticsearch.verifySsl')"
           :disabled="disabled"
           :mode="mode"
         />
         <Checkbox
-          v-model="value.suppress_type_name"
+          v-model:value="value.suppress_type_name"
           :label="t('logging.elasticsearch.suppressTypeName.label')"
           :tooltip="t('logging.elasticsearch.suppressTypeName.elasticSearchTips')"
           :disabled="disabled"

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

@@ -36,7 +36,7 @@ export default {
     <div class="row">
       <div class="col span-6">
         <LabeledInput
-          v-model="value.path"
+          v-model:value="value.path"
           :mode="mode"
           :disabled="disabled"
           :label="t('logging.file.path')"

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

@@ -31,7 +31,7 @@ export default {
         return this.value.servers[0].port;
       },
       set(port) {
-        updatePort((value) => this.$set(this.value.servers[0], 'port', value), port);
+        updatePort((value) => (this.value.servers[0]['port'] = value), port);
       }
     }
   }
@@ -48,7 +48,7 @@ export default {
     <div class="row">
       <div class="col span-10">
         <LabeledInput
-          v-model="value.servers[0].host"
+          v-model:value="value.servers[0].host"
           :mode="mode"
           :disabled="disabled"
           :label="t('logging.forward.host')"
@@ -56,7 +56,7 @@ export default {
       </div>
       <div class="col span-2">
         <LabeledInput
-          v-model="port"
+          v-model:value="port"
           :mode="mode"
           :disabled="disabled"
           type="number"
@@ -75,7 +75,7 @@ export default {
     <div class="row mb-10">
       <div class="col span-6">
         <SecretSelector
-          v-model="value.servers[0].username"
+          v-model:value="value.servers[0].username"
           :mode="mode"
           :namespace="namespace"
           :disabled="disabled"
@@ -85,7 +85,7 @@ export default {
       </div>
       <div class="col span-6">
         <SecretSelector
-          v-model="value.servers[0].password"
+          v-model:value="value.servers[0].password"
           :mode="mode"
           :namespace="namespace"
           :disabled="disabled"
@@ -97,7 +97,7 @@ export default {
     <div class="row">
       <div class="col span-6">
         <SecretSelector
-          v-model="value.servers[0].shared_key"
+          v-model:value="value.servers[0].shared_key"
           :mode="mode"
           :namespace="namespace"
           :disabled="disabled"
@@ -115,7 +115,7 @@ export default {
     <div class="row">
       <div class="col span-6">
         <SecretSelector
-          v-model="value.tls_client_cert_path"
+          v-model:value="value.tls_client_cert_path"
           mount-key="mountFrom"
           :mode="mode"
           :namespace="namespace"
@@ -126,7 +126,7 @@ export default {
       </div>
       <div class="col span-6">
         <SecretSelector
-          v-model="value.tls_client_private_key_path"
+          v-model:value="value.tls_client_private_key_path"
           mount-key="mountFrom"
           :mode="mode"
           :namespace="namespace"
@@ -139,7 +139,7 @@ export default {
     <div class="row mt-10">
       <div class="col span-6">
         <SecretSelector
-          v-model="value.tls_client_private_key_passphrase"
+          v-model:value="value.tls_client_private_key_passphrase"
           :mode="mode"
           :namespace="namespace"
           :disabled="disabled"

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

@@ -40,7 +40,7 @@ export default {
     <div class="row mb-10">
       <div class="col span-6">
         <LabeledInput
-          v-model="value.project"
+          v-model:value="value.project"
           :mode="mode"
           :disabled="disabled"
           :label="t('logging.gcs.project')"
@@ -48,7 +48,7 @@ export default {
       </div>
       <div class="col span-6">
         <LabeledInput
-          v-model="value.bucket"
+          v-model:value="value.bucket"
           :mode="mode"
           :disabled="disabled"
           :label="t('logging.gcs.bucket')"
@@ -58,7 +58,7 @@ export default {
     <div class="row">
       <div class="col span-6">
         <LabeledInput
-          v-model="value.path"
+          v-model:value="value.path"
           :mode="mode"
           :disabled="disabled"
           :label="t('logging.gcs.path')"
@@ -66,7 +66,7 @@ export default {
       </div>
       <div class="col span-6 overwrite">
         <Checkbox
-          v-model="value.overwrite"
+          v-model:value="value.overwrite"
           :mode="mode"
           :disabled="disabled"
           :label="t('logging.gcs.overwriteExistingPath')"
@@ -82,7 +82,7 @@ export default {
     <div class="row">
       <div class="col span-6">
         <SecretSelector
-          v-model="value.credentials_json"
+          v-model:value="value.credentials_json"
           :mode="mode"
           :namespace="namespace"
           :disabled="disabled"