@firestartr/cli 1.39.0-SNAPSHOT → 1.39.0

package/build/index.js

@@ -276807,8 +276807,12 @@ const validate = uuid_dist/* validate */.Gu;
 const stringify = uuid_dist/* stringify */.Pz;
 const parse = uuid_dist/* parse */.Qc;
 
+// EXTERNAL MODULE: external "crypto"
+var external_crypto_ = __nccwpck_require__(6113);
+var external_crypto_default = /*#__PURE__*/__nccwpck_require__.n(external_crypto_);
 ;// CONCATENATED MODULE: ../catalog_common/src/generic/nomicon.ts
 
+
 const UUID_ANNOTATION = 'fire-starter.dev/uuid';
 /*
  *
@@ -276836,6 +276840,12 @@ function calculateStoregeKey(artifact, storageType) {
         return `${artifact['kind'].toLowerCase()}-${helperlGetArtifactUUID(artifact)}`;
     }
 }
+/*
+ * String to md5
+ */
+function toMd5(text) {
+    return external_crypto_default().createHash('md5').update(text).digest('hex');
+}
 
 // EXTERNAL MODULE: external "stream"
 var external_stream_ = __nccwpck_require__(12781);
@@ -277829,6 +277839,7 @@ function removeRepeatedObjectsFromArrayByProp(array, propiedad) {
     getFirestartrLabel: getFirestartrLabel,
     normalizeLabel: normalizeLabel,
     removeRepeatedObjectsFromArrayByProp: removeRepeatedObjectsFromArrayByProp,
+    toMd5: toMd5,
 });
 
 ;// CONCATENATED MODULE: ../catalog_common/src/types/envvars.ts
