@firestartr/cli 2.4.0-snapshot-3 → 2.4.0-snapshot-5

package/build/index.js

@@ -293774,6 +293774,7 @@ function toJson_FirestartrGithubRepositorySpecRepo(obj) {
         'allowUpdateBranch': obj.allowUpdateBranch,
         'hasIssues': obj.hasIssues,
         'hasWiki': obj.hasWiki,
+        'pages': obj.pages,
         'topics': obj.topics?.map(y => y),
         'labels': obj.labels?.map(y => toJson_FirestartrGithubRepositorySpecRepoLabels(y)),
         'visibility': obj.visibility,
@@ -297174,32 +297175,6 @@ function searchSecretKey(secretClaim, key) {
     return found;
 }
 
-;// CONCATENATED MODULE: ../cdk8s_renderer/src/validations/componentPagesPath.ts
-/**
- * Throws if any ComponentClaim's providers.github.pages.path is set to any value other than '/' or '/docs'.
- * Should be called as a final render-time validation (never mutates input).
- */
-function validateComponentPagesPath(renderClaims) {
-    for (const ref of Object.keys(renderClaims)) {
-        const claimEntry = renderClaims[ref];
-        // Heuristic: claim.kind === 'ComponentClaim' (may need to adjust based on naming)
-        if (claimEntry.claim &&
-            claimEntry.claim.kind === 'ComponentClaim' &&
-            claimEntry.claim.providers &&
-            claimEntry.claim.providers.github &&
-            claimEntry.claim.providers.github.pages &&
-            typeof claimEntry.claim.providers.github.pages === 'object') {
-            const pages = claimEntry.claim.providers.github.pages;
-            if (Object.prototype.hasOwnProperty.call(pages.source, 'path') &&
-                typeof pages.source.path === 'string' &&
-                pages.source.path !== '/' &&
-                pages.source.path !== '/docs') {
-                throw new Error(`ComponentClaim/${claimEntry.claim.name}: providers.github.pages.source.path must be '/' or '/docs' if set. Found: '${pages.source.path}'`);
-            }
-        }
-    }
-}
-
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/renderer/renderer.ts
 
 
@@ -297208,7 +297183,6 @@ function validateComponentPagesPath(renderClaims) {
 
 
 
-
 /*
  * Function called when rendering but not importing
  *
@@ -297225,7 +297199,6 @@ async function renderer_render(catalogScope, firestartrScope, claimList) {
     const result = await renderClaims(catalogScope, firestartrScope, data);
     try {
         validateSubReferences(data.renderClaims);
-        validateComponentPagesPath(data.renderClaims);
         validateTfStateKeyUniqueness(result);
         validateCrSizes(result);
         validatePermissionsUniqueness(result);
@@ -298320,20 +298293,15 @@ class RepoGithubDecanter extends GithubDecanter {
         });
     }
     __decantPages() {
-        if (this.data.pages) {
-            if (this.data.pages.build_type === 'workflow') {
-                importer_src_logger.info(`Repository ${this.data.repoDetails.name} is using GitHub Actions for Pages deployment, skipping Pages configuration in claim as it's managed via workflow.`);
-            }
-            else if (this.data.pages.build_type === 'legacy') {
-                this.__patchClaim({
-                    op: 'add',
-                    path: '/providers/github/pages',
-                    value: {
-                        cname: this.data.pages.cname || '',
-                        source: this.data.pages.source,
-                    },
-                });
-            }
+        if (this.data.repoDetails.has_pages) {
+            this.__patchClaim({
+                op: 'add',
+                value: {
+                    cname: this.data.pages.cname,
+                    source: this.data.pages.source,
+                },
+                path: '/providers/github/pages',
+            });
         }
     }
     __decantOIDC() {
@@ -298583,20 +298551,6 @@ class RepoGithubDecanter extends GithubDecanter {
         }
         importer_src_logger.info(`No CODEOWNERS file found for ${this.data.repoDetails.name}, skipping.`);
     }
-    async __gatherPagesConfiguration() {
-        try {
-            const pagesConfig = await github.repo.getPages(this.org, this.data.repoDetails.name);
-            this.data['pages'] = pagesConfig;
-        }
-        catch (e) {
-            const status = e?.status ?? e?.response?.status;
-            if (status === 404) {
-                importer_src_logger.info(`No GitHub Pages configuration found for ${this.data.repoDetails.name}, skipping.`);
-                return;
-            }
-            throw e;
-        }
-    }
     async __gatherRepoLabels() {
         try {
             const labels = await github.repo.getRepoIssuesLabels(this.org, this.data.repoDetails.name);
@@ -305866,7 +305820,7 @@ const MODULES = {
     },
     FirestartrGithubRepository: {
         module: 'git::https://github.com/prefapp/tfm.git//modules/github-repo',
-        ref: 'feat/1195-github-repo-problem-on-github-pages',
+        ref: 'github-repo-v0.2.0',
     },
     FirestartrGithubRepositoryFeature: {
         module: 'git::https://github.com/prefapp/tfm.git//modules/github-files-set',
@@ -306615,42 +306569,6 @@ class EntityGHRepo extends base_Entity {
             },
         });
     }
-    /**
-     * Validation logic for GitHub Pages branch settings:
-     * - On create: If pages branch is set, it must equal the default branch.
-     * - On update: If pages branch is set and is not the default, it must exist in remote.
-     */
-    async validatePagesBranch(tfOp, repoAlreadyExists) {
-        const pages = this.cr.spec.pages;
-        if (!pages || !pages.source || !pages.source.branch)
-            return;
-        const branch = pages.source.branch;
-        const defaultBranch = this.cr.spec.repo.defaultBranch;
-        const repo = this.cr.name;
-        const org = this.cr.spec.org;
-        gh_provisioner_src_logger.error(`[gh-provisioner] ${this.k8sId} validating pages branch '${branch}' against default branch '${defaultBranch}' for operation '${tfOp}'`);
-        if (!repoAlreadyExists) {
-            if (branch !== defaultBranch) {
-                throw new Error(`Pages branch must equal default branch on creation. Provided: '${branch}', expected: '${defaultBranch}'`);
-            }
-            return;
-        }
-        else if (branch !== defaultBranch) {
-            gh_provisioner_src_logger.error(`[gh-provisioner] ${this.k8sId} validating pages branch '${branch}' against default branch '${defaultBranch}' for operation '${tfOp}' - branch is different from default, checking existence in remote`);
-            try {
-                await this.runWithGithubProvider(async () => {
-                    await github.branches.getBranch(repo, branch, org);
-                });
-            }
-            catch (err) {
-                if (err && err.status === 404) {
-                    throw new Error(`Pages branch '${branch}' does not exist in the repository '${org}/${repo}'.`);
-                }
-                // Other errors propagate
-                throw err;
-            }
-        }
-    }
     async loadResources(tfOp) {
         let repoAlreadyExists = false;
         try {
@@ -306658,9 +306576,7 @@ class EntityGHRepo extends base_Entity {
             repoAlreadyExists = (await this.runWithGithubProvider(async () => {
                 return await github.repo.repoExists(this.cr.spec.org, this.cr.name);
             }));
-            await this.validatePagesBranch(tfOp, repoAlreadyExists);
             await this.provisionRepository();
-            await this.provisionPages();
             await provisionDefaultBranch(this);
             await provisionCodeowners(this);
             await provisionVariables(this);
@@ -306768,21 +306684,10 @@ class EntityGHRepo extends base_Entity {
                 ignoreVulnerabilityAlertsDuringRead: this.cr.spec.repo.ignoreVulnerabilityAlertsDuringRead,
                 mergeCommitTitle: this.cr.spec.repo.mergeCommitTitle,
                 squashMergeCommitMessage: this.cr.spec.repo.squashMergeCommitMessage,
+                pages: this.cr.spec.pages,
             },
         });
     }
-    provisionPages() {
-        if (this.cr.spec.pages) {
-            this.patchData({
-                path: '/config/pages',
-                op: PatchOperations.add,
-                value: {
-                    source: this.cr.spec.pages.source,
-                    cname: this.cr.spec.pages.cname,
-                },
-            });
-        }
-    }
 }
 
 ;// CONCATENATED MODULE: ../gh_provisioner/src/entities/ghfeature/helpers/managed_files.ts
@@ -307551,8 +307456,8 @@ async function runGhProvisioner(data, opts) {
         gh_provisioner_src_logger.error(`[gh-provisioner] Error running runGhProvisioner: ${message}`);
         if (!synthFinished && entity)
             entity.synthEnd(message);
-        if (entity && entity.inDebugMode && synthFinished) {
-            await debugTerraformOutput(entity, err.toString());
+        if (entity && entity.inDebugMode) {
+            await debugTerraformOutput(entity, message);
         }
         throw new Error(`[gh-provisioner] Error running runGhProvisioner: ${message}`);
     }
@@ -309343,7 +309248,7 @@ const crs_analyzerSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"2.4.0-snapshot-3"}');
+const package_namespaceObject = JSON.parse('{"i8":"2.4.0-snapshot-5"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"2.3.0"};
 ;// CONCATENATED MODULE: ./src/subcommands/index.ts

package/build/packages/cdk8s_renderer/imports/firestartr.dev.d.ts

@@ -1010,6 +1010,10 @@ export interface FirestartrGithubRepositorySpecRepo {
      * @schema FirestartrGithubRepositorySpecRepo#hasWiki
      */
     readonly hasWiki?: boolean;
+    /**
+     * @schema FirestartrGithubRepositorySpecRepo#pages
+     */
+    readonly pages?: any;
     /**
      * @schema FirestartrGithubRepositorySpecRepo#topics
      */

package/build/packages/gh_provisioner/src/entities/ghrepo/index.d.ts

@@ -1,15 +1,8 @@
 import { Entity } from '../base';
 export declare class EntityGHRepo extends Entity {
     constructor(artifact: any);
-    /**
-     * Validation logic for GitHub Pages branch settings:
-     * - On create: If pages branch is set, it must equal the default branch.
-     * - On update: If pages branch is set and is not the default, it must exist in remote.
-     */
-    private validatePagesBranch;
     loadResources(tfOp: string): Promise<void>;
     postProvision(tfOp: string): Promise<void>;
     loadAddressesToImport(): Promise<void>;
     provisionRepository(): Promise<void>;
-    provisionPages(): void;
 }

package/build/packages/importer/src/decanter/gh/github_repo.d.ts

@@ -16,7 +16,6 @@ export default class RepoGithubDecanter extends GithubDecanter {
     __gatherOIDCSubjectClaim(): Promise<void>;
     __gatherBranchStrategy(): Promise<void>;
     __gatherCodeowners(): Promise<void>;
-    __gatherPagesConfiguration(): Promise<void>;
     __gatherRepoLabels(): Promise<void>;
     __adaptInitializerBranchStrategies(_claim: any): Promise<BranchStrategiesInitializer>;
     __adaptInitializerBase(_claim: any): Promise<InitializerDefault>;

package/package.json

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

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

@@ -1,6 +0,0 @@
-import { RenderClaims } from '../renderer/types';
-/**
- * Throws if any ComponentClaim's providers.github.pages.path is set to any value other than '/' or '/docs'.
- * Should be called as a final render-time validation (never mutates input).
- */
-export declare function validateComponentPagesPath(renderClaims: RenderClaims): void;