Support Update October (#46)

Addresses an issue with data collection, resolves incorrect component collection, and implements enhanced logging through data redaction. Additionally, the following updates have been included: dependency updates, and the introduction of Models for improved management.

Author: ThatAmatoGuy

deno.json

@@ -22,11 +22,11 @@
     },
     "imports": {
         "@cliffy/command": "jsr:@cliffy/command@1.0.0-rc.8",
-        "@cloudydeno/kubernetes-apis": "jsr:@cloudydeno/kubernetes-apis@0.5.2",
-        "@cloudydeno/kubernetes-client": "jsr:@cloudydeno/kubernetes-client@0.7.5",
+        "@cloudydeno/kubernetes-apis": "jsr:@cloudydeno/kubernetes-apis@0.6.0",
+        "@cloudydeno/kubernetes-client": "jsr:@cloudydeno/kubernetes-client@0.7.7",
         "@deno-lib/logger": "jsr:@deno-lib/logger@^1.1.9",
         "@deno-library/logger": "jsr:@deno-library/logger@^1.2.0",
-        "@henrygd/semaphore": "jsr:@henrygd/semaphore@^0.0.2",
-        "@std/yaml": "jsr:@std/yaml@1.0.9"
+        "@henrygd/semaphore": "jsr:@henrygd/semaphore@^0.1.0",
+        "@std/yaml": "jsr:@std/yaml@1.0.10"
     }
 }

deno.lock

@@ -1,22 +1,6 @@
 import { parse } from '@std/yaml';
 import { logger } from '../utils/mod.ts';
-
-interface CodefreshContext {
-    name: string;
-    token: string;
-    type: string;
-    url: string;
-}
-
-interface CodefreshConfig {
-    contexts: Record<string, CodefreshContext>;
-    'current-context': string;
-}
-
-interface CodefreshCredentials {
-    headers: { Authorization: string };
-    baseUrl: string;
-}
+import { CodefreshConfig, CodefreshCredentials } from '../models/mod.ts';
 
 export class Codefresh {
     constructor() {

src/logic/codefresh.ts

@@ -168,6 +168,7 @@ export class K8s {
             'jobs.batch': () => batchApi.namespace(namespace).getJobList(),
             'nodes': () => coreApi.getNodeList(),
             'pods': () => coreApi.namespace(namespace).getPodList(),
+            'secrets': () => coreApi.namespace(namespace).getSecretList(),
             'serviceaccounts': () => coreApi.namespace(namespace).getServiceAccountList(),
             'services': () => coreApi.namespace(namespace).getServiceList(),
             'statefulsets.apps': () => appsApi.namespace(namespace).getStatefulSetList(),
@@ -178,8 +179,8 @@ export class K8s {
             'persistentvolumes': () => coreApi.getPersistentVolumeList({ labelSelector: 'io.codefresh.accountName' }),
             'storageclasses.storage.k8s.io': () => storageApi.getStorageClassList(),
             'products.codefresh.io': () => this.getCrd('products.codefresh.io', namespace),
-            'promotionflows.codefresh.io': () => this.getCrd('products.codefresh.io', namespace),
-            'promotionpolicies.codefresh.io': () => this.getCrd('promotionflows.codefresh.io', namespace),
+            'promotionflows.codefresh.io': () => this.getCrd('promotionflows.codefresh.io', namespace),
+            'promotionpolicies.codefresh.io': () => this.getCrd('promotionpolicies.codefresh.io', namespace),
             'promotiontemplates.codefresh.io': () => this.getCrd('promotiontemplates.codefresh.io', namespace),
             'restrictedgitsources.codefresh.io': () => this.getCrd('restrictedgitsources.codefresh.io', namespace),
             'analysisruns.argoproj.io': () => this.getCrd('analysisruns.argoproj.io', namespace),

src/logic/k8s.ts

@@ -0,0 +1,16 @@
+interface CodefreshContext {
+    name: string;
+    token: string;
+    type: string;
+    url: string;
+}
+
+export interface CodefreshConfig {
+    contexts: Record<string, CodefreshContext>;
+    'current-context': string;
+}
+
+export interface CodefreshCredentials {
+    headers: { Authorization: string };
+    baseUrl: string;
+}

src/models/codefreshConfig.ts

@@ -0,0 +1,3 @@
+import { CodefreshConfig, CodefreshCredentials } from './codefreshConfig.ts';
+
+export type { CodefreshConfig, CodefreshCredentials };

src/models/mod.ts

@@ -63,6 +63,30 @@ export class Utils {
 
                 const semaphore = getSemaphore(k8sType, 10);
 
+                if (k8sType == 'secrets') {
+                    console.log('Redacting secrets data');
+                    for (const secret of resources.items) {
+                        await semaphore.acquire();
+                        try {
+                            delete secret.metadata.managedFields;
+                            // prevent leaking sensitive data
+                            logger.info(`Redacting data for secret ${secret.metadata.name}`);
+                            if (
+                                secret.metadata.annotations &&
+                                secret.metadata.annotations['kubectl.kubernetes.io/last-applied-configuration']
+                            ) {
+                                delete secret.metadata.annotations['kubectl.kubernetes.io/last-applied-configuration'];
+                            }
+                            secret.data = { 'REDACTED': 'Data is redacted by the support package' };
+
+                            await this.writeYaml(secret, `${secret.metadata.name}_get`, `${dirPath}/${k8sType}`);
+                        } finally {
+                            semaphore.release();
+                        }
+                    }
+                    continue;
+                }
+
                 if (k8sType == 'pods') {
                     for (const pod of resources.items) {
                         await semaphore.acquire();