@firestartr/cli 2.7.0-snapshot-8 → 2.7.0-snapshot-10

package/build/index.js

@@ -282041,6 +282041,7 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                             type: 'object',
                             properties: {
                                 cname: { type: 'string' },
+                                buildType: { type: 'string', enum: ['workflow', 'legacy'] },
                                 source: {
                                     type: 'object',
                                     properties: {
@@ -286655,6 +286656,7 @@ function toJson_FirestartrGithubRepositorySpecPages(obj) {
     const result = {
         'cname': obj.cname,
         'source': toJson_FirestartrGithubRepositorySpecPagesSource(obj.source),
+        'buildType': obj.buildType,
     };
     // filter undefined values
     return Object.entries(result).reduce((r, i) => (i[1] === undefined) ? r : ({ ...r, [i[0]]: i[1] }), {});
@@ -286842,6 +286844,17 @@ function toJson_FirestartrGithubRepositorySpecPagesSource(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 FirestartrGithubRepositorySpecPagesBuildType
+ */
+var FirestartrGithubRepositorySpecPagesBuildType;
+(function (FirestartrGithubRepositorySpecPagesBuildType) {
+    /** workflow */
+    FirestartrGithubRepositorySpecPagesBuildType["WORKFLOW"] = "workflow";
+    /** legacy */
+    FirestartrGithubRepositorySpecPagesBuildType["LEGACY"] = "legacy";
+})(FirestartrGithubRepositorySpecPagesBuildType || (FirestartrGithubRepositorySpecPagesBuildType = {}));
 /**
  * Converts an object of type 'FirestartrGithubRepositorySpecPermissionsRef' to JSON representation.
  */
@@ -291153,13 +291166,24 @@ 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.`);
+                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 }
@@ -300847,14 +300871,20 @@ class EntityGHRepo extends base_Entity {
     provisionPages() {
         if (this.cr.spec.pages) {
             const source = this.cr.spec.pages.source ?? {};
+            const buildType = this.cr.spec.pages.buildType ?? 'legacy';
             this.patchData({
                 path: '/config/pages',
                 op: PatchOperations.add,
                 value: {
-                    source: {
-                        branch: source.branch || this.cr.spec.repo.defaultBranch,
-                        path: source.path || '/',
-                    },
+                    buildType: buildType,
+                    ...(buildType === 'legacy'
+                        ? {
+                            source: {
+                                branch: source.branch || this.cr.spec.repo.defaultBranch,
+                                path: source.path || '/',
+                            },
+                        }
+                        : {}),
                     cname: this.cr.spec.pages.cname,
                 },
             });
@@ -303560,9 +303590,9 @@ const crs_analyzerSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"2.7.0-snapshot-8"}');
+const package_namespaceObject = JSON.parse('{"i8":"2.7.0-snapshot-10"}');
 ;// CONCATENATED MODULE: ../../package.json
-const package_namespaceObject_1 = {"i8":"2.6.3"};
+const package_namespaceObject_1 = {"i8":"2.6.4"};
 ;// CONCATENATED MODULE: ./src/subcommands/index.ts
 
 

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

@@ -1447,6 +1447,10 @@ export interface FirestartrGithubRepositorySpecPages {
      * @schema FirestartrGithubRepositorySpecPages#source
      */
     readonly source?: FirestartrGithubRepositorySpecPagesSource;
+    /**
+     * @schema FirestartrGithubRepositorySpecPages#buildType
+     */
+    readonly buildType?: FirestartrGithubRepositorySpecPagesBuildType;
 }
 /**
  * Converts an object of type 'FirestartrGithubRepositorySpecPages' to JSON representation.
@@ -1680,6 +1684,15 @@ export interface FirestartrGithubRepositorySpecPagesSource {
  * Converts an object of type 'FirestartrGithubRepositorySpecPagesSource' to JSON representation.
  */
 export declare function toJson_FirestartrGithubRepositorySpecPagesSource(obj: FirestartrGithubRepositorySpecPagesSource | undefined): Record<string, any> | undefined;
+/**
+ * @schema FirestartrGithubRepositorySpecPagesBuildType
+ */
+export declare enum FirestartrGithubRepositorySpecPagesBuildType {
+    /** workflow */
+    WORKFLOW = "workflow",
+    /** legacy */
+    LEGACY = "legacy"
+}
 /**
  * @schema FirestartrGithubRepositorySpecPermissionsRef
  */

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

@@ -735,6 +735,10 @@ declare const schemas: {
                                 cname: {
                                     type: string;
                                 };
+                                buildType: {
+                                    type: string;
+                                    enum: string[];
+                                };
                                 source: {
                                     type: string;
                                     properties: {

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

@@ -139,6 +139,10 @@ declare const _default: {
                             cname: {
                                 type: string;
                             };
+                            buildType: {
+                                type: string;
+                                enum: string[];
+                            };
                             source: {
                                 type: string;
                                 properties: {

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

@@ -266,6 +266,10 @@ export declare const GithubSchemas: ({
                             cname: {
                                 type: string;
                             };
+                            buildType: {
+                                type: string;
+                                enum: string[];
+                            };
                             source: {
                                 type: string;
                                 properties: {

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

@@ -1,5 +1,5 @@
 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';
 export interface IGithubRepositoryClaim extends IComponentClaim {
@@ -49,11 +49,12 @@ interface IComponentClaimActions {
     };
 }
 interface IRepositoryPage {
-    cname: string;
-    source: {
+    cname?: string;
+    source?: {
         branch: string;
         path: string;
     };
+    buildType?: FirestartrGithubRepositorySpecPagesBuildType;
 }
 interface IComponentClaimLabel {
     name: string;

package/package.json

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