@firestartr/cli 1.53.0-snapshot-6 → 1.53.0-snapshot-7

package/build/index.js

@@ -356807,10 +356807,6 @@ class SyncerInitializer extends InitializerPatches {
             const provider = helperCTX(ctx).provider;
             return claim.providers[provider].sync || {};
         }
-        function policyInfo(ctx) {
-            const provider = helperCTX(ctx).provider;
-            return claim.providers[provider].policy;
-        }
         return [
             {
                 validate(cr) {
@@ -356841,23 +356837,21 @@ class SyncerInitializer extends InitializerPatches {
                     }
                 },
                 apply(cr) {
-                    cr.metadata.annotations = cr.metadata.annotations || {};
-                    // Apply general policy annotation
-                    if (policyInfo(this)) {
-                        cr.metadata.annotations['firestartr.dev/policy'] =
-                            policyInfo(this);
-                    }
                     if (syncInfo(this).enabled) {
+                        cr.metadata.annotations = cr.metadata.annotations || {};
                         cr.metadata.annotations['firestartr.dev/sync-enabled'] = 'true';
                         if (syncInfo(this).period) {
+                            cr.metadata.annotations = cr.metadata.annotations || {};
                             cr.metadata.annotations['firestartr.dev/sync-period'] =
                                 syncInfo(this).period;
                         }
                         if (syncInfo(this).policy) {
+                            cr.metadata.annotations = cr.metadata.annotations || {};
                             cr.metadata.annotations['firestartr.dev/sync-policy'] =
                                 syncInfo(this).policy;
                         }
                         if (syncInfo(this).schedule) {
+                            cr.metadata.annotations = cr.metadata.annotations || {};
                             cr.metadata.annotations[SYNC_SCHED_ANNOTATION] =
                                 syncInfo(this).schedule;
                             cr.metadata.annotations[SYNC_SCHED_TIMEZONE_ANNOTATION] =
@@ -357578,69 +357572,6 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
             },
             additionalProperties: false,
         },
-        PolicyType: {
-            $id: 'firestartr.dev://common/PolicyType',
-            type: 'string',
-            description: 'Policy for resource management',
-            enum: [
-                'apply',
-                'create-only',
-                'create-update-only',
-                'full-control',
-                'observe',
-                'observe-only',
-            ],
-        },
-        SyncConfig: {
-            $id: 'firestartr.dev://common/SyncConfig',
-            type: 'object',
-            description: 'Sync configuration for resources',
-            properties: {
-                enabled: {
-                    type: 'boolean',
-                    description: 'Enable periodic sync operations',
-                },
-                period: {
-                    type: 'string',
-                    pattern: '^[0-9]+[smhd]$',
-                    description: 'Sync period (e.g., 1h, 30m, 5s). Must be enabled without schedule.',
-                },
-                schedule: {
-                    type: 'string',
-                    description: 'Cron schedule for sync operations. Must be enabled without period.',
-                },
-                schedule_timezone: {
-                    type: 'string',
-                    description: 'Timezone for cron schedule (e.g., UTC, America/New_York)',
-                },
-                policy: {
-                    type: 'string',
-                    description: 'Policy for sync operations (apply or observe)',
-                },
-            },
-            additionalProperties: false,
-            required: ['enabled'],
-            oneOf: [
-                {
-                    required: ['period'],
-                },
-                {
-                    required: ['schedule'],
-                },
-                {
-                    not: {
-                        anyOf: [
-                            {
-                                required: ['period'],
-                            },
-                            {
-                                required: ['schedule'],
-                            },
-                        ],
-                    },
-                },
-            ],
-        },
     },
 });
 