@@ -286971,7 +286982,7 @@ async function replaceReferencesValues(contents, references, resolveRef) {
 class RevisionNormalizer extends Normalizer {
     constructor() {
         super(...arguments);
-        this.applicableProviders = ['all'];
+        this.applicableProviders = ['terraform', 'github'];
     }
     async __validate(_schema) {
         return true;
@@ -287004,11 +287015,6 @@ class RevisionNormalizer extends Normalizer {
                 identify() {
                     return 'normalizer/revision';
                 },
-                applicable() {
-                    return {
-                        applicableProviders: ['terraform'],
-                    };
-                },
             },
         ];
     }
@@ -291497,11 +291503,10 @@ class FeatureRepoChart extends BaseGithubChart {
     template() {
         const claim = this.get('claim');
         const repositoryTarget = this.resolveRepositoryTarget();
-        return {
+        const cr = {
             metadata: {
                 name: claim.name,
                 annotations: {
-                    'firestartr.dev/claim-ref': `${this.get('repoCr').metadata.annotations['firestartr.dev/claim-ref']}`,
                     'firestartr.dev/external-name': claim.name,
                     'firestartr.dev/feature-name': claim.feature.name,
                 },
@@ -291518,10 +291523,31 @@ class FeatureRepoChart extends BaseGithubChart {
                 },
             },
         };
+        const annotations = this.getAnnotationsFromRepo(this.get('repoCr'), [
+            'claim-ref',
+            'revision',
+            'sync-enabled',
+            'sync-period',
+        ]);
+        cr.metadata.annotations = {
+            ...cr.metadata.annotations,
+            ...annotations,
+        };
+        return cr;
     }
     gvk() {
         return FirestartrGithubRepositoryFeature.GVK;
     }
+    getAnnotationsFromRepo(repoCr, inheritedAnnotations) {
+        const annotations = {};
+        for (const annotation of inheritedAnnotations) {
+            const fsAnnotation = `firestartr.dev/${annotation}`;
+            if (fsAnnotation in repoCr.metadata.annotations) {
+                annotations[fsAnnotation] = repoCr.metadata.annotations[fsAnnotation];
+            }
+        }
+        return annotations;
+    }
     resolveRepositoryTarget() {
         const repositoryTarget = {
             ref: {
@@ -292749,7 +292775,8 @@ function compareCRs(crV1, crV2) {
      */
     (op) => op.path !== '/spec/firestartr/tfStateKey' &&
         op.path !== '/metadata/name' &&
-        op.path !== '/spec/writeConnectionSecretToRef/name');
+        op.path !== '/spec/writeConnectionSecretToRef/name' &&
+        op.path !== '/metadata/annotations/firestartr.dev~1revision');
     return {
         changed: compareResult.length !== 0,
         changes: compareResult,
@@ -296746,6 +296773,9 @@ class GithubStack extends BaseStack {
     async provisionEntity(isImport, entity, deps, tfStatePath, orgConfig) {
         try {
             const { backendConfig, providerConfig } = this.getRefContextConfigs(entity, deps);
+            if (backendConfig.spec.type === 'kubernetes') {
+                tfStatePath = catalog_common.generic.toMd5(tfStatePath);
+            }
             this.initProviders(this, tfStatePath, backendConfig, providerConfig, deps);
             const instance = getEntityInstance(entity, deps);
             await instance.provision({ scope: this });
@@ -301102,8 +301132,8 @@ class Analyzer {
     }
 }
 
-;// CONCATENATED MODULE: ../crs_analyzer/src/models/workspace.ts
-class Workspace {
+;// CONCATENATED MODULE: ../crs_analyzer/src/models/cr.ts
+class Cr {
     constructor(kind, metadata, conditions) {
         this.kind = kind;
         this.metadata = metadata;
@@ -301133,23 +301163,23 @@ class Workspace {
     }
 }
 
-;// CONCATENATED MODULE: ../crs_analyzer/src/analyzers/workspaces.ts
+;// CONCATENATED MODULE: ../crs_analyzer/src/analyzers/crs-analyzer.ts
 
 
-class WorkspacesAnalyzer extends Analyzer {
+class CrsAnalyzer extends Analyzer {
     constructor(context, cli) {
         super(context, cli);
         this.drifted = [];
         this.failed = [];
     }
     async analyze() {
-        const workspaces = await this.listWorkspaces();
-        this.drifted = this.filterByDrifted(workspaces);
-        this.failed = this.filterByFailed(workspaces);
+        const crs = await this.listCrs();
+        this.drifted = this.filterByDrifted(crs);
+        this.failed = this.filterByFailed(crs);
     }
-    async listWorkspaces() {
+    async listCrs() {
         const list = await this.cli.listKind(this.ctx.apiGroup, this.ctx.apiVersion, this.ctx.namespace, this.ctx.plural);
-        return list.map((item) => new Workspace(item.kind, item.metadata, item.status.conditions));
+        return list.map((item) => new Cr(item.kind, item.metadata, item.status.conditions));
     }
     filterByFailed(workspaces) {
         return workspaces.filter((ws) => ws.hasError());
@@ -301224,10 +301254,10 @@ function sanitize(str) {
     return str;
 }
 
-;// CONCATENATED MODULE: ../crs_analyzer/src/publishers/workspaces.ts
+;// CONCATENATED MODULE: ../crs_analyzer/src/publishers/crs.ts
 
 
-class WorkspacesPublisher extends Publisher {
+class CrsPublisher extends Publisher {
     constructor(analyzer, githubCli, context) {
         super();
         this.output = '';
@@ -301251,35 +301281,35 @@ class WorkspacesPublisher extends Publisher {
         for (const issue of errorIssues || []) {
             if (!this.analyzer.failed.find((wp) => issue.title.includes(wp.claimName) && issue.title.includes('error'))) {
                 await this.githubCli.closeIssue(this.context.githubOwner, this.context.githubRepo, issue.number);
-                this.writeLnOutput(`✅ No errors detected for TFWorkspace on issue ${issue.title}. Issue has been closed.`);
+                this.writeLnOutput(`✅ No errors detected on issue ${issue.title}. Issue has been closed.`);
             }
         }
     }
     async closeOldDriftIssues(driftIssues) {
         for (const issue of driftIssues || []) {
-            if (!this.analyzer.drifted.find((wp) => issue.title.includes(wp.claimName) && issue.title.includes('drift'))) {
+            if (!this.analyzer.drifted.find((cr) => issue.title.includes(cr.claimName) && issue.title.includes('drift'))) {
                 await this.githubCli.closeIssue(this.context.githubOwner, this.context.githubRepo, issue.number);
-                this.writeLnOutput(`✅ No drift detected for TFWorkspace on issue ${issue.title}. Issue has been closed.`);
+                this.writeLnOutput(`✅ No drift detected on issue ${issue.title}. Issue has been closed.`);
             }
         }
     }
-    async publishError(wp) {
-        const body = this.buildErrorsBody(wp);
-        const resp = await this.githubCli.upsertIssue(this.context.githubOwner, this.context.githubRepo, `Claim '${wp.claimName}' has an error`, body, [wp.claimKind, 'error']);
-        this.writeLnOutput(`❌ Error detected for TFWorkspace: ${wp.claimName}. Issue has been created or updated: ${resp.data.html_url}`);
+    async publishError(cr) {
+        const body = this.buildErrorsBody(cr);
+        const resp = await this.githubCli.upsertIssue(this.context.githubOwner, this.context.githubRepo, `Claim '${cr.claimName}' has an error`, body, [cr.claimKind, 'error']);
+        this.writeLnOutput(`❌ Error detected for ${cr.claimKind}: ${cr.claimName}. Issue has been created or updated: ${resp.data.html_url}`);
         return resp;
     }
-    async publishDrift(wp) {
-        const body = this.buildDriftBody(wp);
-        const resp = await this.githubCli.upsertIssue(this.context.githubOwner, this.context.githubRepo, `Claim '${wp.claimName}' has a drift`, body, [wp.claimKind, 'drift']);
-        this.writeLnOutput(`⚠️ Drift detected for TFWorkspace: ${wp.claimName}. Issue has been created or updated: ${resp.data.html_url}`);
+    async publishDrift(cr) {
+        const body = this.buildDriftBody(cr);
+        const resp = await this.githubCli.upsertIssue(this.context.githubOwner, this.context.githubRepo, `Claim '${cr.claimName}' has a drift`, body, [cr.claimKind, 'drift']);
+        this.writeLnOutput(`⚠️ Drift detected for ${cr.claimKind}: ${cr.claimName}. Issue has been created or updated: ${resp.data.html_url}`);
         return resp;
     }
-    buildErrorsBody(wp) {
+    buildErrorsBody(cr) {
         return `
-The claim '${wp.claimName}' with kind: ${wp.claimKind} has an error.
+The claim '${cr.claimName}' with kind: ${cr.claimKind} has an error.
 
-${this.buildErrorForWs(wp)}
+${this.buildErrorForWs(cr)}
 `;
     }
     buildErrorForWs(ws) {
@@ -301331,19 +301361,11 @@ class GithubClient {
 
 
 
-async function runCrsAnalyzer(analyzerType, namespace, org, repo) {
-    switch (analyzerType) {
-        case 'tfworkspaces':
-            await tfWorkspacesAnalyze(namespace, org, repo);
-            break;
-        default:
-    }
-}
-async function tfWorkspacesAnalyze(namespace, org, repo) {
-    const context = new context_Context('firestartr.dev', 'v1', 'terraformworkspaces', namespace, org, repo);
-    const analyzer = new WorkspacesAnalyzer(context, new KubernetesClient());
+async function runCrsAnalyzer(plural, namespace, org, repo) {
+    const context = new context_Context('firestartr.dev', 'v1', plural, namespace, org, repo);
+    const analyzer = new CrsAnalyzer(context, new KubernetesClient());
     await analyzer.analyze();
-    const publisher = new WorkspacesPublisher(analyzer, new GithubClient(), context);
+    const publisher = new CrsPublisher(analyzer, new GithubClient(), context);
     await publisher.publish();
     if (publisher.output !== '') {
         console.log(publisher.output);

package/build/packages/catalog_common/index.d.ts

@@ -38,6 +38,7 @@ declare const _default: {
         getFirestartrLabel: typeof import("./src/generic/labels").getFirestartrLabel;
         normalizeLabel: typeof import("./src/generic/labels").normalizeLabel;
         removeRepeatedObjectsFromArrayByProp: typeof import("./src/generic/arrays").removeRepeatedObjectsFromArrayByProp;
+        toMd5: typeof import("./src/generic/nomicon").toMd5;
     };
     types: {
         ArtifactStatuses: typeof import("./src/types/catalog").ArtifactStatuses;

package/build/packages/catalog_common/src/generic/index.d.ts

@@ -1,5 +1,5 @@
 import { randomString, shuffleArray, shuffleObject } from './random';
-import { annotateWithUUID, calculateStoregeKey } from './nomicon';
+import { annotateWithUUID, calculateStoregeKey, toMd5 } from './nomicon';
 import CsvWriter from './csv_generator';
 import { getLogger } from './logger';
 import { sleep } from './time';
@@ -24,5 +24,6 @@ declare const _default: {
     getFirestartrLabel: typeof getFirestartrLabel;
     normalizeLabel: typeof normalizeLabel;
     removeRepeatedObjectsFromArrayByProp: typeof removeRepeatedObjectsFromArrayByProp;
+    toMd5: typeof toMd5;
 };
 export default _default;

package/build/packages/catalog_common/src/generic/nomicon.d.ts

@@ -4,3 +4,4 @@ export interface Artifact {
 export declare function annotateWithUUID(artifact: Artifact): Artifact;
 export declare function helperlGetArtifactUUID(artifact: Artifact): string;
 export declare function calculateStoregeKey(artifact: Artifact, storageType: string): string;
+export declare function toMd5(text: string): string;

package/build/packages/cdk8s_renderer/src/charts/github/featureRepoChart.d.ts

@@ -5,6 +5,7 @@ export declare class FeatureRepoChart extends BaseGithubChart {
     constructor(scope: any, chartId: string, firestartrId: string | null, claim: any, patches?: any[], cr?: any);
     template(): FirestartrGithubRepositoryFeatureProps;
     gvk(): GroupVersionKind;
+    private getAnnotationsFromRepo;
     private resolveRepositoryTarget;
     instanceApiObject(template: any): FirestartrGithubRepositoryFeature;
 }

package/build/packages/crs_analyzer/index.d.ts

@@ -1,4 +1,4 @@
-declare function runCrsAnalyzer(analyzerType: string, namespace: string, org: string, repo: string): Promise<void>;
+declare function runCrsAnalyzer(plural: string, namespace: string, org: string, repo: string): Promise<void>;
 declare const _default: {
     runCrsAnalyzer: typeof runCrsAnalyzer;
 };

package/build/packages/crs_analyzer/src/analyzers/crs-analyzer.d.ts

@@ -0,0 +1,13 @@
+import { Context } from '../context';
+import { Analyzer } from './base';
+import { Cr } from '../models/cr';
+import { KubernetesClient } from '../kubernetes-client';
+export declare class CrsAnalyzer extends Analyzer {
+    drifted: Cr[];
+    failed: Cr[];
+    constructor(context: Context, cli: KubernetesClient);
+    analyze(): Promise<void>;
+    listCrs(): Promise<Cr[]>;
+    filterByFailed(workspaces: Cr[]): Cr[];
+    filterByDrifted(workspaces: Cr[]): Cr[];
+}

package/build/packages/crs_analyzer/src/models/{workspace.d.ts → cr.d.ts}

@@ -1,4 +1,4 @@
-export declare class Workspace {
+export declare class Cr {
     kind: string;
     metadata: {
         name: string;

package/build/packages/crs_analyzer/src/publishers/crs.d.ts

@@ -0,0 +1,23 @@
+import { CrsAnalyzer } from '../analyzers/crs-analyzer';
+import { Context } from '../context';
+import { GithubClient } from '../github-client';
+import { Cr } from '../models/cr';
+import { Publisher } from './base';
+export declare class CrsPublisher extends Publisher {
+    githubCli: GithubClient;
+    analyzer: CrsAnalyzer;
+    context: Context;
+    output: string;
+    constructor(analyzer: CrsAnalyzer, githubCli: GithubClient, context: Context);
+    publish(): Promise<void>;
+    closeOldErrorIssues(errorIssues: any): Promise<void>;
+    closeOldDriftIssues(driftIssues: any): Promise<void>;
+    publishError(cr: Cr): Promise<any>;
+    publishDrift(cr: Cr): Promise<any>;
+    buildErrorsBody(cr: Cr): string;
+    buildErrorForWs(ws: Cr): string;
+    buildDriftBody(wp: Cr): string;
+    buildDriftForWs(ws: Cr): string;
+    writeLnOutput(line: string): void;
+    filterIssuesBy(type: 'error' | 'drift'): Promise<any>;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firestartr/cli",
-  "version": "1.39.0-SNAPSHOT",
+  "version": "1.39.0",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",

package/build/packages/crs_analyzer/src/analyzers/workspaces.d.ts

@@ -1,13 +0,0 @@
-import { Context } from '../context';
-import { Analyzer } from './base';
-import { Workspace } from '../models/workspace';
-import { KubernetesClient } from '../kubernetes-client';
-export declare class WorkspacesAnalyzer extends Analyzer {
-    drifted: Workspace[];
-    failed: Workspace[];
-    constructor(context: Context, cli: KubernetesClient);
-    analyze(): Promise<void>;
-    listWorkspaces(): Promise<Workspace[]>;
-    filterByFailed(workspaces: Workspace[]): Workspace[];
-    filterByDrifted(workspaces: Workspace[]): Workspace[];
-}

package/build/packages/crs_analyzer/src/publishers/workspaces.d.ts

@@ -1,23 +0,0 @@
-import { WorkspacesAnalyzer } from '../analyzers/workspaces';
-import { Context } from '../context';
-import { GithubClient } from '../github-client';
-import { Workspace } from '../models/workspace';
-import { Publisher } from './base';
-export declare class WorkspacesPublisher extends Publisher {
-    githubCli: GithubClient;
-    analyzer: WorkspacesAnalyzer;
-    context: Context;
-    output: string;
-    constructor(analyzer: WorkspacesAnalyzer, githubCli: GithubClient, context: Context);
-    publish(): Promise<void>;
-    closeOldErrorIssues(errorIssues: any): Promise<void>;
-    closeOldDriftIssues(driftIssues: any): Promise<void>;
-    publishError(wp: Workspace): Promise<any>;
-    publishDrift(wp: Workspace): Promise<any>;
-    buildErrorsBody(wp: Workspace): string;
-    buildErrorForWs(ws: Workspace): string;
-    buildDriftBody(wp: Workspace): string;
-    buildDriftForWs(ws: Workspace): string;
-    writeLnOutput(line: string): void;
-    filterIssuesBy(type: 'error' | 'drift'): Promise<any>;
-}