@firestartr/cli 2.3.0-snapshot → 2.3.0-snapshot-2

package/build/index.js

@@ -284815,7 +284815,7 @@ async function getRepoIssuesLabels(owner, repo) {
     });
     const metadataLabels = res.data.map((label) => ({
         name: label.name,
-        description: label.description || null,
+        description: label.description || '',
         color: label.color,
     }));
     return metadataLabels;
@@ -287947,7 +287947,7 @@ class ComponentLabelsInitializer extends InitializerPatches {
     async __validate() {
         return true;
     }
-    async __patches(claim, _previousCR) {
+    async __patches(_claim, _previousCR) {
         return [
             {
                 validate(cr) {
@@ -289644,7 +289644,7 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                 description: {
                     type: 'string',
                     maxLength: 100,
-                    description: 'Optional label description (máx 100 chars)',
+                    description: 'Optional label description (max 100 chars)',
                 },
             },
             additionalProperties: false,
@@ -298153,6 +298153,17 @@ const TYPE_MAP = {
     Team: 'group',
     Organization: 'org',
 };
+const DEFAULT_LABELS = [
+    'bug',
+    'documentation',
+    'duplicate',
+    'enhancement',
+    'good first issue',
+    'help wanted',
+    'invalid',
+    'question',
+    'wontfix',
+];
 class RepoGithubDecanter extends GithubDecanter {
     constructor(data, org, githubTeams = {}) {
         super(data, org);
@@ -298367,6 +298378,19 @@ class RepoGithubDecanter extends GithubDecanter {
                 }));
         }
     }
+    async __decantRepoLabels() {
+        let labels = this.data.labels || [];
+        labels = labels.filter((label) => {
+            return !DEFAULT_LABELS.includes(label.name);
+        });
+        if (labels && labels.length > 0) {
+            this.__patchClaim({
+                op: 'add',
+                value: labels,
+                path: '/providers/github/labels',
+            });
+        }
+    }
     async __gatherRepoTeamsAndMembers() {
         this.data['teamsAndMembers'] = {};
         const directMembers = (await github.repo.getCollaborators(this.data.repoDetails.owner.login, this.data.repoDetails.name, 'direct')).map((member) => {
@@ -298433,6 +298457,16 @@ class RepoGithubDecanter extends GithubDecanter {
         }
         importer_src_logger.info(`No CODEOWNERS file found for ${this.data.repoDetails.name}, skipping.`);
     }
+    async __gatherRepoLabels() {
+        try {
+            const labels = await github.repo.getRepoIssuesLabels(this.org, this.data.repoDetails.name);
+            this.data['labels'] = labels;
+        }
+        catch (e) {
+            importer_src_logger.error(`Error fetching labels for ${this.data.repoDetails.name}: ${e.message}`);
+            throw new Error(`Error fetching labels for ${this.data.repoDetails.name}: ${e.message}`);
+        }
+    }
     async __adaptInitializerBranchStrategies(_claim) {
         const bpData = this.data.branchStrategy.data;
         if (this.data.branchStrategy.kind === 'custom') {
@@ -306365,7 +306399,7 @@ function provisionPermissions(fsGithubRepository) {
 ;// CONCATENATED MODULE: ../gh_provisioner/src/entities/ghrepo/helpers/labels.ts
 // if we are to provision labels using tofu and the label already
 // exists, we should not attempt to re-create it. This function checks
-// if the label exists and if not, creates it. This is needed because
+// if the label exists and if so, imports it into Terraform state. This is needed because
 // tofu does not have an "upsert" operation for labels, so we need to check
 // if the label exists before trying to create it, otherwise we will get an error.
 
@@ -306374,13 +306408,13 @@ function provisionPermissions(fsGithubRepository) {
 async function provisionLabels(fsGithubRepository, repoAlreadyExists) {
     try {
         const cr = fsGithubRepository.cr;
-        if (cr.spec.repo.labels.length === 0) {
+        const labels = cr.spec.repo.labels;
+        if (!labels || labels.length === 0) {
             return;
         }
         if (repoAlreadyExists) {
             await importLabelsIfNeeded(fsGithubRepository);
         }
-        const labels = cr.spec.repo.labels;
         for (const label of labels) {
             gh_provisioner_src_logger.debug(`[gh-provisioner] ${fsGithubRepository.k8sId} provisioning label ${label.name}`);
             fsGithubRepository.patchData({
@@ -306403,33 +306437,25 @@ async function importLabelsIfNeeded(fsGithubRepository) {
     const cr = fsGithubRepository.cr;
     try {
         const labels = cr.spec.repo.labels;
-        const labelsToImport = [];
         gh_provisioner_src_logger.info(`[gh-provisioner] ${fsGithubRepository.k8sId} checking if labels need to be imported`);
         const repoIssuesList = await fsGithubRepository.runWithGithubProvider(async () => {
             return await github.repo.getRepoIssuesLabels(cr.spec.org, cr.name);
         });
-        // we need to check wether the label exists or not, if it does not exist we need to create it
+        // labels that already exist in GitHub must be imported into Terraform state
+        // so that Terraform manages them rather than trying to create them (which would fail)
         for (const label of labels) {
-            if (checkIfLabelExists(label.name, repoIssuesList)) {
+            if (!checkIfLabelExists(label.name, repoIssuesList)) {
                 continue;
             }
-            labelsToImport.push({
-                name: label.name,
-                color: label.color,
-                description: label.description,
-            });
-        }
-        for (const label of labelsToImport) {
-            this.patchImportData({
+            fsGithubRepository.patchImportData({
                 op: PatchOperations.add,
                 path: '/imports/-',
                 value: {
                     to: 'github_issue_label.this["' + label.name + '"]',
-                    id: `${this.cr.name}:${label.name}`,
+                    id: `${cr.name}:${label.name}`,
                 },
             });
         }
-        return labelsToImport;
     }
     catch (err) {
         gh_provisioner_src_logger.error(`[gh-provisioner] ${fsGithubRepository.k8sId} error on importLabelsIfNeeded: ${err}`);
@@ -308737,7 +308763,7 @@ const crs_analyzerSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"2.3.0-snapshot"}');
+const package_namespaceObject = JSON.parse('{"i8":"2.3.0-snapshot-2"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"2.2.0"};
 ;// CONCATENATED MODULE: ./src/subcommands/index.ts

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

@@ -3,7 +3,7 @@ export declare class ComponentLabelsInitializer extends InitializerPatches {
     applicableProviders: string[];
     static applicableKinds: string[];
     __validate(): Promise<boolean>;
-    __patches(claim: any, _previousCR: any): Promise<{
+    __patches(_claim: any, _previousCR: any): Promise<{
         validate(cr: any): boolean;
         apply(cr: any): any;
         identify(): string;

package/build/packages/gh_provisioner/src/entities/ghrepo/helpers/labels.d.ts

@@ -1 +1,2 @@
-export declare function provisionLabels(fsGithubRepository: any, repoAlreadyExists: boolean): Promise<void>;
+import { EntityGHRepo } from '../';
+export declare function provisionLabels(fsGithubRepository: EntityGHRepo, repoAlreadyExists: boolean): Promise<void>;

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

@@ -10,11 +10,13 @@ export default class RepoGithubDecanter extends GithubDecanter {
     __decantOIDC(): void;
     __decantValidateCodeowners(): void;
     __decantRelations(): void;
+    __decantRepoLabels(): Promise<void>;
     __gatherRepoTeamsAndMembers(): Promise<void>;
     __gatherPages(): Promise<void>;
     __gatherOIDCSubjectClaim(): Promise<void>;
     __gatherBranchStrategy(): Promise<void>;
     __gatherCodeowners(): Promise<void>;
+    __gatherRepoLabels(): Promise<void>;
     __adaptInitializerBranchStrategies(_claim: any): Promise<BranchStrategiesInitializer>;
     __adaptInitializerBase(_claim: any): Promise<InitializerDefault>;
     __adaptOverriderRepo(_claim: any): Promise<GithubRepositoryOverrider>;

package/package.json

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