@firestartr/cli 1.49.0-snapshot-2 → 1.49.0-snapshot-3

package/build/index.js

@@ -289019,15 +289019,22 @@ function initLogger() {
     const logLevel = process.env.LOG_LEVEL && isValidLogLevel(process.env.LOG_LEVEL)
         ? process.env.LOG_LEVEL
         : 'info';
+    const useJson = String(process.env.CI).toLowerCase() !== 'true';
+    const humanFormat = winston.format.printf(({ level, message }) => {
+        const msg = typeof message === 'string' ? message : JSON.stringify(message);
+        if (level === 'error')
+            return `::error::${msg}`;
+        if (level === 'warn')
+            return `::warning::${msg}`;
+        return `[${level}]: ${msg}`;
+    });
     logger = winston_default().createLogger({
         level: logLevel,
         exitOnError: false,
-        format: winston.format.combine(winston.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }), winston.format.json()),
-        transports: [
-            new winston.transports.Console({
-                level: logLevel,
-            }),
-        ],
+        format: useJson
+            ? winston.format.combine(winston.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }), winston.format.json())
+            : winston.format.combine(winston.format.colorize(), humanFormat),
+        transports: [new winston.transports.Console({ level: logLevel })],
     });
     initiated = true;
 }
@@ -302592,6 +302599,30 @@ function validateCrSizes(crs) {
     }
 }
 
+;// CONCATENATED MODULE: ../cdk8s_renderer/src/validations/permissions.ts
+
+function validatePermissionsUniqueness(crs) {
+    for (const crkey in crs) {
+        const cr = crs[crkey];
+        if (cr.kind === 'FirestartrGithubRepository') {
+            const permissions = cr.spec.permissions;
+            cdk8s_renderer_src_logger.debug(`Validating Permissions Uniqueness of ${crkey}`);
+            if (permissions) {
+                const seen = new Set();
+                for (const perm of permissions) {
+                    const identifier = perm.collaborator
+                        ? perm.collaborator
+                        : `ref:${perm.ref.kind}:${perm.ref.name}`;
+                    if (seen.has(identifier)) {
+                        throw new Error(`Duplicate permission reference found in FirestartrGithubRepository ${crkey}: ${identifier}\nFull CR: ${JSON.stringify(cr, null, 2)}`);
+                    }
+                    seen.add(identifier);
+                }
+            }
+        }
+    }
+}
+
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/refsSorter/refsSorter.ts
 
 /**
@@ -307946,6 +307977,8 @@ async function renderClaim(catalogScope, firestartrScope, claim, patches, previo
 
 
 
+
+
 /*
  * Function called when rendering but not importing
  *
@@ -307960,8 +307993,15 @@ async function renderClaim(catalogScope, firestartrScope, claim, patches, previo
 async function renderer_render(catalogScope, firestartrScope, claimList) {
     const data = await loadClaimsList(claimList);
     const result = await renderClaims(catalogScope, firestartrScope, data);
-    validateTfStateKeyUniqueness(result);
-    validateCrSizes(result);
+    try {
+        validateTfStateKeyUniqueness(result);
+        validateCrSizes(result);
+        validatePermissionsUniqueness(result);
+    }
+    catch (e) {
+        cdk8s_renderer_src_logger.error(e.message);
+        throw new Error(e.message);
+    }
     return result;
 }
 
@@ -313751,16 +313791,6 @@ async function output(path, secrets) {
     return await tfExec(path, ['output', '-json'], secrets, []);
 }
 async function tfExec(path, args, secrets, extraArgs = ['-input=false'], stream) {
-    // Format to TF_VAR variables -> https://developer.hashicorp.com/terraform/cli/config/environment-variables#tf_var_name
-    // for (const secret of secrets) {
-    //   process.env[`${secret.key}`] = secret.value;
-    // }
-    //
-    // log.info(
-    //   `Spawning terraform process ['terraform ${args.concat(extraArgs).join(' ')}'] in path '${path}'`,
-    // );
-    //
-    // process.env['TF_PLUGIN_CACHE_DIR'] = '/home/terraform-plugins-cache';
     return new Promise((ok, ko) => {
         const tfProcess = (0,external_child_process_.spawn)('terraform', args.concat(extraArgs), {
             cwd: path,

package/build/packages/cdk8s_renderer/src/validations/permissions.d.ts

@@ -0,0 +1,2 @@
+import { RenderedCrMap } from '../renderer/types';
+export declare function validatePermissionsUniqueness(crs: RenderedCrMap): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firestartr/cli",
-  "version": "1.49.0-snapshot-2",
+  "version": "1.49.0-snapshot-3",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",