@firestartr/cli 2.11.0-snapshot-gh-pages-public-https-2 → 2.11.0-snapshot-objects-in-patches

package/build/index.js

@@ -323011,7 +323011,20 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                             type: 'boolean',
                         },
                         pages: {
-                            $ref: 'firestartr.dev://github/GithubPages',
+                            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,
                         },
                         additionalRules: {
                             type: 'array',
@@ -323448,42 +323461,6 @@ 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
 
 
@@ -323493,7 +323470,6 @@ const organizationSettingsProperties = {
 
 
 
-
 const GithubSchemas = [
     github_group_schema,
     github_user_schema,
@@ -323503,7 +323479,6 @@ const GithubSchemas = [
     github_orgsettings_schema,
     component_secrets_vars_schema,
     component_labels_schema,
-    pages_schema,
 ];
 
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/claims/tfworkspaces/terraform.schema.ts
@@ -328469,8 +328444,6 @@ function toJson_FirestartrGithubRepositorySpecPages(obj) {
     }
     const result = {
         'cname': obj.cname,
-        'public': obj.public,
-        'https_enforced': obj.httpsEnforced,
         'source': toJson_FirestartrGithubRepositorySpecPagesSource(obj.source),
         'buildType': obj.buildType,
     };
@@ -328797,17 +328770,6 @@ 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.
  */
@@ -330598,17 +330560,6 @@ 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');
@@ -330657,7 +330608,7 @@ class GithubRepositoryChart extends BaseGithubChart {
                 actions,
                 permissions: this.createPermissions(claim),
                 vars: this.createVars(claim),
-                pages: normalizePages(claim.providers.github.pages),
+                pages: claim.providers.github.pages,
                 branchProtections: [],
                 writeConnectionSecretToRef: {
                     name: `firestartrgithubrepository-${claim.name}-outputs`.toLowerCase(),
@@ -333488,27 +333439,33 @@ class RepoGithubDecanter extends GithubDecanter {
     }
     __decantPages() {
         if (this.data.pages) {
-            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;
+            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,
+                    },
+                });
             }
-            this.__patchClaim({
-                op: 'add',
-                path: '/providers/github/pages',
-                value: pagesConfig,
-            });
         }
     }
     __decantOIDC() {
@@ -343079,8 +343036,8 @@ const MODULES = {
     },
     FirestartrGithubRepository: {
         module: 'git::https://github.com/prefapp/tfm.git//modules/github-repo',
-        // github-repo feat/1385: add public and https_enforced to pages
-        ref: '441b93d8a0d78f6088db096a852305f63a227eaa',
+        // github-repo-v0.9.0
+        ref: '76074c2817032b199962c380481617d99f78d9d7',
     },
     FirestartrGithubRepositoryFeature: {
         module: 'git::https://github.com/prefapp/tfm.git//modules/github-files-set',
@@ -343965,14 +343922,14 @@ class EntityGHRepo extends base_Entity {
             },
         });
     }
-    async validatePages(tfOp, repoAlreadyExists) {
+    /**
+     * 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)
-            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)
+        if (!pages || !pages.source || !pages.source.branch)
             return;
         const branch = pages.source.branch;
         const defaultBranch = this.cr.spec.repo.defaultBranch;
@@ -343996,6 +343953,7 @@ 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;
             }
         }
@@ -344008,7 +343966,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.validatePages(tfOp, repoAlreadyExists);
+                await this.validatePagesBranch(tfOp, repoAlreadyExists);
             }
             await this.provisionRepository();
             this.provisionPages();
@@ -344155,9 +344113,6 @@ 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,
@@ -344171,11 +344126,7 @@ class EntityGHRepo extends base_Entity {
                             },
                         }
                         : {}),
-                    ...(cname !== undefined ? { cname } : {}),
-                    ...(public_ !== undefined ? { public: public_ } : {}),
-                    ...(httpsEnforced !== undefined
-                        ? { https_enforced: httpsEnforced }
-                        : {}),
+                    cname: this.cr.spec.pages.cname,
                 },
             });
         }
@@ -525669,7 +525620,7 @@ const crsStatusSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"2.11.0-snapshot-gh-pages-public-https-2"}');
+const package_namespaceObject = JSON.parse('{"i8":"2.11.0-snapshot-objects-in-patches"}');
 ;// 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,14 +1709,6 @@ 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
      */
@@ -1960,7 +1952,7 @@ export interface FirestartrGithubRepositorySpecPagesSource {
     /**
      * @schema FirestartrGithubRepositorySpecPagesSource#path
      */
-    readonly path?: FirestartrGithubRepositorySpecPagesSourcePath;
+    readonly path?: string;
 }
 /**
  * Converts an object of type 'FirestartrGithubRepositorySpecPagesSource' to JSON representation.
@@ -2127,15 +2119,6 @@ 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,7 +733,29 @@ declare const schemas: {
                             type: string;
                         };
                         pages: {
-                            $ref: string;
+                            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;
                         };
                         additionalRules: {
                             type: string;
@@ -1117,56 +1139,6 @@ 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,7 +137,29 @@ declare const _default: {
                         type: string;
                     };
                     pages: {
-                        $ref: string;
+                        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;
                     };
                     additionalRules: {
                         type: string;

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

@@ -264,7 +264,29 @@ export declare const GithubSchemas: ({
                         type: string;
                     };
                     pages: {
-                        $ref: string;
+                        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;
                     };
                     additionalRules: {
                         type: string;
@@ -648,54 +670,4 @@ 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/repository.d.ts

@@ -1,8 +1,7 @@
 import { BranchStrategy } from 'catalog_common';
-import { FirestartrGithubRepositorySpecRepoVisibility } from '../../../imports/firestartr.dev';
+import { FirestartrGithubRepositorySpecPagesBuildType, 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: {
@@ -50,6 +49,14 @@ 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,7 +2,12 @@ import { Entity } from '../base';
 export declare class EntityGHRepo extends Entity {
     private escapeTerraformBranchName;
     constructor(artifact: any);
-    private validatePages;
+    /**
+     * 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>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firestartr/cli",
-  "version": "2.11.0-snapshot-gh-pages-public-https-2",
+  "version": "2.11.0-snapshot-objects-in-patches",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",

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

@@ -1,11 +0,0 @@
-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

@@ -1,52 +0,0 @@
-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;