@firestartr/cli 2.11.0-snapshot-mco-01 → 2.11.0-snapshot-ghpages-01

package/build/index.js

@@ -163207,20 +163207,7 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                             type: 'boolean',
                         },
                         pages: {
-                            type: 'object',
-                            properties: {
-                                cname: { type: 'string' },
-                                buildType: { type: 'string', enum: ['workflow', 'legacy'] },
-                                source: {
-                                    type: 'object',
-                                    properties: {
-                                        branch: { type: 'string' },
-                                        path: { type: 'string' },
-                                    },
-                                    additionalProperties: false,
-                                },
-                            },
-                            additionalProperties: false,
+                            $ref: 'firestartr.dev://github/GithubPages',
                         },
                         additionalRules: {
                             type: 'array',
@@ -163657,6 +163644,42 @@ const organizationSettingsProperties = {
     },
 });
 
+;// CONCATENATED MODULE: ../cdk8s_renderer/src/claims/github/pages.schema.ts
+
+/* harmony default export */ const pages_schema = ({
+    $schema: SCHEMA,
+    $id: 'GithubPages',
+    definitions: {
+        GithubPages: {
+            $id: 'firestartr.dev://github/GithubPages',
+            type: 'object',
+            description: 'GitHub Pages configuration shared across component and repository claims',
+            properties: {
+                cname: { type: 'string' },
+                public: { type: 'boolean' },
+                https_enforced: { type: 'boolean' },
+                buildType: { type: 'string', enum: ['workflow', 'legacy'] },
+                source: {
+                    type: 'object',
+                    properties: {
+                        branch: { type: 'string' },
+                        path: { type: 'string', enum: ['/', '/docs'] },
+                    },
+                    additionalProperties: false,
+                },
+            },
+            additionalProperties: false,
+            if: {
+                required: ['https_enforced'],
+                properties: { https_enforced: { const: true } },
+            },
+            then: {
+                required: ['cname'],
+            },
+        },
+    },
+});
+
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/claims/github/index.ts
 
 
@@ -163666,6 +163689,7 @@ const organizationSettingsProperties = {
 
 
 
+
 const GithubSchemas = [
     github_group_schema,
     github_user_schema,
@@ -163675,6 +163699,7 @@ const GithubSchemas = [
     github_orgsettings_schema,
     component_secrets_vars_schema,
     component_labels_schema,
+    pages_schema,
 ];
 
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/claims/tfworkspaces/terraform.schema.ts
@@ -168640,6 +168665,8 @@ function toJson_FirestartrGithubRepositorySpecPages(obj) {
     }
     const result = {
         'cname': obj.cname,
+        'public': obj.public,
+        'https_enforced': obj.httpsEnforced,
         'source': toJson_FirestartrGithubRepositorySpecPagesSource(obj.source),
         'buildType': obj.buildType,
     };
@@ -168966,6 +168993,17 @@ function toJson_FirestartrGithubRepositorySpecContextProviderRef(obj) {
     // filter undefined values
     return Object.entries(result).reduce((r, i) => (i[1] === undefined) ? r : ({ ...r, [i[0]]: i[1] }), {});
 }
+/* eslint-enable max-len, @stylistic/max-len, quote-props, @stylistic/quote-props */
+/**
+ * @schema FirestartrGithubRepositorySpecPagesSourcePath
+ */
+var FirestartrGithubRepositorySpecPagesSourcePath;
+(function (FirestartrGithubRepositorySpecPagesSourcePath) {
+    /** / */
+    FirestartrGithubRepositorySpecPagesSourcePath["VALUE_FORWARD_SLASH"] = "/";
+    /** /docs */
+    FirestartrGithubRepositorySpecPagesSourcePath["VALUE_FORWARD_SLASH_DOCS"] = "/docs";
+})(FirestartrGithubRepositorySpecPagesSourcePath || (FirestartrGithubRepositorySpecPagesSourcePath = {}));
 /**
  * Converts an object of type 'FirestartrGithubRepositorySpecVarsVariableItemSchemaRef' to JSON representation.
  */
@@ -170756,6 +170794,17 @@ class RepoSecretsSectionChart extends BaseGithubChart {
 
 
 
+function normalizePages(pages) {
+    if (!pages)
+        return undefined;
+    return {
+        cname: pages.cname,
+        public: pages.public,
+        httpsEnforced: pages.https_enforced,
+        source: pages.source,
+        buildType: pages.buildType,
+    };
+}
 class GithubRepositoryChart extends BaseGithubChart {
     template() {
         const claim = this.get('claim');
@@ -170804,7 +170853,7 @@ class GithubRepositoryChart extends BaseGithubChart {
                 actions,
                 permissions: this.createPermissions(claim),
                 vars: this.createVars(claim),
-                pages: claim.providers.github.pages,
+                pages: normalizePages(claim.providers.github.pages),
                 branchProtections: [],
                 writeConnectionSecretToRef: {
                     name: `firestartrgithubrepository-${claim.name}-outputs`.toLowerCase(),
@@ -173567,9 +173616,6 @@ function transformRepoName(repoName) {
 
 
 
-
-
-
 const TYPE_MAP = {
     User: 'user',
     Team: 'group',
@@ -173638,33 +173684,27 @@ class RepoGithubDecanter extends GithubDecanter {
     }
     __decantPages() {
         if (this.data.pages) {
-            if (this.data.pages.build_type === 'workflow') {
-                this.__patchClaim({
-                    op: 'add',
-                    path: '/providers/github/pages',
-                    value: {
-                        buildType: 'workflow',
-                        ...(typeof this.data.pages.cname === 'string' &&
-                            this.data.pages.cname.length > 0
-                            ? { cname: this.data.pages.cname }
-                            : {}),
-                    },
-                });
-            }
-            else if (this.data.pages.build_type === 'legacy') {
-                this.__patchClaim({
-                    op: 'add',
-                    path: '/providers/github/pages',
-                    value: {
-                        buildType: 'legacy',
-                        ...(typeof this.data.pages.cname === 'string' &&
-                            this.data.pages.cname.length > 0
-                            ? { cname: this.data.pages.cname }
-                            : {}),
-                        source: this.data.pages.source,
-                    },
-                });
+            const pagesData = this.data.pages;
+            const pagesConfig = {
+                buildType: pagesData.build_type,
+                ...(typeof pagesData.cname === 'string' && pagesData.cname.length > 0
+                    ? { cname: pagesData.cname }
+                    : {}),
+                ...(typeof pagesData.public === 'boolean'
+                    ? { public: pagesData.public }
+                    : {}),
+                ...(typeof pagesData.https_enforced === 'boolean'
+                    ? { https_enforced: pagesData.https_enforced }
+                    : {}),
+            };
+            if (pagesData.build_type === 'legacy') {
+                pagesConfig.source = pagesData.source;
             }
+            this.__patchClaim({
+                op: 'add',
+                path: '/providers/github/pages',
+                value: pagesConfig,
+            });
         }
     }
     __decantOIDC() {
@@ -173717,51 +173757,15 @@ class RepoGithubDecanter extends GithubDecanter {
                 return (this.data.teamsAndMembers.directMembers.some((member) => member.name?.toLowerCase() === normalizedUserName) ||
                     this.data.teamsAndMembers.outsideMembers.some((member) => member.name?.toLowerCase() === normalizedUserName));
             };
-            // Resolve the default owner from claims_defaults.yaml if available.
-            // ComponentClaim.owner is of form "group:<name>" or "user:<name>".
-            // For teams we map to "@<org>/<name>", for users to "@<name>".
-            let defaultOwnerTeamHandle = null;
-            let defaultOwnerUserHandle = null;
-            try {
-                const raw = external_fs_.readFileSync(`${getPath('claimsDefaults')}/claims_defaults.yaml`, 'utf-8');
-                const defaults = catalog_common/* default.io.fromYaml */.Z.io.fromYaml(raw);
-                const ownerRef = defaults?.ComponentClaim?.owner;
-                if (typeof ownerRef === 'string' && ownerRef.includes(':')) {
-                    const [kind, name] = ownerRef.split(':');
-                    if (kind === 'group' && name) {
-                        defaultOwnerTeamHandle = `@${this.org.toLowerCase()}/${name.toLowerCase()}`;
-                    }
-                    else if (kind === 'user' && name) {
-                        defaultOwnerUserHandle = `@${name.toLowerCase()}`;
-                    }
-                }
-            }
-            catch {
-                // path not set, file missing, or parse error → no default owner, keep strict behaviour
-            }
-            const isDefaultOwner = (owner) => {
-                const normalized = owner.name.toLowerCase();
-                if (owner.isTeam)
-                    return normalized === defaultOwnerTeamHandle;
-                return normalized === defaultOwnerUserHandle;
-            };
             // let's validate that every element in the
             // CODEOWNERS file is either a team or a user in the repository,
             // otherwise we will have dangling references in the claim which will cause issues down the line
             for (const owner of owners) {
                 if (owner.isTeam && !isInTeams(owner.name)) {
-                    if (isDefaultOwner(owner)) {
-                        importer_src_logger.warn(`[${this.org}/${this.data.repoDetails.name}] CODEOWNERS file references default owner team ${owner.name} which is not yet in the repository's teams — will be granted on provisioning; continuing.`);
-                        continue;
-                    }
                     importer_src_logger.error(`[${this.org}/${this.data.repoDetails.name}] CODEOWNERS file references team ${owner.name} which is not present in the repository's teams.`);
                     throw new Error(`[${this.org}/${this.data.repoDetails.name}] CODEOWNERS file references team ${owner.name} which is not present in the repository's teams.`);
                 }
                 else if (!owner.isTeam && !isInUsers(owner.name)) {
-                    if (isDefaultOwner(owner)) {
-                        importer_src_logger.warn(`[${this.org}/${this.data.repoDetails.name}] CODEOWNERS file references default owner user ${owner.name} not yet collaborator — will be granted on provisioning; continuing.`);
-                        continue;
-                    }
                     importer_src_logger.error(`[${this.org}/${this.data.repoDetails.name}] CODEOWNERS file references user ${owner.name} which is not present in the repository's collaborators.`);
                     throw new Error(`[${this.org}/${this.data.repoDetails.name}] CODEOWNERS file references user ${owner.name} which is not present in the repository's collaborators.`);
                 }
@@ -365109,8 +365113,8 @@ const MODULES = {
     },
     FirestartrGithubRepository: {
         module: 'git::https://github.com/prefapp/tfm.git//modules/github-repo',
-        // github-repo-v0.9.0
-        ref: '76074c2817032b199962c380481617d99f78d9d7',
+        // github-repo feat/1385: add public and https_enforced to pages
+        ref: '441b93d8a0d78f6088db096a852305f63a227eaa',
     },
     FirestartrGithubRepositoryFeature: {
         module: 'git::https://github.com/prefapp/tfm.git//modules/github-files-set',
@@ -366007,14 +366011,14 @@ 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) {
+    async validatePages(tfOp, repoAlreadyExists) {
         const pages = this.cr.spec.pages;
-        if (!pages || !pages.source || !pages.source.branch)
+        if (!pages)
+            return;
+        if (pages.https_enforced && !pages.cname) {
+            throw new Error(`[gh-provisioner] ${this.k8sId} https_enforced requires cname to be set in pages configuration`);
+        }
+        if (!pages.source || !pages.source.branch)
             return;
         const branch = pages.source.branch;
         const defaultBranch = this.cr.spec.repo.defaultBranch;
@@ -366038,7 +366042,6 @@ class EntityGHRepo extends base_Entity {
                 if (err && err.status === 404) {
                     throw new Error(`Pages branch '${branch}' does not exist in the repository '${org}/${repo}'.`);
                 }
-                // Other errors propagate
                 throw err;
             }
         }
@@ -366051,7 +366054,7 @@ class EntityGHRepo extends base_Entity {
                 return await github["default"].repo.repoExists(this.cr.spec.org, this.cr.name);
             }));
             if (tfOp !== 'destroy' && tfOp !== 'plan-destroy') {
-                await this.validatePagesBranch(tfOp, repoAlreadyExists);
+                await this.validatePages(tfOp, repoAlreadyExists);
             }
             await this.provisionRepository();
             this.provisionPages();
@@ -366198,6 +366201,9 @@ class EntityGHRepo extends base_Entity {
         if (this.cr.spec.pages) {
             const source = this.cr.spec.pages.source ?? {};
             const buildType = this.cr.spec.pages.buildType ?? 'legacy';
+            const cname = this.cr.spec.pages.cname;
+            const public_ = this.cr.spec.pages.public;
+            const httpsEnforced = this.cr.spec.pages.https_enforced;
             this.patchData({
                 path: '/config/pages',
                 op: PatchOperations.add,
@@ -366211,7 +366217,11 @@ class EntityGHRepo extends base_Entity {
                             },
                         }
                         : {}),
-                    cname: this.cr.spec.pages.cname,
+                    ...(cname !== undefined ? { cname } : {}),
+                    ...(public_ !== undefined ? { public: public_ } : {}),
+                    ...(httpsEnforced !== undefined
+                        ? { https_enforced: httpsEnforced }
+                        : {}),
                 },
             });
         }
@@ -713342,7 +713352,7 @@ const crsStatusSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"2.11.0-snapshot-mco-01"}');
+const package_namespaceObject = JSON.parse('{"i8":"2.11.0-snapshot-ghpages-01"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"2.10.0"};
 // EXTERNAL MODULE: ../../node_modules/semver/index.js

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

@@ -1709,6 +1709,14 @@ export interface FirestartrGithubRepositorySpecPages {
      * @schema FirestartrGithubRepositorySpecPages#cname
      */
     readonly cname?: string;
+    /**
+     * @schema FirestartrGithubRepositorySpecPages#public
+     */
+    readonly public?: boolean;
+    /**
+     * @schema FirestartrGithubRepositorySpecPages#https_enforced
+     */
+    readonly httpsEnforced?: boolean;
     /**
      * @schema FirestartrGithubRepositorySpecPages#source
      */
@@ -1952,7 +1960,7 @@ export interface FirestartrGithubRepositorySpecPagesSource {
     /**
      * @schema FirestartrGithubRepositorySpecPagesSource#path
      */
-    readonly path?: string;
+    readonly path?: FirestartrGithubRepositorySpecPagesSourcePath;
 }
 /**
  * Converts an object of type 'FirestartrGithubRepositorySpecPagesSource' to JSON representation.
@@ -2119,6 +2127,15 @@ export interface FirestartrGithubRepositorySpecContextProviderRef {
  * Converts an object of type 'FirestartrGithubRepositorySpecContextProviderRef' to JSON representation.
  */
 export declare function toJson_FirestartrGithubRepositorySpecContextProviderRef(obj: FirestartrGithubRepositorySpecContextProviderRef | undefined): Record<string, any> | undefined;
+/**
+ * @schema FirestartrGithubRepositorySpecPagesSourcePath
+ */
+export declare enum FirestartrGithubRepositorySpecPagesSourcePath {
+    /** / */
+    VALUE_FORWARD_SLASH = "/",
+    /** /docs */
+    VALUE_FORWARD_SLASH_DOCS = "/docs"
+}
 /**
  * @schema FirestartrGithubRepositorySpecVarsVariableItemSchemaRef
  */

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

@@ -733,29 +733,7 @@ declare const schemas: {
                             type: string;
                         };
                         pages: {
-                            type: string;
-                            properties: {
-                                cname: {
-                                    type: string;
-                                };
-                                buildType: {
-                                    type: string;
-                                    enum: string[];
-                                };
-                                source: {
-                                    type: string;
-                                    properties: {
-                                        branch: {
-                                            type: string;
-                                        };
-                                        path: {
-                                            type: string;
-                                        };
-                                    };
-                                    additionalProperties: boolean;
-                                };
-                            };
-                            additionalProperties: boolean;
+                            $ref: string;
                         };
                         additionalRules: {
                             type: string;
@@ -1139,6 +1117,56 @@ declare const schemas: {
                 additionalProperties: boolean;
             };
         };
+    } | {
+        $schema: string;
+        $id: string;
+        definitions: {
+            GithubPages: {
+                $id: string;
+                type: string;
+                description: string;
+                properties: {
+                    cname: {
+                        type: string;
+                    };
+                    public: {
+                        type: string;
+                    };
+                    https_enforced: {
+                        type: string;
+                    };
+                    buildType: {
+                        type: string;
+                        enum: string[];
+                    };
+                    source: {
+                        type: string;
+                        properties: {
+                            branch: {
+                                type: string;
+                            };
+                            path: {
+                                type: string;
+                                enum: string[];
+                            };
+                        };
+                        additionalProperties: boolean;
+                    };
+                };
+                additionalProperties: boolean;
+                if: {
+                    required: string[];
+                    properties: {
+                        https_enforced: {
+                            const: boolean;
+                        };
+                    };
+                };
+                then: {
+                    required: string[];
+                };
+            };
+        };
     })[] | {
         $id: string;
         definitions: {

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

@@ -137,29 +137,7 @@ declare const _default: {
                         type: string;
                     };
                     pages: {
-                        type: string;
-                        properties: {
-                            cname: {
-                                type: string;
-                            };
-                            buildType: {
-                                type: string;
-                                enum: string[];
-                            };
-                            source: {
-                                type: string;
-                                properties: {
-                                    branch: {
-                                        type: string;
-                                    };
-                                    path: {
-                                        type: string;
-                                    };
-                                };
-                                additionalProperties: boolean;
-                            };
-                        };
-                        additionalProperties: boolean;
+                        $ref: string;
                     };
                     additionalRules: {
                         type: string;

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

@@ -264,29 +264,7 @@ export declare const GithubSchemas: ({
                         type: string;
                     };
                     pages: {
-                        type: string;
-                        properties: {
-                            cname: {
-                                type: string;
-                            };
-                            buildType: {
-                                type: string;
-                                enum: string[];
-                            };
-                            source: {
-                                type: string;
-                                properties: {
-                                    branch: {
-                                        type: string;
-                                    };
-                                    path: {
-                                        type: string;
-                                    };
-                                };
-                                additionalProperties: boolean;
-                            };
-                        };
-                        additionalProperties: boolean;
+                        $ref: string;
                     };
                     additionalRules: {
                         type: string;
@@ -670,4 +648,54 @@ export declare const GithubSchemas: ({
             additionalProperties: boolean;
         };
     };
+} | {
+    $schema: string;
+    $id: string;
+    definitions: {
+        GithubPages: {
+            $id: string;
+            type: string;
+            description: string;
+            properties: {
+                cname: {
+                    type: string;
+                };
+                public: {
+                    type: string;
+                };
+                https_enforced: {
+                    type: string;
+                };
+                buildType: {
+                    type: string;
+                    enum: string[];
+                };
+                source: {
+                    type: string;
+                    properties: {
+                        branch: {
+                            type: string;
+                        };
+                        path: {
+                            type: string;
+                            enum: string[];
+                        };
+                    };
+                    additionalProperties: boolean;
+                };
+            };
+            additionalProperties: boolean;
+            if: {
+                required: string[];
+                properties: {
+                    https_enforced: {
+                        const: boolean;
+                    };
+                };
+            };
+            then: {
+                required: string[];
+            };
+        };
+    };
 })[];

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

@@ -0,0 +1,11 @@
+import { FirestartrGithubRepositorySpecPagesBuildType, FirestartrGithubRepositorySpecPagesSourcePath } from '../../../imports/firestartr.dev';
+export interface IRepositoryPage {
+    cname?: string;
+    public?: boolean;
+    https_enforced?: boolean;
+    source?: {
+        branch: string;
+        path: FirestartrGithubRepositorySpecPagesSourcePath;
+    };
+    buildType?: FirestartrGithubRepositorySpecPagesBuildType;
+}

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

@@ -0,0 +1,52 @@
+declare const _default: {
+    $schema: string;
+    $id: string;
+    definitions: {
+        GithubPages: {
+            $id: string;
+            type: string;
+            description: string;
+            properties: {
+                cname: {
+                    type: string;
+                };
+                public: {
+                    type: string;
+                };
+                https_enforced: {
+                    type: string;
+                };
+                buildType: {
+                    type: string;
+                    enum: string[];
+                };
+                source: {
+                    type: string;
+                    properties: {
+                        branch: {
+                            type: string;
+                        };
+                        path: {
+                            type: string;
+                            enum: string[];
+                        };
+                    };
+                    additionalProperties: boolean;
+                };
+            };
+            additionalProperties: boolean;
+            if: {
+                required: string[];
+                properties: {
+                    https_enforced: {
+                        const: boolean;
+                    };
+                };
+            };
+            then: {
+                required: string[];
+            };
+        };
+    };
+};
+export default _default;

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

@@ -1,7 +1,8 @@
 import { BranchStrategy } from 'catalog_common';
-import { FirestartrGithubRepositorySpecPagesBuildType, FirestartrGithubRepositorySpecRepoVisibility } from '../../../imports/firestartr.dev';
+import { FirestartrGithubRepositorySpecRepoVisibility } from '../../../imports/firestartr.dev';
 import { IClaimInstalledFeature } from '../base';
 import { IComponentClaim } from '../base/component';
+import { IRepositoryPage } from './pages';
 export interface IGithubRepositoryClaim extends IComponentClaim {
     providers: {
         github: {
@@ -49,14 +50,6 @@ interface IComponentClaimActions {
         includeClaimKeys: string[];
     };
 }
-interface IRepositoryPage {
-    cname?: string;
-    source?: {
-        branch: string;
-        path: string;
-    };
-    buildType?: FirestartrGithubRepositorySpecPagesBuildType;
-}
 interface IComponentClaimLabel {
     name: string;
     color: string;

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

@@ -2,12 +2,7 @@ import { Entity } from '../base';
 export declare class EntityGHRepo extends Entity {
     private escapeTerraformBranchName;
     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;
+    private validatePages;
     loadResources(tfOp: string): Promise<void>;
     postProvision(tfOp: string): Promise<void>;
     loadAddressesToImport(): Promise<void>;

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

@@ -4,5 +4,5 @@ export default class MemberGithubDecanter extends GithubDecanter {
     __decantStart(): void;
     __gatherRoleInOrg(): Promise<void>;
     __decantProviders(): void;
-    __adaptInitializerBase(_claim: any): Promise<import("cdk8s_renderer").InitializerDefault>;
+    __adaptInitializerBase(_claim: any): Promise<import("../../../../cdk8s_renderer").InitializerDefault>;
 }

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

@@ -5,6 +5,6 @@ export default class OrgSettingsGithubDecanter extends GithubDecanter {
     __decantProviders(): void;
     __gatherOrgSettings(): Promise<void>;
     __gatherProviderPayload(): void;
-    __adaptInitializerBase(_claim: any): Promise<import("cdk8s_renderer").InitializerDefault>;
+    __adaptInitializerBase(_claim: any): Promise<import("../../../../cdk8s_renderer").InitializerDefault>;
     private orgSettingsName;
 }

package/package.json

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