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

package/build/index.js

@@ -287141,7 +287141,10 @@ var lib = __nccwpck_require__(77228);
 const __PATH_VARIABLES = {};
 const __EXCLUDED_PATHS = [];
 function setExcludedPaths(excludedPaths) {
-    __EXCLUDED_PATHS.push(...excludedPaths);
+    __EXCLUDED_PATHS.length = 0;
+    for (const path of excludedPaths) {
+        __EXCLUDED_PATHS.push(path);
+    }
 }
 function getAdditionalPaths() {
     return __EXCLUDED_PATHS;
@@ -293774,7 +293777,6 @@ 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,
@@ -297175,6 +297177,20 @@ function searchSecretKey(secretClaim, key) {
     return found;
 }
 
+;// CONCATENATED MODULE: ../cdk8s_renderer/src/validations/componentPagesPath.ts
+/**
+ * Intentionally a no-op.
+ *
+ * Claim-kind-specific constraints such as ComponentClaim
+ * providers.github.pages.source.path belong in the ComponentClaim schema
+ * or in the claim->CR build/normalization step, not in src/validations.
+ *
+ * This function is kept to preserve the existing exported API for callers.
+ */
+function validateComponentPagesPath(_renderClaims) {
+    return;
+}
+
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/renderer/renderer.ts
 
 
@@ -297183,6 +297199,7 @@ function searchSecretKey(secretClaim, key) {
 
 
 
+
 /*
  * Function called when rendering but not importing
  *
@@ -297199,6 +297216,7 @@ 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);
@@ -298293,15 +298311,23 @@ class RepoGithubDecanter extends GithubDecanter {
         });
     }
     __decantPages() {
-        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',
-            });
+        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: {
+                        ...(typeof this.data.pages.cname === 'string' &&
+                            this.data.pages.cname.length > 0
+                            ? { cname: this.data.pages.cname }
+                            : {}),
+                        source: this.data.pages.source,
+                    },
+                });
+            }
         }
     }
     __decantOIDC() {
@@ -305820,7 +305846,7 @@ const MODULES = {
     },
     FirestartrGithubRepository: {
         module: 'git::https://github.com/prefapp/tfm.git//modules/github-repo',
-        ref: 'github-repo-v0.2.0',
+        ref: 'feat/1195-github-repo-problem-on-github-pages',
     },
     FirestartrGithubRepositoryFeature: {
         module: 'git::https://github.com/prefapp/tfm.git//modules/github-files-set',
@@ -306569,6 +306595,42 @@ 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.info(`[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.info(`[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 {
@@ -306576,7 +306638,11 @@ class EntityGHRepo extends base_Entity {
             repoAlreadyExists = (await this.runWithGithubProvider(async () => {
                 return await github.repo.repoExists(this.cr.spec.org, this.cr.name);
             }));
+            if (tfOp !== 'destroy' && tfOp !== 'plan-destroy') {
+                await this.validatePagesBranch(tfOp, repoAlreadyExists);
+            }
             await this.provisionRepository();
+            this.provisionPages();
             await provisionDefaultBranch(this);
             await provisionCodeowners(this);
             await provisionVariables(this);
@@ -306684,10 +306750,25 @@ 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) {
+            const source = this.cr.spec.pages.source ?? {};
+            this.patchData({
+                path: '/config/pages',
+                op: PatchOperations.add,
+                value: {
+                    source: {
+                        branch: source.branch || this.cr.spec.repo.defaultBranch,
+                        path: source.path || '/',
+                    },
+                    cname: this.cr.spec.pages.cname,
+                },
+            });
+        }
+    }
 }
 
 ;// CONCATENATED MODULE: ../gh_provisioner/src/entities/ghfeature/helpers/managed_files.ts
@@ -307456,7 +307537,7 @@ 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) {
+        if (entity && entity.inDebugMode && synthFinished) {
             await debugTerraformOutput(entity, message);
         }
         throw new Error(`[gh-provisioner] Error running runGhProvisioner: ${message}`);
@@ -309248,7 +309329,7 @@ const crs_analyzerSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"2.4.0-snapshot-5"}');
+const package_namespaceObject = JSON.parse('{"i8":"2.4.0-snapshot-7"}');
 ;// 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,10 +1010,6 @@ export interface FirestartrGithubRepositorySpecRepo {
      * @schema FirestartrGithubRepositorySpecRepo#hasWiki
      */
     readonly hasWiki?: boolean;
-    /**
-     * @schema FirestartrGithubRepositorySpecRepo#pages
-     */
-    readonly pages?: any;
     /**
      * @schema FirestartrGithubRepositorySpecRepo#topics
      */

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

@@ -0,0 +1,11 @@
+import { RenderClaims } from '../renderer/types';
+/**
+ * Intentionally a no-op.
+ *
+ * Claim-kind-specific constraints such as ComponentClaim
+ * providers.github.pages.source.path belong in the ComponentClaim schema
+ * or in the claim->CR build/normalization step, not in src/validations.
+ *
+ * This function is kept to preserve the existing exported API for callers.
+ */
+export declare function validateComponentPagesPath(_renderClaims: RenderClaims): void;

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

@@ -1,8 +1,15 @@
 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/package.json

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