@firestartr/cli 2.7.0-snapshot-7 → 2.7.0-snapshot-9

package/build/index.js

@@ -280394,6 +280394,7 @@ class BackstageInitializer extends InitializerPatches {
                     return true;
                 },
                 apply(cr) {
+                    // set annotation
                     cr.metadata.annotations = cr.metadata.annotations ?? {};
                     cr.metadata.annotations['backstage.io/kubernetes-id'] = claim.name;
                     return cr;
@@ -280412,35 +280413,10 @@ class BackstageInitializer extends InitializerPatches {
                     return true;
                 },
                 apply(cr) {
-                    cr.metadata.annotations = cr.metadata.annotations ?? {};
-                    cr.metadata.annotations['backstage.io/kubernetes-label-selector'] =
-                        `claim-ref=${claim.name}`;
-                    return cr;
-                },
-                identify() {
-                    return 'initializers/BackstageInitializer';
-                },
-                applicable() {
-                    return {
-                        applicableProviders: ['catalog'],
-                    };
-                },
-            },
-            {
-                validate() {
-                    return true;
-                },
-                apply(cr) {
-                    const org = claim.providers?.github?.org;
-                    const repoName = claim.providers?.github?.name;
-                    if (!org || !repoName)
-                        return cr;
-                    cr.metadata.annotations = cr.metadata.annotations ?? {};
-                    if (cr.metadata.annotations['github.com/project-slug'] !== undefined) {
-                        return cr;
-                    }
-                    cr.metadata.annotations['github.com/project-slug'] =
-                        `${org}/${repoName}`;
+                    // set label
+                    cr.metadata.labels = cr.metadata.labels ?? {};
+                    cr.metadata.labels['backstage.io/kubernetes-label-selector'] =
+                        `backstage.io/kubernetes-id=${claim.name}`;
                     return cr;
                 },
                 identify() {
@@ -280455,8 +280431,6 @@ class BackstageInitializer extends InitializerPatches {
         ];
     }
 }
-BackstageInitializer.applicableKinds = ['ComponentClaim'];
-
 
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/initializers/syncer.ts
 
@@ -282067,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: {
@@ -286681,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] }), {});
@@ -288784,6 +288760,7 @@ class GithubRepositoryChart extends BaseGithubChart {
                     archiveOnDestroy: claim.providers.github.archiveOnDestroy,
                     allowUpdateBranch: claim.providers.github.allowUpdateBranch,
                     hasIssues: claim.providers.github.hasIssues,
+                    hasWiki: claim.providers.github.hasWiki,
                     visibility: claim.providers.github.visibility,
                     defaultBranch: claim.providers.github?.branchStrategy?.defaultBranch,
                     codeowners: createCodeOwnersData(claim),
@@ -291178,13 +291155,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 }
@@ -300872,14 +300860,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,
                 },
             });
@@ -301674,7 +301668,10 @@ async function runGhProvisioner(data, opts) {
     let sessionId = null;
     let sessionProjectPath = null;
     gh_provisioner_src_logger.debug('[gh-provisioner] runGhProvisioner options keys:', Object.keys(opts || {}));
-    const tfOp = inferTFOperation(data.mainCr, opts);
+    let tfOp = inferTFOperation(data.mainCr, opts);
+    if (tfOp === 'nothing' && opts.debug) {
+        tfOp = 'debug';
+    }
     gh_provisioner_src_logger.info(`[gh-provisioner] Starting runGhProvisioner with tf op ${tfOp}`);
     sendWarnings();
     let entity;
@@ -301801,19 +301798,17 @@ function inferTFOperation(cr, opts) {
         ? 'plan'
         : opts.planDestroy
             ? 'plan-destroy'
-            : opts.create
-                ? 'apply'
-                : opts.update
-                    ? 'apply'
-                    : opts.delete
-                        ? 'destroy'
-                        : opts.debug
-                            ? 'debug'
-                            : isImport && needsReimport
-                                ? 'import-with-reimport'
-                                : isImport
-                                    ? 'import'
-                                    : 'nothing';
+            : opts.delete
+                ? 'destroy'
+                : isImport || opts.import
+                    ? needsReimport
+                        ? 'import-with-reimport'
+                        : 'import'
+                    : opts.create
+                        ? 'apply'
+                        : opts.update
+                            ? 'apply'
+                            : 'nothing';
     //opts.import && opts.skipPlan && isImport
     //  ? 'IMPORT_SKIP_PLAN'
     return operation;
@@ -303584,9 +303579,9 @@ const crs_analyzerSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"2.7.0-snapshot-7"}');
+const package_namespaceObject = JSON.parse('{"i8":"2.7.0-snapshot-9"}');
 ;// CONCATENATED MODULE: ../../package.json
-const package_namespaceObject_1 = {"i8":"2.6.1"};
+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?: string;
 }
 /**
  * Converts an object of type 'FirestartrGithubRepositorySpecPages' to JSON representation.

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

@@ -21,6 +21,7 @@ export interface IGithubRepositoryClaim extends IComponentClaim {
             archiveOnDestroy: boolean;
             allowUpdateBranch: boolean;
             hasIssues: boolean;
+            hasWiki: boolean;
             features: IClaimInstalledFeature[];
             pages: IRepositoryPage;
             branchStrategy: IComponentClaimBranchStrategy;
@@ -53,6 +54,7 @@ interface IRepositoryPage {
         branch: string;
         path: string;
     };
+    buildType?: string;
 }
 interface IComponentClaimLabel {
     name: string;

package/build/packages/cdk8s_renderer/src/initializers/backstage.d.ts

@@ -1,7 +1,6 @@
 import { InitializerPatches } from './base';
 export declare class BackstageInitializer extends InitializerPatches {
     applicableProviders: string[];
-    static applicableKinds: string[];
     __validate(): Promise<boolean>;
     __patches(claim: any, _: any): Promise<{
         validate(): boolean;

package/package.json

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