@firestartr/cli 3.1.0 → 3.1.1-snapshot-firestartrignore

package/build/index.js

@@ -154998,9 +154998,25 @@ function createExpanders(path) {
 ;// CONCATENATED MODULE: external "node:fs/promises"
 const promises_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:fs/promises");
 var promises_default = /*#__PURE__*/__nccwpck_require__.n(promises_namespaceObject);
+// EXTERNAL MODULE: external "node:fs"
+var external_node_fs_ = __nccwpck_require__(73024);
+// EXTERNAL MODULE: external "node:path"
+var external_node_path_ = __nccwpck_require__(76760);
+var external_node_path_default = /*#__PURE__*/__nccwpck_require__.n(external_node_path_);
+;// CONCATENATED MODULE: ../cdk8s_renderer/src/utils/fileIgnore.ts
+
+
+const FIRESTARTR_IGNORE_FILE = '.firestartrignore';
+/** Only the file's own directory matters; markers are not inherited. */
+function fileIgnore_isIgnoredFile(file) {
+    return (/\.(yaml|yml)$/.test(file) &&
+        (0,external_node_fs_.existsSync)(external_node_path_default().join(external_node_path_default().dirname(file), FIRESTARTR_IGNORE_FILE)));
+}
+
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/crawler.ts
 
 
+
 // Number of files being currently slurped
 let activeSlurps = 0;
 // Max number of files that can be being slurped at a given time
@@ -155110,11 +155126,16 @@ async function crawlDirectory(dirEnt, exec) {
         const entries = (await promises_namespaceObject.readdir(dirEnt))
             .map((entry) => external_path_.join(dirEnt, entry))
             .sort();
+        const ignoreFiles = entries.includes(external_path_.join(dirEnt, FIRESTARTR_IGNORE_FILE));
         for (const entry of entries) {
             const testDir = await isDir(entry);
             if (testDir) {
                 await crawlDirectory(entry, exec);
             }
+            else if (external_path_.basename(entry) === FIRESTARTR_IGNORE_FILE ||
+                (ignoreFiles && /\.(yaml|yml)$/.test(entry))) {
+                continue;
+            }
             else {
                 await slurpFile(entry, exec);
             }
@@ -159484,10 +159505,6 @@ function addTraceabilityStamp(context, content) {
     }
 }
 
-// EXTERNAL MODULE: external "node:path"
-var external_node_path_ = __nccwpck_require__(76760);
-// EXTERNAL MODULE: external "node:fs"
-var external_node_fs_ = __nccwpck_require__(73024);
 ;// CONCATENATED MODULE: external "node:os"
 const external_node_os_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:os");
 ;// CONCATENATED MODULE: ../features_renderer/src/auxiliar.ts
@@ -160861,6 +160878,7 @@ function extractClaimPatches(rendered) {
 
 
 
+
 // We need to ensure the grep command is a gnu version
 let IS_GNU_GREP = false;
 let GREP_ON_CHECK = false;
@@ -161054,7 +161072,9 @@ async function getClaimsByName(name, cwd = '.') {
                 if (Object.values(VisitedClaims).includes(fileName)) {
                     continue;
                 }
-                entradas.push(external_path_.join(cwd, fileName));
+                const entry = external_path_.join(cwd, fileName);
+                if (!fileIgnore_isIgnoredFile(entry))
+                    entradas.push(entry);
             }
             return Promise.all(entradas.map((entrada) => {
                 return loadRawClaim(entrada);
@@ -161184,6 +161204,7 @@ function claimsDefaulter_hasDeepPath(data, deepPath) {
 
 
 
+
 const isYamlFile = new RegExp(/\.(yaml|yml)$/);
 /**
  *
@@ -161307,6 +161328,9 @@ async function loadInitializers(claim, claimPath, initializersPath = getPath('in
     return result;
 }
 function loadClaimDefaults() {
+    if (fileIgnore_isIgnoredFile(`${getPath('claimsDefaults')}/claims_defaults.yaml`)) {
+        return {};
+    }
     try {
         return catalog_common/* default */.A.io.fromYaml(external_fs_.readFileSync(`${getPath('claimsDefaults')}/claims_defaults.yaml`, 'utf-8'));
     }
@@ -161445,30 +161469,51 @@ function validateTfStateKeyUniqueness(crs) {
     const tfStateKeys = {};
     for (const crKey of Object.keys(crs)) {
         const cr = crs[crKey];
-        if (!isTerraformWorkspace(cr))
+        if (!cr.spec?.firestartr?.tfStateKey)
             continue;
         const tfKey = cr.spec.firestartr.tfStateKey;
-        if (tfStateKeys[tfKey]) {
+        const claimRef = cr.metadata?.annotations?.['firestartr.dev/claim-ref'];
+        const existing = tfStateKeys[tfKey];
+        if (existing) {
+            const existingClaimRef = existing.metadata?.annotations?.['firestartr.dev/claim-ref'];
+            const sameClaim = claimRef !== undefined && existingClaimRef === claimRef;
+            const workspaceInvolved = isTerraformWorkspace(cr) || isTerraformWorkspace(existing);
+            if (sameClaim && !workspaceInvolved) {
+                continue;
+            }
             throw new Error(`❗❗ ❌ RENDER ERROR ❌ ❗❗
 
 The tfStateKey ${tfKey} is not unique,
 
 It is being used by the following CRs:
 
-- ${tfStateKeys[tfKey].kind} ${tfStateKeys[tfKey].metadata.name}
+- ${existing.kind} ${existing.metadata.name}
 
 - ${cr.kind} ${cr.metadata.name}
 
 Check the following Claims to ensure that the tfStateKey is unique:
 
-- ${tfStateKeys[tfKey].metadata.annotations['firestartr.dev/claim-ref']}
+- ${existingClaimRef}
 
-- ${cr.metadata.annotations['firestartr.dev/claim-ref']}
+- ${claimRef}
 `);
         }
         tfStateKeys[cr.spec.firestartr.tfStateKey] = cr;
     }
 }
+function validateClaimRefOwnership(previousCrs, renderedCrs) {
+    for (const crKey of Object.keys(renderedCrs)) {
+        const previous = previousCrs[crKey];
+        if (!previous)
+            continue;
+        const previousClaimRef = previous.metadata?.annotations?.['firestartr.dev/claim-ref'];
+        const renderedClaimRef = renderedCrs[crKey].metadata?.annotations?.['firestartr.dev/claim-ref'];
+        if (previousClaimRef === renderedClaimRef)
+            continue;
+        const cr = renderedCrs[crKey];
+        throw new Error(`The rendered ${cr.kind} ${cr.metadata?.name} would overwrite an existing resource owned by ${previousClaimRef ?? '<unknown claim>'} (rendered by ${renderedClaimRef ?? '<unknown claim>'})`);
+    }
+}
 function references_isCatalogEntity(cr) {
     return [
         'Component',
@@ -161870,6 +161915,7 @@ const KINDS_CR_MAP = {
 
 
 
+
 function resolveStringReference(reference) {
     const referenceElements = reference.split(':');
     const actualKind = KINDS_CR_MAP[referenceElements[0]];
@@ -161890,6 +161936,8 @@ function resolveClaimFilesList(claimRefsList) {
     const fileList = claimRefsList.replace(/\s/g, '').split(',');
     const refList = [];
     for (const file of fileList) {
+        if (isIgnoredFile(file))
+            continue;
         try {
             const data = fs.readFileSync(file, 'utf-8');
             const claim = common.io.fromYaml(data);
@@ -161920,6 +161968,8 @@ async function* resolveClaimEntries(claimRefsList) {
                 yield* resolveDirEntries(claimEntry);
             }
             else if (claimEntryStats.isFile()) {
+                if (fileIgnore_isIgnoredFile(claimEntry))
+                    continue;
                 logger.debug(`Sending entry ${resolveClaimFileRef(claimEntry)} (${claimEntry})`);
                 yield resolveClaimFileRef(claimEntry);
             }
@@ -161939,12 +161989,15 @@ async function* resolveDirEntries(dir) {
     catch (err) {
         throw new Error(`Reading dir: ${dir}: ${err}`);
     }
+    const ignoreFiles = entries.some((entry) => entry.name === FIRESTARTR_IGNORE_FILE);
     for (const entry of entries) {
         const fullPath = external_path_default().join(dir, entry.name);
         if (entry.isDirectory()) {
             yield* resolveDirEntries(fullPath);
         }
-        else if (entry.isFile() && entry.name.match(/\.yaml$|\.yml$/)) {
+        else if (!ignoreFiles &&
+            entry.isFile() &&
+            entry.name.match(/\.yaml$|\.yml$/)) {
             const claimRef = await resolveClaimFileRef(fullPath);
             logger.debug(`Sending entry ${claimRef} (${fullPath})`);
             yield claimRef;
@@ -162019,12 +162072,15 @@ async function crawlClaimsDir(dir, basePath, claims) {
     catch (err) {
         throw new Error(`Reading directory ${dir}: ${err}`);
     }
+    const ignoreFiles = entries.some((entry) => entry.name === FIRESTARTR_IGNORE_FILE);
     for (const entry of entries) {
         const fullPath = external_path_default().join(dir, entry.name);
         if (entry.isDirectory()) {
             await crawlClaimsDir(fullPath, basePath, claims);
         }
-        else if (entry.isFile() && entry.name.match(/\.yaml$|\.yml$/)) {
+        else if (!ignoreFiles &&
+            entry.isFile() &&
+            entry.name.match(/\.yaml$|\.yml$/)) {
             try {
                 const data = await external_fs_default().promises.readFile(fullPath, 'utf-8');
                 const claim = catalog_common/* default */.A.io.fromYaml(data);
@@ -167084,7 +167140,8 @@ async function renderer_render(catalogScope, firestartrScope, claimList) {
     try {
         validateSubReferences(data.renderClaims);
         validateComponentPagesPath(data.renderClaims);
-        validateTfStateKeyUniqueness(result);
+        validateClaimRefOwnership(data.fullCrs, result);
+        validateTfStateKeyUniqueness(fullCrSet);
         validateGithubOrgSettingsSingleton(fullCrSet);
         validateGithubOrgVariableSectionSingleton(fullCrSet);
         validateActionsVariablesUniqueness(result);
@@ -362066,6 +362123,11 @@ async function planTerraformWorkspace(cr, status, opts) {
 async function planGithubResource(cr, status, opts) {
     fDebug('Resolving references');
     const deps = await resolve(cr, getPrAwareItemByItemPath(opts, status), getSecret, opts.namespace);
+    deps['self-outputs'] = {
+        cr: cr?.metadata?.name
+            ? await resolveSecretRef(cr.metadata.namespace || opts.namespace, cr, getSecret)
+            : undefined,
+    };
     fDebug('Running GitHub provisioner plan');
     return await gh_provisioner.runGhProvisioner({
         mainCr: cr,
@@ -364201,9 +364263,9 @@ const crsStatusSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = {"rE":"3.1.0"};
+const package_namespaceObject = /*#__PURE__*/JSON.parse('{"rE":"3.1.1-snapshot-firestartrignore"}');
 ;// CONCATENATED MODULE: ../../package.json
-const package_namespaceObject_1 = {"rE":"3.1.0"};
+const package_namespaceObject_1 = {"rE":"3.1.1"};
 // EXTERNAL MODULE: ../../node_modules/semver/index.js
 var semver = __nccwpck_require__(90084);
 var semver_default = /*#__PURE__*/__nccwpck_require__.n(semver);

package/build/packages/cdk8s_renderer/src/utils/fileIgnore.d.ts

@@ -0,0 +1,3 @@
+export declare const FIRESTARTR_IGNORE_FILE = ".firestartrignore";
+/** Only the file's own directory matters; markers are not inherited. */
+export declare function isIgnoredFile(file: string): boolean;

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

@@ -1,2 +1,3 @@
 export declare function validateTfStateKeyUniqueness(crs: any): void;
+export declare function validateClaimRefOwnership(previousCrs: any, renderedCrs: any): void;
 export declare function isCatalogEntity(cr: any): boolean;

package/package.json

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