Migrate secrets to class

components/ResourceTable.vue

@@ -220,6 +220,10 @@ export default {
     },
 
     sortGenerationFn() {
+      if ( !this.schema ) {
+        return null;
+      }
+
       const resource = this.schema.id;
       const inStore = this.$store.getters['currentStore'](resource);
       const generation = this.$store.getters[`${ inStore }/currentGeneration`](resource);

components/form/SecretSelector.vue

@@ -2,7 +2,7 @@
 import LabeledSelect from '@/components/form/LabeledSelect';
 import { SECRET } from '@/config/types';
 import { _EDIT, _VIEW } from '@/config/query-params';
-import { TYPES } from '@/models/secret';
+import { TYPES } from '@/models/secret.class';
 import sortBy from 'lodash/sortBy';
 
 const NONE = '__[[NONE]]__';

components/form/SelectOrCreateAuthSecret.vue

@@ -4,7 +4,7 @@ import Loading from '@/components/Loading';
 import LabeledInput from '@/components/form/LabeledInput';
 import LabeledSelect from '@/components/form/LabeledSelect';
 import { NORMAN, SECRET } from '@/config/types';
-import { TYPES as SECRET_TYPES } from '@/models/secret';
+import { TYPES as SECRET_TYPES } from '@/models/secret.class';
 import { base64Encode } from '@/utils/crypto';
 import { addObjects, insertAt } from '@/utils/array';
 import { sortBy } from '@/utils/sort';

detail/secret.vue

@@ -1,5 +1,5 @@
 <script>
-import { TYPES } from '@/models/secret';
+import { TYPES } from '@/models/secret.class';
 import { base64Decode } from '@/utils/crypto';
 import CreateEditView from '@/mixins/create-edit-view';
 import ResourceTabs from '@/components/form/ResourceTabs';

edit/cloudcredential.vue

@@ -1,5 +1,5 @@
 <script>
-import { TYPES } from '@/models/secret';
+import { TYPES } from '@/models/secret.class';
 import { MANAGEMENT, NORMAN, SCHEMA } from '@/config/types';
 import CreateEditView from '@/mixins/create-edit-view';
 import NameNsDescription from '@/components/form/NameNsDescription';

edit/networking.k8s.io.ingress/index.vue

@@ -8,7 +8,7 @@ import CruResource from '@/components/CruResource';
 import Labels from '@/components/form/Labels';
 import Tabbed from '@/components/Tabbed';
 import { get, set } from '@/utils/object';
-import { TYPES } from '@/models/secret';
+import { TYPES } from '@/models/secret.class';
 import DefaultBackend from './DefaultBackend';
 import Certificates from './Certificates';
 import Rules from './Rules';

edit/provisioning.cattle.io.cluster/RegistryConfigs.vue

@@ -6,7 +6,7 @@ import Checkbox from '@/components/form/Checkbox';
 import SelectOrCreateAuthSecret from '@/components/form/SelectOrCreateAuthSecret';
 import CreateEditView from '@/mixins/create-edit-view';
 import SecretSelector from '@/components/form/SecretSelector';
-import { TYPES } from '@/models/secret';
+import { TYPES } from '@/models/secret.class';
 
 export default {
   components: {

edit/secret/index.vue

@@ -1,5 +1,5 @@
 <script>
-import { TYPES } from '@/models/secret';
+import { TYPES } from '@/models/secret.class';
 import { MANAGEMENT, NAMESPACE } from '@/config/types';
 import CreateEditView from '@/mixins/create-edit-view';
 import NameNsDescription from '@/components/form/NameNsDescription';

models/secret.class.js

@@ -5,6 +5,7 @@ import { removeObjects } from '@/utils/array';
 import { SERVICE_ACCOUNT } from '@/config/types';
 import { set } from '@/utils/object';
 import { NAME as MANAGER } from '@/config/product/manager';
+import SteveModel from '@/plugins/steve/steve-class';
 
 export const TYPES = {
   OPAQUE:           'Opaque',
@@ -22,26 +23,24 @@ export const TYPES = {
   RKE_AUTH_CONFIG:  'rke.cattle.io/auth-config'
 };
 
-export default {
+export default class Secret extends SteveModel {
-  hasSensitiveData: () => true,
+  get hasSensitiveData() {
+    return true;
+  }
 
-  isCertificate() {
+  get isCertificate() {
     return this._type === TYPES.TLS;
-  },
+  }
 
-  isRegistry() {
+  get isRegistry() {
     return this._type === TYPES.DOCKER_JSON;
-  },
+  }
 
-  isCloudCredential() {
+  get isCloudCredential() {
     return this._type === TYPES.CLOUD_CREDENTIAL || (this.metadata.namespace === 'cattle-global-data' && this.metadata.generateName === 'cc-');
-  },
+  }
 
-  dockerJSON() {
+  get issuer() {
-    return TYPES.DOCKER_JSON;
-  },
-
-  issuer() {
     const { metadata:{ annotations = {} } } = this;
 
     if (annotations[CERTMANAGER.ISSUER]) {
@@ -51,35 +50,35 @@ export default {
     } else {
       return null;
     }
-  },
+  }
 
-  notAfter() {
+  get notAfter() {
     if (this.isCertificate) {
       return this.certInfo?.notAfter;
     } else {
       return null;
     }
-  },
+  }
 
-  cn() {
+  get cn() {
     if (this.isCertificate) {
       return this.certInfo?.cn;
     }
 
     return null;
-  },
+  }
 
   // show plus n more for cert names
-  plusMoreNames() {
+  get plusMoreNames() {
     if (this.isCertificate) {
       return this.unrepeatedSans.length;
     }
 
     return null;
-  },
+  }
 
   // use text-warning' or 'text-error' if cert is expiring within 8 days or is expired
-  dateClass() {
+  get dateClass() {
     if (this.isCertificate) {
       const eightDays = 691200000;
 
@@ -93,9 +92,9 @@ export default {
     }
 
     return null;
-  },
+  }
 
-  details() {
+  get details() {
     const out = [
       {
         label:   this.t('secret.type'),
@@ -144,9 +143,9 @@ export default {
     }
 
     return out;
-  },
+  }
 
-  canUpdate() {
+  get canUpdate() {
     if ( !this.hasLink('update') ) {
       return false;
     }
@@ -156,9 +155,9 @@ export default {
     }
 
     return this.$rootGetters['type-map/optionsFor'](this.type).isEditable;
-  },
+  }
 
-  keysDisplay() {
+  get keysDisplay() {
     const keys = [
       ...Object.keys(this.data || []),
       ...Object.keys(this.binaryData || [])
@@ -173,10 +172,10 @@ export default {
     // }
 
     return keys.join(', ');
-  },
+  }
 
   // decode some secret data to show in list view
-  dataPreview() {
+  get dataPreview() {
     if (this._type === TYPES.DOCKER_JSON) {
       const encodedJSON = this.data['.dockerconfigjson'];
 
@@ -204,20 +203,20 @@ export default {
       return this.sshUser;
     } else if ( this._type === TYPES.SERVICE_ACCT ) {
       return this.metadata?.annotations?.['kubernetes.io/service-account.name'];
-    } else {
+    }
+
     return this.keysDisplay;
   }
-  },
 
-  sshUser() {
+  get sshUser() {
     if ( this._type !== TYPES.SSH ) {
-      return;
+      return null;
     }
 
     const pub = base64Decode(this.data['ssh-publickey']);
 
     if ( !pub ) {
-      return;
+      return null;
     }
 
     if ( pub.startsWith('----') ) {
@@ -235,17 +234,19 @@ export default {
         return parts[2];
       }
     }
-  },
 
-  subTypeDisplay() {
+    return null;
+  }
+
+  get subTypeDisplay() {
     const type = this._type || '';
     const fallback = type.replace(/^kubernetes.io\//, '');
 
     return this.$rootGetters['i18n/withFallback'](`secret.types."${ type }"`, null, fallback);
-  },
+  }
 
   // parse TLS certs and return issuer, notAfter, cn, sans
-  certInfo() {
+  get certInfo() {
     const pem = base64Decode(this.data['tls.crt']);
     let issuer, notAfter, cn, sans, x;
 
@@ -276,10 +277,12 @@ export default {
         issuer, notAfter, cn, sans
       };
     }
-  },
+
+    return null;
+  }
 
   // use for + n more name display
-  unrepeatedSans() {
+  get unrepeatedSans() {
     if (this._type === TYPES.TLS ) {
       if (this.certInfo?.sans?.filter) {
         const commonBases = this.certInfo?.sans.filter(name => name.indexOf('*.') === 0 || name.indexOf('www.') === 0).map(name => name.substr(name.indexOf('.')));
@@ -290,9 +293,11 @@ export default {
 
       return this.certInfo?.sans || [];
     }
-  },
 
-  timeTilExpiration() {
+    return null;
+  }
+
+  get timeTilExpiration() {
     if (this._type === TYPES.TLS) {
       const expiration = this.certInfo.notAfter;
       const timeThen = expiration.valueOf();
@@ -300,9 +305,11 @@ export default {
 
       return timeThen - timeNow;
     }
-  },
 
-  decodedData() {
+    return null;
+  }
+
+  get decodedData() {
     const out = {};
 
     for ( const k in this.data || {} ) {
@@ -310,9 +317,9 @@ export default {
     }
 
     return out;
-  },
+  }
 
-  setData() {
+  get setData() {
     return (key, value) => { // or (mapOfNewData)
       const isMap = key && typeof key === 'object';
 
@@ -333,71 +340,13 @@ export default {
         set(this.data, `"${ k }"`, base64Encode(neu[k]));
       }
     };
-  },
-
-  /*
-  cloudCredentialProvider() {
-    return this.metadata?.annotations?.[CAPI.CREDENTIAL_DRIVER];
-  },
-
-  cloudCredentialProviderDisplay() {
-    const provider = (this.cloudCredentialProvider || '').toLowerCase();
-
-    return this.$rootGetters['i18n/withFallback'](`cluster.provider."${ provider }"`, null, provider);
-  },
-
-  cloudCredentialPublicData() {
-    let { publicKey, publicMode } = this.$rootGetters['plugins/credentialOptions'](this.cloudCredentialProvider);
-
-    const options = {
-      full:   fullFields,
-      prefix: prefixFields,
-      suffix: suffixFields,
-    };
-
-    if ( !publicKey ) {
-      for ( const k in this.decodedData || {} ) {
-        if ( publicKey ) {
-          break;
   }
 
-        if ( isEmpty(this.decodedData[k]) ) {
+  get doneRoute() {
-          continue;
-        }
-
-        for ( const mode in options ) {
-          if ( options[mode].includes( simplify(k) ) ) {
-            publicKey = k;
-            publicMode = mode;
-            break;
-          }
-        }
-      }
-    }
-
-    if ( !publicKey ) {
-      return;
-    }
-
-    const val = this.decodedData[publicKey];
-
-    const maxLength = Math.min(8, Math.floor(val.length / 2));
-
-    if ( publicMode === 'prefix' ) {
-      return `${ escapeHtml(val.substr(0, maxLength)) }…`;
-    } else if ( publicMode === 'suffix' ) {
-      return `…${ escapeHtml(val.substr(-1 * maxLength)) }`;
-    } else {
-      return escapeHtml(val);
-    }
-  },
-*/
-
-  doneRoute() {
     if ( this.$rootGetters['currentProduct'].name === MANAGER ) {
       return 'c-cluster-manager-secret';
     } else {
       return 'c-cluster-product-resource';
     }
-  },
+  }
-};
+}