@firestartr/cli 1.41.0 → 1.41.1

package/build/index.js

@@ -285862,8 +285862,44 @@ const SCHEMAS_BY_INITIALIZER_NAME = {
 };
 
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/claims/virtual/index.ts
+const PRECALCULATED_VIRTUAL_CLAIMS = {};
+function initVirtualClaims(org) {
+    if (Object.keys(PRECALCULATED_VIRTUAL_CLAIMS).length !== 0)
+        return;
+    PRECALCULATED_VIRTUAL_CLAIMS[`GroupClaim-${org}-all`] = FirestartrAllClaim;
+}
+function isVirtualClaim(kind, name) {
+    return (Object.keys(PRECALCULATED_VIRTUAL_CLAIMS).indexOf(`${kind}-${name}`) !== -1);
+}
+function getVirtualClaim(kind, name) {
+    if (Object.keys(PRECALCULATED_VIRTUAL_CLAIMS).indexOf(`${kind}-${name}`) !== -1) {
+        return new PRECALCULATED_VIRTUAL_CLAIMS[`${kind}-${name}`]();
+    }
+    return null;
+}
 class FirestartrAllClaim {
-    async expand(renderClaims, config = {}) {
+    constructor() {
+        this.DEFAULT_CONFIG = {
+            kind: 'FirestartrGithubGroup',
+            defaultValues: {
+                context: {
+                    backend: {
+                        ref: {
+                            kind: 'FirestartrProviderConfig',
+                            name: 'firestartr-terraform-state',
+                        },
+                    },
+                    provider: {
+                        ref: {
+                            kind: 'FirestartrProviderConfig',
+                            name: 'github-app',
+                        },
+                    },
+                },
+            },
+        };
+    }
+    async expand(config = {}) {
         const { org } = config;
         const groupClaim = {
             kind: 'GroupClaim',
@@ -285908,6 +285944,9 @@ class FirestartrAllClaim {
             return `user:${renderClaimData.claim.name}`;
         });
     }
+    getDefaultConfig() {
+        return this.DEFAULT_CONFIG;
+    }
 }
 
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/claims/base/schemas/root.schema.ts
@@ -287268,24 +287307,32 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
 
 
 
+
+
+
+
+
 const lazy_loader_log = src_default()('firestartr:renderer:lazy_loader');
-async function loadClaim(claimRef, defaults, patchClaim, loadInitializers, loadGlobals, loadOverrides, loadNormalizers, cwd, existingRefs = {}) {
+async function loadClaim(claimRef, org, defaults, patchClaim, loadInitializers, loadGlobals, loadOverrides, loadNormalizers, cwd, existingRefs = {}) {
     let result = existingRefs;
+    initVirtualClaims(org);
     // cargas datos con grep
-    const claimData = await lazyGetClaim(claimRef.split(/-/)[0], claimRef.replace(/^[^-]+-/, ''), cwd);
+    const claimData = await lazyGetClaim(claimRef.split(/-/)[0], claimRef.replace(/^[^-]+-/, ''), org, cwd);
     const claim = patchClaim(catalog_common.io.fromYaml(claimData), defaults);
     result[claimRef] = {};
     result[claimRef]['claim'] = claim;
     result[claimRef]['claimPath'] = VisitedClaims[claimRef];
-    result[claimRef]['initializers'] = await loadInitializers(claim);
-    result[claimRef]['globals'] = await loadGlobals(claim);
-    result[claimRef]['overrides'] = loadOverrides(claim);
-    result[claimRef]['normalizers'] = await loadNormalizers(claim, result[claimRef]['claimPath']);
+    if (VisitedClaims[claimRef] === 'virtual') {
+        result = await setVirtualClaimAdditionalData(result, claim, claimRef);
+    }
+    else {
+        result = await setNonVirtualClaimAdditionalData(result, claim, claimRef, loadInitializers, loadGlobals, loadOverrides, loadNormalizers);
+    }
     const claimKind = claim.kind;
-    const references = extractAllRefs(claimData);
+    const references = extractAllRefs(catalog_common.io.toYaml(claim));
     for (const ref of references) {
         if (!result[ref]) {
-            const resolvedReferences = await loadClaim(ref, defaults, patchClaim, loadInitializers, loadGlobals, loadOverrides, loadNormalizers, cwd, result);
+            const resolvedReferences = await loadClaim(ref, org, defaults, patchClaim, loadInitializers, loadGlobals, loadOverrides, loadNormalizers, cwd, result);
             result = lodash_default().merge(result, resolvedReferences);
         }
     }
@@ -287293,11 +287340,16 @@ async function loadClaim(claimRef, defaults, patchClaim, loadInitializers, loadG
 }
 const LoadedClaims = {};
 const VisitedClaims = {};
-async function lazyGetClaim(kind, name, cwd) {
+async function lazyGetClaim(kind, name, org, cwd) {
     const indice = `${kind}-${name}`;
     if (indice in LoadedClaims)
         return LoadedClaims[indice];
-    await getClaimsByName(name, cwd);
+    if (isVirtualClaim(kind, name)) {
+        await loadVirtualClaim(kind, name, org);
+    }
+    else {
+        await getClaimsByName(name, cwd);
+    }
     if (indice in LoadedClaims) {
         return LoadedClaims[indice];
     }
@@ -287356,6 +287408,31 @@ async function loadRawClaim(entry) {
         });
     });
 }
+async function setVirtualClaimAdditionalData(renderedData, claim, claimRef) {
+    const virtualClaim = getVirtualClaim(claim.kind, claim.name);
+    renderedData[claimRef]['initializers'] = [
+        new UUIDInitializer(claim),
+        new InitializerClaimRef(),
+        new InitializerDefault(virtualClaim.getDefaultConfig()),
+    ];
+    renderedData[claimRef]['globals'] = [];
+    renderedData[claimRef]['overrides'] = [];
+    renderedData[claimRef]['normalizers'] = [new NameNormalizer()];
+    return renderedData;
+}
+async function setNonVirtualClaimAdditionalData(renderedData, claim, claimRef, loadInitializers, loadGlobals, loadOverrides, loadNormalizers) {
+    renderedData[claimRef]['initializers'] = await loadInitializers(claim);
+    renderedData[claimRef]['globals'] = await loadGlobals(claim);
+    renderedData[claimRef]['overrides'] = loadOverrides(claim);
+    renderedData[claimRef]['normalizers'] = await loadNormalizers(claim, renderedData[claimRef]['claimPath']);
+    return renderedData;
+}
+async function loadVirtualClaim(kind, name, org) {
+    const virtualClaim = getVirtualClaim(kind, name);
+    const expandedClaim = await virtualClaim.expand({ org });
+    LoadedClaims[`${kind}-${name}`] = catalog_common.io.toYaml(expandedClaim);
+    VisitedClaims[`${kind}-${name}`] = 'virtual';
+}
 
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/loader/loader.ts
 
@@ -287697,26 +287774,10 @@ async function loadAll() {
         })
             .then(async () => {
             for (const virtualClaim of virtualClaims) {
-                const expandedClaim = await virtualClaim.expand(data['renderClaims'], { org: getOrg() });
-                const defaultConfig = {
-                    kind: 'FirestartrGithubGroup',
-                    defaultValues: {
-                        context: {
-                            backend: {
-                                ref: {
-                                    kind: 'FirestartrProviderConfig',
-                                    name: 'firestartr-terraform-state',
-                                },
-                            },
-                            provider: {
-                                ref: {
-                                    kind: 'FirestartrProviderConfig',
-                                    name: 'github-app',
-                                },
-                            },
-                        },
-                    },
-                };
+                const expandedClaim = await virtualClaim.expand({
+                    org: getOrg(),
+                });
+                const defaultConfig = virtualClaim.getDefaultConfig();
                 const renderClaim = {
                     claim: expandedClaim,
                     claimPath: 'virtual',
@@ -287745,7 +287806,7 @@ async function loadClaimsList(claimRefList, claimsPath = config_getPath('claims'
     };
     const defaults = loadClaimDefaults();
     for (const claimRef of claimRefList) {
-        const renderedClaimData = await loadClaim(claimRef, defaults, patchClaim, loadInitializers, loadGlobals, loadOverrides, loadNormalizers, claimsPath);
+        const renderedClaimData = await loadClaim(claimRef, getOrg(), defaults, patchClaim, loadInitializers, loadGlobals, loadOverrides, loadNormalizers, claimsPath);
         data.renderClaims = lodash_default().merge(data.renderClaims, renderedClaimData);
     }
     const crClaimReferences = [];

package/build/packages/cdk8s_renderer/src/claims/virtual/index.d.ts

@@ -1,9 +1,15 @@
 import { RenderClaims } from '../../renderer/types';
 import { IClaim } from '../base';
+export declare function initVirtualClaims(org: string): void;
+export declare function isVirtualClaim(kind: string, name: string): boolean;
+export declare function getVirtualClaim(kind: string, name: string): any;
 export interface IVirtualClaim {
-    expand(renderClaims: RenderClaims, config?: any): Promise<IClaim>;
+    expand(config?: any): Promise<IClaim>;
+    getDefaultConfig(): any;
 }
 export declare class FirestartrAllClaim implements IVirtualClaim {
-    expand(renderClaims: RenderClaims, config?: any): Promise<IClaim>;
+    DEFAULT_CONFIG: any;
+    expand(config?: any): Promise<IClaim>;
     expandMembers(renderClaims: RenderClaims): string[];
+    getDefaultConfig(): any;
 }

package/build/packages/cdk8s_renderer/src/loader/lazy_loader.d.ts

@@ -2,4 +2,4 @@ import { InitializerPatches } from '../initializers/base';
 import { GlobalSection } from '../globals/base';
 import { OverriderPatches } from '../overriders/base';
 import { Normalizer } from '../normalizers/base';
-export declare function loadClaim(claimRef: string, defaults: any, patchClaim: (claim: any, defaults: any) => any, loadInitializers: (claim: any) => Promise<InitializerPatches[]>, loadGlobals: (claim: any) => Promise<GlobalSection[]>, loadOverrides: (claim: any) => OverriderPatches[], loadNormalizers: (claim: any, path: string) => Promise<Normalizer[]>, cwd?: string, existingRefs?: any): Promise<any>;
+export declare function loadClaim(claimRef: string, org: string, defaults: any, patchClaim: (claim: any, defaults: any) => any, loadInitializers: (claim: any) => Promise<InitializerPatches[]>, loadGlobals: (claim: any) => Promise<GlobalSection[]>, loadOverrides: (claim: any) => OverriderPatches[], loadNormalizers: (claim: any, path: string) => Promise<Normalizer[]>, cwd?: string, existingRefs?: any): Promise<any>;

package/build/packages/github/src/branches.d.ts

@@ -428,7 +428,7 @@ export declare function getBranch(repo: string, branch: string, owner?: string):
                 verified_at: string;
             };
         };
-        author: Record<string, never> | {
+        author: {
             name?: string;
             email?: string;
             login: string;
@@ -451,8 +451,8 @@ export declare function getBranch(repo: string, branch: string, owner?: string):
             site_admin: boolean;
             starred_at?: string;
             user_view_type?: string;
-        };
-        committer: Record<string, never> | {
+        } | Record<string, never>;
+        committer: {
             name?: string;
             email?: string;
             login: string;
@@ -475,7 +475,7 @@ export declare function getBranch(repo: string, branch: string, owner?: string):
             site_admin: boolean;
             starred_at?: string;
             user_view_type?: string;
-        };
+        } | Record<string, never>;
         parents: {
             sha: string;
             url: string;

package/package.json

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