[master] Fixed Credentials Search

frontend/src/components/Credentials/GCredentialDetailsItemContent.vue

@@ -34,9 +34,7 @@ SPDX-License-Identifier: Apache-2.0
 </template>
 
 <script>
-import { decodeBase64 } from '@/utils'
-
-import get from 'lodash/get'
+import { secretDetails } from '@/composables/credential/helper'
 
 export default {
 
@@ -67,7 +65,7 @@ export default {
           },
         ]
       } else if (this.credential?.kind === 'Secret') {
-        const details = this.getCredentialDetails(this.credential)
+        const details = secretDetails(this.credential, this.providerType)
         if (details) {
           return details
         }
@@ -89,175 +87,5 @@ export default {
       ]
     },
   },
-  methods: {
-    getCredentialDetails (secret) {
-      const secretData = secret.data || {}
-      const getGCPProjectId = () => {
-        const serviceAccount = get(secretData, ['serviceaccount.json'])
-        return get(JSON.parse(decodeBase64(serviceAccount)), ['project_id'])
-      }
-      try {
-        switch (this.providerType) {
-          // infra
-          case 'openstack':
-            return [
-              {
-                label: 'Domain Name',
-                value: decodeBase64(secretData.domainName),
-              },
-              {
-                label: 'Tenant Name',
-                value: decodeBase64(secretData.tenantName),
-              },
-            ]
-          case 'vsphere':
-            return [
-              {
-                label: 'vSphere Username',
-                value: decodeBase64(secretData.vsphereUsername),
-              },
-              {
-                label: 'NSX-T Username',
-                value: decodeBase64(secretData.nsxtUsername),
-              },
-            ]
-          case 'aws':
-            return [
-              {
-                label: 'Access Key ID',
-                value: decodeBase64(secretData.accessKeyID),
-              },
-            ]
-          case 'azure':
-            return [
-              {
-                label: 'Subscription ID',
-                value: decodeBase64(secretData.subscriptionID),
-              },
-            ]
-          case 'gcp':
-            return [
-              {
-                label: 'Project',
-                value: getGCPProjectId(),
-              },
-            ]
-          case 'alicloud':
-            return [
-              {
-                label: 'Access Key ID',
-                value: decodeBase64(secretData.accessKeyID),
-              },
-            ]
-          case 'metal':
-            return [
-              {
-                label: 'API URL',
-                value: decodeBase64(secretData.metalAPIURL),
-              },
-            ]
-          case 'hcloud':
-            return [
-              {
-                label: 'Hetzner Cloud Token',
-                hidden: true,
-              },
-            ]
-          case 'openstack-designate':
-            return [
-              {
-                label: 'Domain Name',
-                value: decodeBase64(secretData.domainName),
-              },
-              {
-                label: 'Tenant Name',
-                value: decodeBase64(secretData.tenantName),
-              },
-            ]
-          // dns
-          case 'aws-route53':
-            return [
-              {
-                label: 'Access Key ID',
-                value: decodeBase64(secretData.accessKeyID),
-              },
-            ]
-          case 'azure-dns':
-          case 'azure-private-dns':
-            return [
-              {
-                label: 'Subscription ID',
-                value: decodeBase64(secretData.subscriptionID),
-              },
-            ]
-          case 'google-clouddns':
-            return [
-              {
-                label: 'Project',
-                value: decodeBase64(secretData.project),
-              },
-            ]
-          case 'alicloud-dns':
-            return [
-              {
-                label: 'Access Key ID',
-                value: decodeBase64(secretData.accessKeyID),
-              },
-            ]
-          case 'infoblox-dns':
-            return [
-              {
-                label: 'Infoblox Username',
-                value: decodeBase64(secretData.USERNAME),
-              },
-            ]
-          case 'cloudflare-dns':
-            return [
-              {
-                label: 'API Key',
-                hidden: true,
-              },
-            ]
-          case 'netlify-dns':
-            return [
-              {
-                label: 'API Key',
-                hidden: true,
-              },
-            ]
-          case 'rfc2136':
-            return [
-              {
-                label: 'Server',
-                value: decodeBase64(secretData.Server),
-              },
-              {
-                label: 'TSIG Key Name',
-                value: decodeBase64(secretData.TSIGKeyName),
-              },
-              {
-                label: 'Zone',
-                value: decodeBase64(secretData.Zone),
-              },
-            ]
-          case 'powerdns':
-            return [
-              {
-                label: 'Server',
-                value: decodeBase64(secretData.server),
-              },
-              {
-                label: 'API Key',
-                hidden: true,
-              },
-            ]
-          default:
-            return undefined
-        }
-      } catch (err) {
-        return undefined
-      }
-    },
-  },
 }
 </script>

