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

package/build/index.js

@@ -280394,7 +280394,6 @@ 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;
@@ -280413,10 +280412,16 @@ class BackstageInitializer extends InitializerPatches {
                     return true;
                 },
                 apply(cr) {
-                    // set label
-                    cr.metadata.labels = cr.metadata.labels ?? {};
-                    cr.metadata.labels['backstage.io/kubernetes-label-selector'] =
-                        `backstage.io/kubernetes-id=${claim.name}`;
+                    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}`;
                     return cr;
                 },
                 identify() {
@@ -280431,6 +280436,8 @@ class BackstageInitializer extends InitializerPatches {
         ];
     }
 }
+BackstageInitializer.applicableKinds = ['ComponentClaim'];
+
 
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/initializers/syncer.ts
 
@@ -282037,6 +282044,9 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                         hasWiki: {
                             type: 'boolean',
                         },
+                        hasDiscussions: {
+                            type: 'boolean',
+                        },
                         pages: {
                             type: 'object',
                             properties: {
@@ -286621,6 +286631,7 @@ function toJson_FirestartrGithubRepositorySpecRepo(obj) {
         'allowUpdateBranch': obj.allowUpdateBranch,
         'hasIssues': obj.hasIssues,
         'hasWiki': obj.hasWiki,
+        'hasDiscussions': obj.hasDiscussions,
         'topics': obj.topics?.map(y => y),
         'labels': obj.labels?.map(y => toJson_FirestartrGithubRepositorySpecRepoLabels(y)),
         'visibility': obj.visibility,
@@ -286844,6 +286855,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.
  */
@@ -288761,6 +288783,7 @@ class GithubRepositoryChart extends BaseGithubChart {
                     allowUpdateBranch: claim.providers.github.allowUpdateBranch,
                     hasIssues: claim.providers.github.hasIssues,
                     hasWiki: claim.providers.github.hasWiki,
+                    hasDiscussions: claim.providers.github.hasDiscussions,
                     visibility: claim.providers.github.visibility,
                     defaultBranch: claim.providers.github?.branchStrategy?.defaultBranch,
                     codeowners: createCodeOwnersData(claim),
@@ -289787,7 +289810,6 @@ async function renderClaim(catalogScope, firestartrScope, claim, patches, previo
     const postPatches = patches.filter((patch) => patch.isPostPatch);
     const provider = config_getConfiguredProvider();
     const loadGithub = (provider === AllowedProviders.all ||
-        provider === AllowedProviders.catalog ||
         provider === AllowedProviders.github) &&
         'github' in claim.providers;
     const loadCatalog = provider === AllowedProviders.all || provider === AllowedProviders.catalog;
@@ -299818,8 +299840,8 @@ const MODULES = {
     },
     FirestartrGithubRepository: {
         module: 'git::https://github.com/prefapp/tfm.git//modules/github-repo',
-        // github-repo-v0.6.0
-        ref: '7eaa88e8a55c85bc8b7270a7d72055d8a53d6df1',
+        // github-repo-v0.7.0
+        ref: '6bdbcd9b813837bec9d1c576952bd88744508883',
     },
     FirestartrGithubRepositoryFeature: {
         module: 'git::https://github.com/prefapp/tfm.git//modules/github-files-set',
@@ -300860,7 +300882,7 @@ 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';
+            const buildType = this.cr.spec.pages.buildType ?? 'legacy';
             this.patchData({
                 path: '/config/pages',
                 op: PatchOperations.add,
@@ -303579,7 +303601,7 @@ const crs_analyzerSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"2.7.0-snapshot-9"}');
+const package_namespaceObject = JSON.parse('{"i8":"2.7.0-snapshot-11"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"2.6.4"};
 ;// CONCATENATED MODULE: ./src/subcommands/index.ts

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

@@ -1391,6 +1391,10 @@ export interface FirestartrGithubRepositorySpecRepo {
      * @schema FirestartrGithubRepositorySpecRepo#hasWiki
      */
     readonly hasWiki?: boolean;
+    /**
+     * @schema FirestartrGithubRepositorySpecRepo#hasDiscussions
+     */
+    readonly hasDiscussions?: boolean;
     /**
      * @schema FirestartrGithubRepositorySpecRepo#topics
      */
@@ -1450,7 +1454,7 @@ export interface FirestartrGithubRepositorySpecPages {
     /**
      * @schema FirestartrGithubRepositorySpecPages#buildType
      */
-    readonly buildType?: string;
+    readonly buildType?: FirestartrGithubRepositorySpecPagesBuildType;
 }
 /**
  * Converts an object of type 'FirestartrGithubRepositorySpecPages' to JSON representation.
@@ -1684,6 +1688,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

@@ -729,6 +729,9 @@ declare const schemas: {
                         hasWiki: {
                             type: string;
                         };
+                        hasDiscussions: {
+                            type: string;
+                        };
                         pages: {
                             type: string;
                             properties: {

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

@@ -133,6 +133,9 @@ declare const _default: {
                     hasWiki: {
                         type: string;
                     };
+                    hasDiscussions: {
+                        type: string;
+                    };
                     pages: {
                         type: string;
                         properties: {

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

@@ -260,6 +260,9 @@ export declare const GithubSchemas: ({
                     hasWiki: {
                         type: string;
                     };
+                    hasDiscussions: {
+                        type: string;
+                    };
                     pages: {
                         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 {
@@ -22,6 +22,7 @@ export interface IGithubRepositoryClaim extends IComponentClaim {
             allowUpdateBranch: boolean;
             hasIssues: boolean;
             hasWiki: boolean;
+            hasDiscussions: boolean;
             features: IClaimInstalledFeature[];
             pages: IRepositoryPage;
             branchStrategy: IComponentClaimBranchStrategy;
@@ -49,12 +50,12 @@ interface IComponentClaimActions {
     };
 }
 interface IRepositoryPage {
-    cname: string;
-    source: {
+    cname?: string;
+    source?: {
         branch: string;
         path: string;
     };
-    buildType?: string;
+    buildType?: FirestartrGithubRepositorySpecPagesBuildType;
 }
 interface IComponentClaimLabel {
     name: string;

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

@@ -1,6 +1,7 @@
 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-9",
+  "version": "2.7.0-snapshot-11",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",