@@ -358001,9 +357932,6 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                 {
                     type: 'object',
                     properties: {
-                        policy: {
-                            $ref: 'firestartr.dev://common/PolicyType',
-                        },
                         privacy: {
                             type: 'string',
                             enum: ['closed', 'secret'],
@@ -358014,9 +357942,6 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                         org: {
                             type: 'string',
                         },
-                        sync: {
-                            $ref: 'firestartr.dev://common/SyncConfig',
-                        },
                     },
                     required: ['org', 'privacy'],
                 },
@@ -358042,9 +357967,6 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                 {
                     type: 'object',
                     properties: {
-                        policy: {
-                            $ref: 'firestartr.dev://common/PolicyType',
-                        },
                         role: {
                             type: 'string',
                             enum: ['admin', 'member'],
@@ -358052,9 +357974,6 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                         org: {
                             type: 'string',
                         },
-                        sync: {
-                            $ref: 'firestartr.dev://common/SyncConfig',
-                        },
                     },
                     required: ['org', 'role'],
                 },
@@ -358079,9 +357998,6 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                 {
                     type: 'object',
                     properties: {
-                        policy: {
-                            $ref: 'firestartr.dev://common/PolicyType',
-                        },
                         org: {
                             type: 'string',
                             description: 'The github organization name',
@@ -358090,9 +358006,6 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                             type: 'string',
                             enum: ['private', 'public', 'internal'],
                         },
-                        sync: {
-                            $ref: 'firestartr.dev://common/SyncConfig',
-                        },
                         features: {
                             type: 'array',
                             items: {
@@ -358128,9 +358041,6 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                 {
                     type: 'object',
                     properties: {
-                        policy: {
-                            $ref: 'firestartr.dev://common/PolicyType',
-                        },
                         orgName: {
                             type: 'string',
                             description: 'Organization name on GitHub',
@@ -358164,9 +358074,6 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                             },
                             required: ['url', 'contentType', 'events', 'secretRef'],
                         },
-                        sync: {
-                            $ref: 'firestartr.dev://common/SyncConfig',
-                        },
                     },
                     required: ['orgName', 'webhook'],
                 },
@@ -358338,7 +358245,15 @@ const GithubSchemas = [
                     type: 'object',
                     properties: {
                         policy: {
-                            $ref: 'firestartr.dev://common/PolicyType',
+                            type: 'string',
+                            enum: [
+                                'apply',
+                                'create-only',
+                                'create-update-only',
+                                'full-control',
+                                'observe',
+                                'observe-only',
+                            ],
                         },
                         name: {
                             type: 'string',
@@ -358348,7 +358263,47 @@ const GithubSchemas = [
                             enum: ['remote', 'inline', 'Remote', 'Inline'],
                         },
                         sync: {
-                            $ref: 'firestartr.dev://common/SyncConfig',
+                            type: 'object',
+                            properties: {
+                                enabled: {
+                                    type: 'boolean',
+                                },
+                                period: {
+                                    type: 'string',
+                                    pattern: '^[0-9]+[smhd]$',
+                                },
+                                schedule: {
+                                    type: 'string',
+                                },
+                                schedule_timezone: {
+                                    type: 'string',
+                                },
+                                policy: {
+                                    type: 'string',
+                                },
+                            },
+                            additionalProperties: false,
+                            required: ['enabled'],
+                            oneOf: [
+                                {
+                                    required: ['period'],
+                                },
+                                {
+                                    required: ['schedule'],
+                                },
+                                {
+                                    not: {
+                                        anyOf: [
+                                            {
+                                                required: ['period'],
+                                            },
+                                            {
+                                                required: ['schedule'],
+                                            },
+                                        ],
+                                    },
+                                },
+                            ],
                         },
                         valuesSchema: {
                             type: 'string',
@@ -370455,15 +370410,10 @@ class Resource {
         this.set('operation', operation);
         this.set('deps', deps);
     }
-    async run(options) {
+    async run() {
         await this.preprocess();
         await this.synth();
-        if (options?.planOnly) {
-            await this.runTerraformPlanOnly();
-        }
-        else {
-            await this.runTerraform();
-        }
+        await this.runTerraform();
         await this.postprocess();
         if (this.logStream) {
             this.logStream.end();
@@ -370488,13 +370438,6 @@ class Resource {
     log(msg) {
         this.logFn(msg);
     }
-    async runTerraformPlanOnly() {
-        await this.onTFStreaming();
-        let output = '';
-        output += await terraformInit(this.get('main_artifact'), this.logStream);
-        output += await terraformPlan(this.get('main_artifact'), this.logStream);
-        this.set('output', output);
-    }
     async runTerraform() {
         await this.onTFStreaming();
         let output = '';
@@ -370882,7 +370825,7 @@ async function runProvisioner(data, opts) {
     if ('logStreamCallbacksTF' in opts) {
         resource.setTFStreamLogs(opts['logStreamCallbacksTF']);
     }
-    await resource.run({ planOnly: opts.planOnly });
+    await resource.run();
     return resource;
 }
 function createInstanceOf(entity, op, deps) {
@@ -371164,51 +371107,6 @@ function helperCreateCheckRunName(cmd, item) {
     return `${item.kind} - ${cmd}`;
 }
 
-;// CONCATENATED MODULE: ../operator/src/utils/index.ts
-const secretRegex = /\$\{\{ secrets\.(.*?) \}\}/g;
-function replaceConfigSecrets(config, secrets) {
-    for (const key in config) {
-        if (typeof config[key] === 'object' && config[key] !== null) {
-            // If the property is an object, call this function recursively
-            replaceConfigSecrets(config[key], secrets);
-        }
-        else if (typeof config[key] === 'string') {
-            // If the property is a string and its value is equal to secrets.something,
-            // replace the value with the value of the 'something' key in the secrets object
-            config[key] = config[key].replace(secretRegex, (_, group1) => {
-                if (!secrets[group1]) {
-                    throw new Error(`Secret ${group1} not found in secrets`);
-                }
-                return secrets[group1];
-            });
-        }
-    }
-    return config;
-}
-function replaceInlineSecrets(inline, secrets) {
-    if (typeof inline !== 'string' || !inline)
-        return inline;
-    let result = inline;
-    result = result.replace(secretRegex, (_, group1) => {
-        if (!secrets[group1]) {
-            throw new Error(`Secret ${group1} not found in secrets`);
-        }
-        return secrets[group1];
-    });
-    return result;
-}
-/**
- * Retrieves a policy annotation value from a custom resource
- * @param item - The CR to get the policy from
- * @param annotation - The annotation key to retrieve
- * @returns The policy value, or undefined if not set
- */
-function getPolicy(item, annotation) {
-    const policy = item.metadata.annotations && item.metadata.annotations[annotation];
-    if (policy)
-        return policy;
-}
-
 ;// CONCATENATED MODULE: ../operator/cdktf.ts
 
 
@@ -371218,17 +371116,9 @@ function getPolicy(item, annotation) {
 
 
 
-
-const cdktf_LAST_STATE_PR_ANNOTATION = 'firestartr.dev/last-state-pr';
 function processOperation(item, op, handler) {
     operator_src_logger.info(`Processing operation ${op} on ${item.kind}/${item.metadata?.name}`);
     try {
-        const policy = getPolicy(item, 'firestartr.dev/policy');
-        // If general policy is observe/observe-only, route to observe mode instead of apply
-        if (!policy || policy === 'observe' || policy === 'observe-only') {
-            operator_src_logger.info(`Policy is '${policy || 'not set (default)'}', routing to observe mode`);
-            return cdktf_observe(item, op, handler);
-        }
         switch (op) {
             case OperationType.UPDATED:
                 return updated(item, op, handler);
@@ -371253,11 +371143,6 @@ function processOperation(item, op, handler) {
         throw e;
     }
 }
-async function* cdktf_observe(item, op, handler) {
-    for await (const transition of doPlan(item, op, handler)) {
-        yield transition;
-    }
-}
 async function* created(item, op, handler) {
     for await (const transition of doApply(item, op, handler)) {
         yield transition;
@@ -371293,18 +371178,8 @@ async function* sync(item, op, handler) {
         status: 'False',
         message: 'Synth CDKTF',
     };
-    const syncPolicy = getPolicy(item, 'firestartr.dev/sync-policy');
-    if (syncPolicy === 'apply') {
-        operator_src_logger.info(`SYNC OPERATION: applying item ${item.metadata.name} with sync-policy=${syncPolicy}`);
-        for await (const transition of doApply(item, op, handler)) {
-            yield transition;
-        }
-    }
-    else {
-        operator_src_logger.info(`SYNC OPERATION: planning item ${item.metadata.name} with sync-policy=${syncPolicy || 'default (observe)'}`);
-        for await (const transition of doPlan(item, op, handler)) {
-            yield transition;
-        }
+    for await (const transition of doApply(item, op, handler)) {
+        yield transition;
     }
     yield {
         item,
@@ -371343,14 +371218,15 @@ async function* markedToDeletion(item, op, handler) {
             message: 'Destroying process started',
         };
         const deps = await handler.resolveReferences();
-        const statePr = item?.metadata?.annotations?.[cdktf_LAST_STATE_PR_ANNOTATION];
+        const annotation = 'firestartr.dev/last-state-pr';
+        const statePr = item?.metadata?.annotations?.[annotation];
         const hasStatePr = typeof statePr === 'string' && statePr.trim().length > 0;
         if (!hasStatePr) {
             operator_src_logger.warn(`CR ${item?.kind ?? 'UnknownKind'}/${item?.metadata?.name ?? 'unknown'} ` +
-                `has no "${cdktf_LAST_STATE_PR_ANNOTATION}" annotation; skipping GitHub Check Runs (synth, terraform apply).`);
+                `has no "${annotation}" annotation; skipping GitHub Check Runs (synth, terraform apply).`);
         }
         else {
-            operator_src_logger.debug(`CR ${item.kind}/${item.metadata.name} uses "${cdktf_LAST_STATE_PR_ANNOTATION}" = ${statePr}`);
+            operator_src_logger.debug(`CR ${item.kind}/${item.metadata.name} uses "${annotation}" = ${statePr}`);
         }
         const destroyOutput = await provisioner.runProvisioner({
             mainCr: item,
@@ -371385,7 +371261,7 @@ async function* markedToDeletion(item, op, handler) {
         };
         await handler.finalize(handler.pluralKind, item.metadata.namespace, item, 'firestartr.dev/finalizer');
         await handler.writeTerraformOutputInTfResult(item, output);
-        if (item.metadata.annotations[cdktf_LAST_STATE_PR_ANNOTATION] || false) {
+        if (item.metadata.annotations['firestartr.dev/last-state-pr'] || false) {
             await addDestroyCommitStatus(item, 'success', 'Destroy operation completed', `Terraform Destroy ${item.metadata.name}`);
         }
         void handler.success();
@@ -371466,14 +371342,15 @@ async function* doApply(item, op, handler) {
         }
         const deps = await handler.resolveReferences();
         operator_src_logger.info(`Item ${item.metadata.name} has the following dependencies: ${deps}`);
-        const statePr = item?.metadata?.annotations?.[cdktf_LAST_STATE_PR_ANNOTATION];
+        const annotation = 'firestartr.dev/last-state-pr';
+        const statePr = item?.metadata?.annotations?.[annotation];
         const hasStatePr = typeof statePr === 'string' && statePr.trim().length > 0;
         if (!hasStatePr) {
             operator_src_logger.warn(`CR ${item?.kind ?? 'UnknownKind'}/${item?.metadata?.name ?? 'unknown'} ` +
-                `has no "${cdktf_LAST_STATE_PR_ANNOTATION}" annotation; skipping GitHub Check Runs (synth, terraform apply).`);
+                `has no "${annotation}" annotation; skipping GitHub Check Runs (synth, terraform apply).`);
         }
         else {
-            operator_src_logger.debug(`CR ${item.kind}/${item.metadata.name} uses "${cdktf_LAST_STATE_PR_ANNOTATION}" = ${statePr}`);
+            operator_src_logger.debug(`CR ${item.kind}/${item.metadata.name} uses "${annotation}" = ${statePr}`);
         }
         const applyOutput = await provisioner.runProvisioner({
             mainCr: item,
@@ -371569,219 +371446,6 @@ async function* doApply(item, op, handler) {
         }
     }
 }
-async function* doPlan(item, op, handler) {
-    let checkRunCtl;
-    try {
-        cleanTerraformState();
-        yield {
-            item,
-            reason: op,
-            type: 'PLANNING',
-            status: 'True',
-            message: 'Planning process started',
-        };
-        const deps = await handler.resolveReferences();
-        const statePr = item?.metadata?.annotations?.[cdktf_LAST_STATE_PR_ANNOTATION];
-        const hasStatePr = typeof statePr === 'string' && statePr.trim().length > 0;
-        if (!hasStatePr) {
-            operator_src_logger.warn(`CR ${item?.kind ?? 'UnknownKind'}/${item?.metadata?.name ?? 'unknown'} ` +
-                `has no "${cdktf_LAST_STATE_PR_ANNOTATION}" annotation; skipping GitHub Check Runs for plan.`);
-        }
-        else {
-            operator_src_logger.debug(`CR ${item.kind}/${item.metadata.name} uses "${cdktf_LAST_STATE_PR_ANNOTATION}" = ${statePr}`);
-            await addPlanStatusCheck(statePr, 'CDKTF plan in progress...');
-        }
-        // Run provisioner in plan-only mode
-        const planResult = await provisioner.runProvisioner({ mainCr: item, deps }, {
-            planOnly: true,
-            delete: 'deletionTimestamp' in item.metadata,
-            ...(hasStatePr
-                ? {
-                    logStreamCallbacksCDKTF: {
-                        prepare: async () => {
-                            checkRunCtl = await GHCheckRun('synth', item);
-                            return checkRunCtl;
-                        },
-                    },
-                    logStreamCallbacksTF: {
-                        prepare: async () => {
-                            checkRunCtl = await GHCheckRun('plan', item);
-                            return checkRunCtl;
-                        },
-                    },
-                }
-                : {}),
-        });
-        const planOutput = planResult?.output || '';
-        // Parse terraform plan output to detect changes
-        // Handles multiple Terraform output formats and versions
-        const hasChanges = detectPlanChanges(planOutput);
-        if (hasChanges) {
-            yield {
-                item,
-                reason: op,
-                type: 'OUT_OF_SYNC',
-                status: 'True',
-                message: 'Plan has changes',
-            };
-            yield {
-                item,
-                reason: op,
-                type: 'PROVISIONED',
-                status: 'False',
-                message: 'Plan has changes',
-            };
-        }
-        else {
-            yield {
-                item,
-                reason: op,
-                type: 'OUT_OF_SYNC',
-                status: 'False',
-                message: 'Plan has no changes',
-            };
-            yield {
-                item,
-                reason: op,
-                type: 'PROVISIONED',
-                status: 'True',
-                message: 'Plan has no changes',
-            };
-        }
-        // Store plan details for later reference
-        yield {
-            item,
-            reason: op,
-            type: 'LAST_PLAN_DETAILS',
-            status: 'Unknown',
-            message: planOutput,
-        };
-        yield {
-            item,
-            reason: op,
-            type: 'PLANNING',
-            status: 'False',
-            message: 'Planning process finished',
-        };
-        if (hasStatePr) {
-            await addPlanStatusCheck(statePr, hasChanges ? 'Plan has changes' : 'Plan has no changes', 'completed');
-        }
-    }
-    catch (e) {
-        operator_src_logger.error(`CDKTF plan failed: ${e}`);
-        if (checkRunCtl) {
-            checkRunCtl.fnOnError(e);
-        }
-        yield {
-            item,
-            reason: op,
-            type: 'ERROR',
-            status: 'True',
-            message: e.toString(),
-        };
-        yield {
-            item,
-            reason: op,
-            type: 'PLANNING',
-            status: 'False',
-            message: e.toString(),
-        };
-        yield {
-            item,
-            reason: op,
-            type: 'PROVISIONED',
-            status: 'False',
-            message: e.toString(),
-        };
-        const statePr = item?.metadata?.annotations?.[cdktf_LAST_STATE_PR_ANNOTATION];
-        if (statePr) {
-            const summaryText = tryCreateErrorSummary('CDKTF Plan failed', e);
-            await addPlanStatusCheck(statePr, summaryText, 'completed', true);
-        }
-        await handler.writeTerraformOutputInTfResult(item, e);
-        void handler.error();
-    }
-}
-/**
- * Detects if a Terraform plan output contains changes
- * Handles multiple Terraform versions and output formats
- * @param planOutput - The text output from terraform plan
- * @returns true if changes are detected, false otherwise
- */
-function detectPlanChanges(planOutput) {
-    if (!planOutput || planOutput.trim().length === 0) {
-        return false;
-    }
-    // Normalize the output for consistent matching
-    const normalized = planOutput.toLowerCase();
-    // Pattern 1: "Plan: X to add, Y to change, Z to destroy"
-    // Matches: "Plan: 1 to add, 0 to change, 0 to destroy"
-    const planPattern = /plan:\s*(\d+)\s+to\s+add,\s*(\d+)\s+to\s+change,\s*(\d+)\s+to\s+destroy/i;
-    const planMatch = planOutput.match(planPattern);
-    if (planMatch) {
-        const add = Number(planMatch[1]);
-        const change = Number(planMatch[2]);
-        const destroy = Number(planMatch[3]);
-        if (add > 0 || change > 0 || destroy > 0) {
-            return true;
-        }
-        // Explicitly found "Plan:" with 0/0/0 - no changes
-        return false;
-    }
-    // Pattern 2: Individual change indicators
-    // Handles variations like "1 to add", "2 to change", "3 to destroy"
-    const hasAdditions = /\d+\s+to\s+add/i.test(planOutput);
-    const hasChanges = /\d+\s+to\s+change/i.test(planOutput);
-    const hasDestructions = /\d+\s+to\s+destroy/i.test(planOutput);
-    const hasImports = /\d+\s+to\s+import/i.test(planOutput);
-    if (hasAdditions || hasChanges || hasDestructions || hasImports) {
-        return true;
-    }
-    // Pattern 3: Resource-level change indicators
-    // Matches: "# resource will be created", "# resource will be updated", etc.
-    const resourceChangePatterns = [
-        /will\s+be\s+(created|destroyed|updated|replaced)/i,
-        /must\s+be\s+(created|destroyed|updated|replaced)/i,
-        /#.*\s+(create|destroy|update|replace)/i,
-    ];
-    for (const pattern of resourceChangePatterns) {
-        if (pattern.test(planOutput)) {
-            return true;
-        }
-    }
-    // Pattern 4: Action symbols in plan output
-    // Terraform uses symbols like +, -, ~, -/+ to indicate changes
-    const actionSymbols = [
-        /^\s*[+]\s+/m,
-        /^\s*[-]\s+/m,
-        /^\s*[~]\s+/m,
-        /^\s*[-][/][+]\s+/m, // Replace
-    ];
-    for (const pattern of actionSymbols) {
-        if (pattern.test(planOutput)) {
-            return true;
-        }
-    }
-    // Pattern 5: No changes messages (inverse check)
-    const noChangesPatterns = [
-        /no\s+changes/i,
-        /infrastructure\s+is\s+up[-\s]to[-\s]date/i,
-        /your\s+infrastructure\s+matches\s+the\s+configuration/i,
-        /0\s+to\s+add,\s*0\s+to\s+change,\s*0\s+to\s+destroy/i,
-    ];
-    for (const pattern of noChangesPatterns) {
-        if (pattern.test(planOutput)) {
-            return false;
-        }
-    }
-    // If we find "Plan:" keyword but couldn't parse it, log a warning and assume no changes
-    if (normalized.includes('plan:')) {
-        operator_src_logger.warn('Found "Plan:" in output but could not parse change counts. Assuming no changes.');
-        return false;
-    }
-    // Default: assume no changes if we can't detect any
-    return false;
-}
 function cleanTerraformState() {
     external_fs_.rmSync('/library/packages/provisioner/cdktf.out', {
         recursive: true,
@@ -372781,6 +372445,40 @@ function tf_checkrun_helperCreateCheckRunName(cmd) {
     return `TFWorkspace - ${cmd}`;
 }
 
+;// CONCATENATED MODULE: ../operator/src/utils/index.ts
+const secretRegex = /\$\{\{ secrets\.(.*?) \}\}/g;
+function replaceConfigSecrets(config, secrets) {
+    for (const key in config) {
+        if (typeof config[key] === 'object' && config[key] !== null) {
+            // If the property is an object, call this function recursively
+            replaceConfigSecrets(config[key], secrets);
+        }
+        else if (typeof config[key] === 'string') {
+            // If the property is a string and its value is equal to secrets.something,
+            // replace the value with the value of the 'something' key in the secrets object
+            config[key] = config[key].replace(secretRegex, (_, group1) => {
+                if (!secrets[group1]) {
+                    throw new Error(`Secret ${group1} not found in secrets`);
+                }
+                return secrets[group1];
+            });
+        }
+    }
+    return config;
+}
+function replaceInlineSecrets(inline, secrets) {
+    if (typeof inline !== 'string' || !inline)
+        return inline;
+    let result = inline;
+    result = result.replace(secretRegex, (_, group1) => {
+        if (!secrets[group1]) {
+            throw new Error(`Secret ${group1} not found in secrets`);
+        }
+        return secrets[group1];
+    });
+    return result;
+}
+
 ;// CONCATENATED MODULE: ../operator/src/tfworkspaces/process-operation.ts
 
 
@@ -372971,6 +372669,11 @@ async function* process_operation_renamed(item, op, handler) {
         yield transition;
     }
 }
+function getPolicy(item, annotation) {
+    const policy = item.metadata.annotations && item.metadata.annotations[annotation];
+    if (policy)
+        return policy;
+}
 async function* process_operation_updated(item, op, handler) {
     for await (const transition of process_operation_doApply(item, op, handler)) {
         yield transition;
@@ -373614,7 +373317,7 @@ const processOperationPlan_TF_PROJECTS_PATH = '/tmp/tfworkspaces';
 function processOperationPlan(item, op, handler) {
     try {
         processOperationPlan_clearLocalTfProjects();
-        const policy = getPolicy(item, 'firestartr.dev/policy');
+        const policy = processOperationPlan_getPolicy(item);
         if (policy === 'observe' || policy === 'apply') {
             return processOperationPlan_plan(item, op, handler);
         }
@@ -374061,6 +373764,12 @@ function processOperationPlan_getErrorOutputMessage(cr, key, ref) {
         throw new Error(`❌ Source ${cr.spec.source} not supported`);
     }
 }
+function processOperationPlan_getPolicy(item) {
+    const policy = item.metadata.annotations &&
+        item.metadata.annotations['firestartr.dev/policy'];
+    if (policy)
+        return policy;
+}
 
 ;// CONCATENATED MODULE: ../operator/src/ctx.ts
 class Ctx {

package/build/packages/cdk8s_renderer/src/claims/base/schemas/common-meta.schema.d.ts

@@ -91,53 +91,6 @@ declare const _default: {
             };
             additionalProperties: boolean;
         };
-        PolicyType: {
-            $id: string;
-            type: string;
-            description: string;
-            enum: string[];
-        };
-        SyncConfig: {
-            $id: string;
-            type: string;
-            description: string;
-            properties: {
-                enabled: {
-                    type: string;
-                    description: string;
-                };
-                period: {
-                    type: string;
-                    pattern: string;
-                    description: string;
-                };
-                schedule: {
-                    type: string;
-                    description: string;
-                };
-                schedule_timezone: {
-                    type: string;
-                    description: string;
-                };
-                policy: {
-                    type: string;
-                    description: string;
-                };
-            };
-            additionalProperties: boolean;
-            required: string[];
-            oneOf: ({
-                required: string[];
-                not?: undefined;
-            } | {
-                not: {
-                    anyOf: {
-                        required: string[];
-                    }[];
-                };
-                required?: undefined;
-            })[];
-        };
     };
 };
 export default _default;

package/build/packages/cdk8s_renderer/src/claims/base/schemas/index.d.ts

@@ -95,53 +95,6 @@ declare const schemas: {
                 };
                 additionalProperties: boolean;
             };
-            PolicyType: {
-                $id: string;
-                type: string;
-                description: string;
-                enum: string[];
-            };
-            SyncConfig: {
-                $id: string;
-                type: string;
-                description: string;
-                properties: {
-                    enabled: {
-                        type: string;
-                        description: string;
-                    };
-                    period: {
-                        type: string;
-                        pattern: string;
-                        description: string;
-                    };
-                    schedule: {
-                        type: string;
-                        description: string;
-                    };
-                    schedule_timezone: {
-                        type: string;
-                        description: string;
-                    };
-                    policy: {
-                        type: string;
-                        description: string;
-                    };
-                };
-                additionalProperties: boolean;
-                required: string[];
-                oneOf: ({
-                    required: string[];
-                    not?: undefined;
-                } | {
-                    not: {
-                        anyOf: {
-                            required: string[];
-                        }[];
-                    };
-                    required?: undefined;
-                })[];
-            };
         };
     } | {
         $schema: string;
@@ -426,9 +379,6 @@ declare const schemas: {
                 } | {
                     type: string;
                     properties: {
-                        policy: {
-                            $ref: string;
-                        };
                         privacy: {
                             type: string;
                             enum: string[];
@@ -439,9 +389,6 @@ declare const schemas: {
                         org: {
                             type: string;
                         };
-                        sync: {
-                            $ref: string;
-                        };
                     };
                     required: string[];
                     $ref?: undefined;
@@ -464,9 +411,6 @@ declare const schemas: {
                 } | {
                     type: string;
                     properties: {
-                        policy: {
-                            $ref: string;
-                        };
                         role: {
                             type: string;
                             enum: string[];
@@ -474,9 +418,6 @@ declare const schemas: {
                         org: {
                             type: string;
                         };
-                        sync: {
-                            $ref: string;
-                        };
                     };
                     required: string[];
                     $ref?: undefined;
@@ -544,9 +485,6 @@ declare const schemas: {
                 } | {
                     type: string;
                     properties: {
-                        policy: {
-                            $ref: string;
-                        };
                         org: {
                             type: string;
                             description: string;
@@ -555,9 +493,6 @@ declare const schemas: {
                             type: string;
                             enum: string[];
                         };
-                        sync: {
-                            $ref: string;
-                        };
                         features: {
                             type: string;
                             items: {
@@ -592,9 +527,6 @@ declare const schemas: {
                 } | {
                     type: string;
                     properties: {
-                        policy: {
-                            $ref: string;
-                        };
                         orgName: {
                             type: string;
                             description: string;
@@ -628,9 +560,6 @@ declare const schemas: {
                             };
                             required: string[];
                         };
-                        sync: {
-                            $ref: string;
-                        };
                     };
                     required: string[];
                     $ref?: undefined;
@@ -735,7 +664,8 @@ declare const schemas: {
                     type: string;
                     properties: {
                         policy: {
-                            $ref: string;
+                            type: string;
+                            enum: string[];
                         };
                         name: {
                             type: string;
@@ -745,7 +675,38 @@ declare const schemas: {
                             enum: string[];
                         };
                         sync: {
-                            $ref: string;
+                            type: string;
+                            properties: {
+                                enabled: {
+                                    type: string;
+                                };
+                                period: {
+                                    type: string;
+                                    pattern: string;
+                                };
+                                schedule: {
+                                    type: string;
+                                };
+                                schedule_timezone: {
+                                    type: string;
+                                };
+                                policy: {
+                                    type: string;
+                                };
+                            };
+                            additionalProperties: boolean;
+                            required: string[];
+                            oneOf: ({
+                                required: string[];
+                                not?: undefined;
+                            } | {
+                                not: {
+                                    anyOf: {
+                                        required: string[];
+                                    }[];
+                                };
+                                required?: undefined;
+                            })[];
                         };
                         valuesSchema: {
                             type: string;

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

@@ -15,9 +15,6 @@ declare const _default: {
             } | {
                 type: string;
                 properties: {
-                    policy: {
-                        $ref: string;
-                    };
                     org: {
                         type: string;
                         description: string;
@@ -26,9 +23,6 @@ declare const _default: {
                         type: string;
                         enum: string[];
                     };
-                    sync: {
-                        $ref: string;
-                    };
                     features: {
                         type: string;
                         items: {

package/build/packages/cdk8s_renderer/src/claims/github/group.schema.d.ts

@@ -14,9 +14,6 @@ declare const _default: {
             } | {
                 type: string;
                 properties: {
-                    policy: {
-                        $ref: string;
-                    };
                     privacy: {
                         type: string;
                         enum: string[];
@@ -27,9 +24,6 @@ declare const _default: {
                     org: {
                         type: string;
                     };
-                    sync: {
-                        $ref: string;
-                    };
                 };
                 required: string[];
                 $ref?: undefined;

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

@@ -14,9 +14,6 @@ export declare const GithubSchemas: ({
             } | {
                 type: string;
                 properties: {
-                    policy: {
-                        $ref: string;
-                    };
                     privacy: {
                         type: string;
                         enum: string[];
@@ -27,9 +24,6 @@ export declare const GithubSchemas: ({
                     org: {
                         type: string;
                     };
-                    sync: {
-                        $ref: string;
-                    };
                 };
                 required: string[];
                 $ref?: undefined;
@@ -52,9 +46,6 @@ export declare const GithubSchemas: ({
             } | {
                 type: string;
                 properties: {
-                    policy: {
-                        $ref: string;
-                    };
                     role: {
                         type: string;
                         enum: string[];
@@ -62,9 +53,6 @@ export declare const GithubSchemas: ({
                     org: {
                         type: string;
                     };
-                    sync: {
-                        $ref: string;
-                    };
                 };
                 required: string[];
                 $ref?: undefined;
@@ -132,9 +120,6 @@ export declare const GithubSchemas: ({
             } | {
                 type: string;
                 properties: {
-                    policy: {
-                        $ref: string;
-                    };
                     org: {
                         type: string;
                         description: string;
@@ -143,9 +128,6 @@ export declare const GithubSchemas: ({
                         type: string;
                         enum: string[];
                     };
-                    sync: {
-                        $ref: string;
-                    };
                     features: {
                         type: string;
                         items: {
@@ -180,9 +162,6 @@ export declare const GithubSchemas: ({
             } | {
                 type: string;
                 properties: {
-                    policy: {
-                        $ref: string;
-                    };
                     orgName: {
                         type: string;
                         description: string;
@@ -216,9 +195,6 @@ export declare const GithubSchemas: ({
                         };
                         required: string[];
                     };
-                    sync: {
-                        $ref: string;
-                    };
                 };
                 required: string[];
                 $ref?: undefined;

package/build/packages/cdk8s_renderer/src/claims/github/orgwebhook.schema.d.ts

@@ -14,9 +14,6 @@ declare const _default: {
             } | {
                 type: string;
                 properties: {
-                    policy: {
-                        $ref: string;
-                    };
                     orgName: {
                         type: string;
                         description: string;
@@ -50,9 +47,6 @@ declare const _default: {
                         };
                         required: string[];
                     };
-                    sync: {
-                        $ref: string;
-                    };
                 };
                 required: string[];
                 $ref?: undefined;

package/build/packages/cdk8s_renderer/src/claims/github/user.schema.d.ts

@@ -14,9 +14,6 @@ declare const _default: {
             } | {
                 type: string;
                 properties: {
-                    policy: {
-                        $ref: string;
-                    };
                     role: {
                         type: string;
                         enum: string[];
@@ -24,9 +21,6 @@ declare const _default: {
                     org: {
                         type: string;
                     };
-                    sync: {
-                        $ref: string;
-                    };
                 };
                 required: string[];
                 $ref?: undefined;

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

@@ -14,7 +14,8 @@ export declare const TerraformSchemas: {
                 type: string;
                 properties: {
                     policy: {
-                        $ref: string;
+                        type: string;
+                        enum: string[];
                     };
                     name: {
                         type: string;
@@ -24,7 +25,38 @@ export declare const TerraformSchemas: {
                         enum: string[];
                     };
                     sync: {
-                        $ref: string;
+                        type: string;
+                        properties: {
+                            enabled: {
+                                type: string;
+                            };
+                            period: {
+                                type: string;
+                                pattern: string;
+                            };
+                            schedule: {
+                                type: string;
+                            };
+                            schedule_timezone: {
+                                type: string;
+                            };
+                            policy: {
+                                type: string;
+                            };
+                        };
+                        additionalProperties: boolean;
+                        required: string[];
+                        oneOf: ({
+                            required: string[];
+                            not?: undefined;
+                        } | {
+                            not: {
+                                anyOf: {
+                                    required: string[];
+                                }[];
+                            };
+                            required?: undefined;
+                        })[];
                     };
                     valuesSchema: {
                         type: string;

package/build/packages/cdk8s_renderer/src/claims/tfworkspaces/terraform.schema.d.ts

@@ -14,7 +14,8 @@ declare const _default: {
                 type: string;
                 properties: {
                     policy: {
-                        $ref: string;
+                        type: string;
+                        enum: string[];
                     };
                     name: {
                         type: string;
@@ -24,7 +25,38 @@ declare const _default: {
                         enum: string[];
                     };
                     sync: {
-                        $ref: string;
+                        type: string;
+                        properties: {
+                            enabled: {
+                                type: string;
+                            };
+                            period: {
+                                type: string;
+                                pattern: string;
+                            };
+                            schedule: {
+                                type: string;
+                            };
+                            schedule_timezone: {
+                                type: string;
+                            };
+                            policy: {
+                                type: string;
+                            };
+                        };
+                        additionalProperties: boolean;
+                        required: string[];
+                        oneOf: ({
+                            required: string[];
+                            not?: undefined;
+                        } | {
+                            not: {
+                                anyOf: {
+                                    required: string[];
+                                }[];
+                            };
+                            required?: undefined;
+                        })[];
                     };
                     valuesSchema: {
                         type: string;

package/build/packages/operator/src/utils/index.d.ts

@@ -1,9 +1,2 @@
 export declare function replaceConfigSecrets(config: any, secrets: any): any;
 export declare function replaceInlineSecrets(inline: string, secrets: any): string;
-/**
- * Retrieves a policy annotation value from a custom resource
- * @param item - The CR to get the policy from
- * @param annotation - The annotation key to retrieve
- * @returns The policy value, or undefined if not set
- */
-export declare function getPolicy(item: any, annotation: string): string | undefined;

package/build/packages/provisioner/src/resources/resource.d.ts

@@ -14,13 +14,10 @@ export declare class Resource {
     onTFStreaming(): Promise<void>;
     setLogStream(fnData: Function, fnEnd: Function, reopen?: boolean): void;
     constructor(mainCR: any, operation: string, deps?: any[]);
-    run(options?: {
-        planOnly?: boolean;
-    }): Promise<void>;
+    run(): Promise<void>;
     artifact(): any;
     synth(): Promise<void>;
     log(msg: string): void;
-    runTerraformPlanOnly(): Promise<void>;
     runTerraform(): Promise<void>;
     preprocess(): Promise<void>;
     postprocess(): Promise<void>;

package/package.json

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