frontend/src/components/Credentials/GCredentialRowDns.vue

@@ -11,43 +11,43 @@ SPDX-License-Identifier: Apache-2.0
   >
     <td v-if="selectedHeaders.name">
       <div class="d-flex">
-        {{ binding.metadata.name }}
+        {{ item.binding.metadata.name }}
         <g-shared-credential-icon
-          v-if="isSharedCredential"
-          :namespace="credentialNamespace"
+          v-if="item.isSharedCredential"
+          :namespace="item.credentialNamespace"
         />
         <g-orphaned-credential-icon
-          v-if="isOrphanedCredential"
-          :binding="binding"
+          v-if="item.isOrphanedCredential"
+          :binding="item.binding"
         />
       </div>
     </td>
     <td v-if="selectedHeaders.kind">
-      <g-credential-icon :binding="binding" />
+      <g-credential-icon :binding="item.binding" />
     </td>
     <td v-if="selectedHeaders.dnsProvider">
       <g-vendor
         extended
-        :provider-type="binding.provider.type"
+        :provider-type="item.binding.provider.type"
       />
     </td>
     <td v-if="selectedHeaders.details">
       <g-credential-details-item-content
         class="py-1"
-        :credential="credential"
-        :shared="isSharedCredential"
-        :provider-type="binding.provider.type"
+        :credential="item.credential"
+        :shared="item.isSharedCredential"
+        :provider-type="item.binding.provider.type"
       />
     </td>
     <td v-if="selectedHeaders.credentialUsageCount">
-      <g-credential-used-by-label :used-by="credentialUsageCount" />
+      <g-credential-used-by-label :used-by="item.credentialUsageCount" />
     </td>
     <td
       v-if="selectedHeaders.actions"
       class="text-action-button"
     >
       <g-credential-row-actions
-        :binding="binding"
+        :binding="item.binding"
         @update="onUpdate"
         @delete="onDelete"
       />
@@ -58,7 +58,7 @@ SPDX-License-Identifier: Apache-2.0
 <script setup>
 import {
   computed,
-  toRef,
+  toRefs,
 } from 'vue'
 
 import GVendor from '@/components/GVendor'
@@ -69,12 +69,10 @@ import GCredentialUsedByLabel from '@/components/Credentials/GCredentialUsedByLa
 import GSharedCredentialIcon from '@/components/Credentials/GSharedCredentialIcon.vue'
 import GOrphanedCredentialIcon from '@/components/Credentials/GOrphanedCredentialIcon.vue'
 
-import { useCloudProviderBinding } from '@/composables/credential/useCloudProviderBinding'
-
 import { mapTableHeader } from '@/utils'
 
 const props = defineProps({
-  binding: {
+  item: {
     type: Object,
     required: true,
   },
@@ -88,19 +86,15 @@ const props = defineProps({
   },
 })
 
-const binding = toRef(props, 'binding')
-
 const {
-  isSharedCredential,
-  credentialNamespace,
-  credentialUsageCount,
-  isOrphanedCredential,
-  credential,
-} = useCloudProviderBinding(binding)
+  item,
+  highlighted,
+  headers,
+} = toRefs(props)
 
 const emit = defineEmits(['update', 'delete'])
 
-const selectedHeaders = computed(() => mapTableHeader(props.headers, 'selected'))
+const selectedHeaders = computed(() => mapTableHeader(headers.value, 'selected'))
 
 function onUpdate (value) {
   emit('update', value)