npm - @firestartr/cli - Versions diffs - 1.49.0-snapshot-1 → 1.49.0-snapshot-2 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/build/index.js CHANGED Viewed

@@ -301373,6 +301373,12 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                                 $ref: 'firestartr.dev://github/GithubComponentFeatureClaim',
                             },
                         },
+                        vars: {
+                            $ref: 'firestartr.dev://github/GithubComponentClaimVars',
+                        },
+                        secrets: {
+                            $ref: 'firestartr.dev://github/GithubComponentClaimSecrets',
+                        },
                     },
                     required: ['visibility', 'org'],
                 },
@@ -301479,18 +301485,118 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
     },
 });
+;// CONCATENATED MODULE: ../cdk8s_renderer/src/claims/github/component.secrets-vars.schema.ts
+/* harmony default export */ const component_secrets_vars_schema = ({
+    $schema: SCHEMA,
+    $id: 'GithubComponentClaimVarsAndSecrets',
+    definitions: {
+        GithubComponentClaimVars: {
+            $id: 'firestartr.dev://github/GithubComponentClaimVars',
+            type: 'object',
+            properties: {
+                actions: {
+                    type: 'array',
+                    items: {
+                        $ref: 'firestartr.dev://github/GithubComponentClaimRepoVar',
+                    },
+                },
+                codespaces: {
+                    type: 'array',
+                    items: {
+                        $ref: 'firestartr.dev://github/GithubComponentClaimRepoVar',
+                    },
+                },
+                dependabot: {
+                    type: 'array',
+                    items: {
+                        $ref: 'firestartr.dev://github/GithubComponentClaimRepoVar',
+                    },
+                },
+            },
+            additionalProperties: false,
+        },
+        GithubComponentClaimSecrets: {
+            $id: 'firestartr.dev://github/GithubComponentClaimSecrets',
+            type: 'object',
+            properties: {
+                actions: {
+                    type: 'array',
+                    items: {
+                        $ref: 'firestartr.dev://github/GithubComponentClaimRepoSecret',
+                    },
+                },
+                codespaces: {
+                    type: 'array',
+                    items: {
+                        $ref: 'firestartr.dev://github/GithubComponentClaimRepoSecret',
+                    },
+                },
+                dependabot: {
+                    type: 'array',
+                    items: {
+                        $ref: 'firestartr.dev://github/GithubComponentClaimRepoSecret',
+                    },
+                },
+            },
+            additionalProperties: false,
+        },
+        GithubComponentClaimSecretRef: {
+            $id: 'firestartr.dev://github/GithubComponentClaimSecretRef',
+            type: 'string',
+            description: 'the reference of the secret',
+            pattern: '^ref:secretclaim:([a-zA-Z0-9_-]+):([a-zA-Z0-9_-]+)$',
+        },
+        GithubComponentClaimRepoSecret: {
+            $id: 'firestartr.dev://github/GithubComponentClaimRepoSecret',
+            type: 'object',
+            description: 'A secret for a github repo',
+            properties: {
+                name: {
+                    type: 'string',
+                    description: 'the name of the secret',
+                },
+                value: {
+                    $ref: 'firestartr.dev://github/GithubComponentClaimSecretRef',
+                },
+            },
+            required: ['name', 'value'],
+            additionalProperties: false,
+        },
+        GithubComponentClaimRepoVar: {
+            $id: 'firestartr.dev://github/GithubComponentClaimRepoVar',
+            type: 'object',
+            description: 'A var for a github repo',
+            properties: {
+                name: {
+                    type: 'string',
+                    description: 'the name of the var',
+                },
+                value: {
+                    type: 'string',
+                    description: 'the value of the var',
+                },
+            },
+            required: ['name', 'value'],
+            additionalProperties: false,
+        },
+    },
+});
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/claims/github/index.ts
 const GithubSchemas = [
     github_group_schema,
     github_user_schema,
     feature_schema,
     github_component_schema,
     github_orgwebhook_schema,
+    component_secrets_vars_schema,
 ];
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/claims/tfworkspaces/terraform.schema.ts
@@ -302486,30 +302592,6 @@ 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
 /**
@@ -307864,7 +307946,6 @@ async function renderClaim(catalogScope, firestartrScope, claim, patches, previo
 /*
  * Function called when rendering but not importing
  *
@@ -307881,7 +307962,6 @@ async function renderer_render(catalogScope, firestartrScope, claimList) {
     const result = await renderClaims(catalogScope, firestartrScope, data);
     validateTfStateKeyUniqueness(result);
     validateCrSizes(result);
-    validatePermissionsUniqueness(result);
     return result;
 }
@@ -313671,6 +313751,16 @@ 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/claims/base/schemas/index.d.ts CHANGED Viewed

@@ -497,6 +497,12 @@ declare const schemas: {
                                 $ref: string;
                             };
                         };
+                        vars: {
+                            $ref: string;
+                        };
+                        secrets: {
+                            $ref: string;
+                        };
                     };
                     required: string[];
                     $ref?: undefined;
@@ -555,6 +561,100 @@ declare const schemas: {
                 })[];
             };
         };
+    } | {
+        $schema: string;
+        $id: string;
+        definitions: {
+            GithubComponentClaimVars: {
+                $id: string;
+                type: string;
+                properties: {
+                    actions: {
+                        type: string;
+                        items: {
+                            $ref: string;
+                        };
+                    };
+                    codespaces: {
+                        type: string;
+                        items: {
+                            $ref: string;
+                        };
+                    };
+                    dependabot: {
+                        type: string;
+                        items: {
+                            $ref: string;
+                        };
+                    };
+                };
+                additionalProperties: boolean;
+            };
+            GithubComponentClaimSecrets: {
+                $id: string;
+                type: string;
+                properties: {
+                    actions: {
+                        type: string;
+                        items: {
+                            $ref: string;
+                        };
+                    };
+                    codespaces: {
+                        type: string;
+                        items: {
+                            $ref: string;
+                        };
+                    };
+                    dependabot: {
+                        type: string;
+                        items: {
+                            $ref: string;
+                        };
+                    };
+                };
+                additionalProperties: boolean;
+            };
+            GithubComponentClaimSecretRef: {
+                $id: string;
+                type: string;
+                description: string;
+                pattern: string;
+            };
+            GithubComponentClaimRepoSecret: {
+                $id: string;
+                type: string;
+                description: string;
+                properties: {
+                    name: {
+                        type: string;
+                        description: string;
+                    };
+                    value: {
+                        $ref: string;
+                    };
+                };
+                required: string[];
+                additionalProperties: boolean;
+            };
+            GithubComponentClaimRepoVar: {
+                $id: string;
+                type: string;
+                description: string;
+                properties: {
+                    name: {
+                        type: string;
+                        description: string;
+                    };
+                    value: {
+                        type: string;
+                        description: string;
+                    };
+                };
+                required: string[];
+                additionalProperties: boolean;
+            };
+        };
     })[] | {
         $id: string;
         definitions: {

package/build/packages/cdk8s_renderer/src/claims/github/component.schema.d.ts CHANGED Viewed

@@ -29,6 +29,12 @@ declare const _default: {
                             $ref: string;
                         };
                     };
+                    vars: {
+                        $ref: string;
+                    };
+                    secrets: {
+                        $ref: string;
+                    };
                 };
                 required: string[];
                 $ref?: undefined;

package/build/packages/cdk8s_renderer/src/claims/github/component.secrets-vars.schema.d.ts ADDED Viewed

@@ -0,0 +1,96 @@
+declare const _default: {
+    $schema: string;
+    $id: string;
+    definitions: {
+        GithubComponentClaimVars: {
+            $id: string;
+            type: string;
+            properties: {
+                actions: {
+                    type: string;
+                    items: {
+                        $ref: string;
+                    };
+                };
+                codespaces: {
+                    type: string;
+                    items: {
+                        $ref: string;
+                    };
+                };
+                dependabot: {
+                    type: string;
+                    items: {
+                        $ref: string;
+                    };
+                };
+            };
+            additionalProperties: boolean;
+        };
+        GithubComponentClaimSecrets: {
+            $id: string;
+            type: string;
+            properties: {
+                actions: {
+                    type: string;
+                    items: {
+                        $ref: string;
+                    };
+                };
+                codespaces: {
+                    type: string;
+                    items: {
+                        $ref: string;
+                    };
+                };
+                dependabot: {
+                    type: string;
+                    items: {
+                        $ref: string;
+                    };
+                };
+            };
+            additionalProperties: boolean;
+        };
+        GithubComponentClaimSecretRef: {
+            $id: string;
+            type: string;
+            description: string;
+            pattern: string;
+        };
+        GithubComponentClaimRepoSecret: {
+            $id: string;
+            type: string;
+            description: string;
+            properties: {
+                name: {
+                    type: string;
+                    description: string;
+                };
+                value: {
+                    $ref: string;
+                };
+            };
+            required: string[];
+            additionalProperties: boolean;
+        };
+        GithubComponentClaimRepoVar: {
+            $id: string;
+            type: string;
+            description: string;
+            properties: {
+                name: {
+                    type: string;
+                    description: string;
+                };
+                value: {
+                    type: string;
+                    description: string;
+                };
+            };
+            required: string[];
+            additionalProperties: boolean;
+        };
+    };
+};
+export default _default;

package/build/packages/cdk8s_renderer/src/claims/github/index.d.ts CHANGED Viewed

@@ -134,6 +134,12 @@ export declare const GithubSchemas: ({
                             $ref: string;
                         };
                     };
+                    vars: {
+                        $ref: string;
+                    };
+                    secrets: {
+                        $ref: string;
+                    };
                 };
                 required: string[];
                 $ref?: undefined;
@@ -192,4 +198,98 @@ export declare const GithubSchemas: ({
             })[];
         };
     };
+} | {
+    $schema: string;
+    $id: string;
+    definitions: {
+        GithubComponentClaimVars: {
+            $id: string;
+            type: string;
+            properties: {
+                actions: {
+                    type: string;
+                    items: {
+                        $ref: string;
+                    };
+                };
+                codespaces: {
+                    type: string;
+                    items: {
+                        $ref: string;
+                    };
+                };
+                dependabot: {
+                    type: string;
+                    items: {
+                        $ref: string;
+                    };
+                };
+            };
+            additionalProperties: boolean;
+        };
+        GithubComponentClaimSecrets: {
+            $id: string;
+            type: string;
+            properties: {
+                actions: {
+                    type: string;
+                    items: {
+                        $ref: string;
+                    };
+                };
+                codespaces: {
+                    type: string;
+                    items: {
+                        $ref: string;
+                    };
+                };
+                dependabot: {
+                    type: string;
+                    items: {
+                        $ref: string;
+                    };
+                };
+            };
+            additionalProperties: boolean;
+        };
+        GithubComponentClaimSecretRef: {
+            $id: string;
+            type: string;
+            description: string;
+            pattern: string;
+        };
+        GithubComponentClaimRepoSecret: {
+            $id: string;
+            type: string;
+            description: string;
+            properties: {
+                name: {
+                    type: string;
+                    description: string;
+                };
+                value: {
+                    $ref: string;
+                };
+            };
+            required: string[];
+            additionalProperties: boolean;
+        };
+        GithubComponentClaimRepoVar: {
+            $id: string;
+            type: string;
+            description: string;
+            properties: {
+                name: {
+                    type: string;
+                    description: string;
+                };
+                value: {
+                    type: string;
+                    description: string;
+                };
+            };
+            required: string[];
+            additionalProperties: boolean;
+        };
+    };
 })[];

package/package.json CHANGED Viewed

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

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

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