@firestartr/cli 3.1.0 → 3.1.1

package/build/index.js

@@ -161445,30 +161445,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',
@@ -167084,7 +167105,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);
@@ -364201,9 +364223,9 @@ const crsStatusSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = {"rE":"3.1.0"};
+const package_namespaceObject = {"rE":"3.1.1"};
 ;// 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/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/build/packages/github/index.d.ts

@@ -68,7 +68,7 @@ declare const _default: {
         getPrFiles: typeof import("./src/pull_request").getPrFiles;
         filterPrBy: (filter: {
             title: string;
-            state: "all" | "closed" | "open";
+            state: "closed" | "all" | "open";
             repo: string;
             owner: string;
             userType: "Bot" | "User";
@@ -80,7 +80,7 @@ declare const _default: {
         create: (owner: string, repo: string, title: string, body: string, labels?: string[], octokit?: any) => Promise<any>;
         update: (owner: string, repo: string, issue_number: number, title: string, body: string, labels?: string[], octokit?: any) => Promise<any>;
         close: (owner: string, repo: string, issue_number: number, octokit?: any) => Promise<any>;
-        filterBy: (owner: string, repo: string, title: string, labels: string, state?: "all" | "closed" | "open", creator?: string, assignee?: string, octokit?: any) => Promise<any>;
+        filterBy: (owner: string, repo: string, title: string, labels: string, state?: "closed" | "all" | "open", creator?: string, assignee?: string, octokit?: any) => Promise<any>;
         upsertByTitle: (owner: string, repo: string, title: string, body: string, labels?: string[], octokit?: any) => Promise<any>;
     };
     branches: {

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

@@ -853,7 +853,7 @@ export declare function withProfile(profileName: string): {
         create: (owner: string, repo: string, title: string, body: string, labels?: string[]) => Promise<any>;
         update: (owner: string, repo: string, issue_number: number, title: string, body: string, labels?: string[]) => Promise<any>;
         close: (owner: string, repo: string, issue_number: number) => Promise<any>;
-        filterBy: (owner: string, repo: string, title: string, labels: string, state?: "all" | "closed" | "open", creator?: string, assignee?: string) => Promise<any>;
+        filterBy: (owner: string, repo: string, title: string, labels: string, state?: "closed" | "all" | "open", creator?: string, assignee?: string) => Promise<any>;
         upsertByTitle: (owner: string, repo: string, title: string, body: string, labels?: string[]) => Promise<any>;
     };
     workflow: {

package/package.json

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