update gitbeaker in cicd-statistics and scaffolder-relation-processor (#7620)

* update gitbeaker in cicd-statistics and scaffolder-relation-processor

Signed-off-by: Kashish Mittal <kmittal@redhat.com>

* add changeset

Signed-off-by: Kashish Mittal <kmittal@redhat.com>

* fix duplicates in scaffolder-relation-processor lockfile

Signed-off-by: Kashish Mittal <kmittal@redhat.com>

* update api reports

Signed-off-by: Kashish Mittal <kmittal@redhat.com>

* yarn dedupe

Signed-off-by: Kashish Mittal <kmittal@redhat.com>

---------

Signed-off-by: Kashish Mittal <kmittal@redhat.com>

Author: 04kash

workspaces/cicd-statistics/.changeset/spotty-dragons-laugh.md

@@ -0,0 +1,6 @@
+---
+'@backstage-community/plugin-cicd-statistics-module-gitlab': patch
+---
+
+Updated dependency `@gitbeaker/rest` to `^43.0.0`.
+Replaced deprecated `@gitbeaker/browser` with `@gitbeaker/rest`

workspaces/cicd-statistics/plugins/cicd-statistics-module-gitlab/package.json

@@ -56,8 +56,8 @@
     "@backstage/catalog-model": "backstage:^",
     "@backstage/core-plugin-api": "backstage:^",
     "@backstage/frontend-plugin-api": "backstage:^",
-    "@gitbeaker/browser": "^35.6.0",
-    "@gitbeaker/core": "^35.6.0",
+    "@gitbeaker/core": "^43.0.0",
+    "@gitbeaker/rest": "^43.0.0",
     "p-limit": "^3.1.0"
   },
   "devDependencies": {

workspaces/cicd-statistics/plugins/cicd-statistics-module-gitlab/report.api.md

@@ -9,7 +9,7 @@ import { CicdState } from '@backstage-community/plugin-cicd-statistics';
 import { CicdStatisticsApi } from '@backstage-community/plugin-cicd-statistics';
 import { Entity } from '@backstage/catalog-model';
 import { FetchBuildsOptions } from '@backstage-community/plugin-cicd-statistics';
-import { Gitlab } from '@gitbeaker/browser';
+import { Gitlab } from '@gitbeaker/rest';
 import { OAuthApi } from '@backstage/core-plugin-api';
 
 // @public

workspaces/cicd-statistics/plugins/cicd-statistics-module-gitlab/src/api/gitlab.ts

@@ -23,7 +23,7 @@ import {
   FetchBuildsOptions,
   Stage,
 } from '@backstage-community/plugin-cicd-statistics';
-import { Gitlab } from '@gitbeaker/browser';
+import { Gitlab, JobSchema, PipelineSchema } from '@gitbeaker/rest';
 import { OAuthApi } from '@backstage/core-plugin-api';
 import limiterFactory from 'p-limit';
 import { Entity, getEntitySourceLocation } from '@backstage/catalog-model';
@@ -80,11 +80,10 @@ export class CicdStatisticsApiGitlab implements CicdStatisticsApi {
     owner: string,
     build: Build,
   ): Promise<Stage[]> {
-    const jobs = await gitbeaker.Jobs.showPipelineJobs(
-      owner,
-      parseInt(build.id, 10),
-    );
-    const stages = jobsToStages(jobs);
+    const jobs = await gitbeaker.Jobs.all(owner, {
+      pipelineId: parseInt(build.id, 10),
+    });
+    const stages = jobsToStages(jobs as JobSchema[]);
     return stages;
   }
 
@@ -97,7 +96,7 @@ export class CicdStatisticsApiGitlab implements CicdStatisticsApi {
       owner,
       parseInt(build.id, 10),
     );
-    return parseInt(pipeline.duration as string, 10) * 1000;
+    return pipeline.duration * 1000;
   }
 
   private static async getDefaultBranch(
@@ -126,21 +125,23 @@ export class CicdStatisticsApiGitlab implements CicdStatisticsApi {
         : undefined;
     const pipelines = await api.Pipelines.all(owner, {
       perPage: 25,
-      updated_after: timeFrom.toISOString(),
-      updated_before: timeTo.toISOString(),
+      updatedAfter: timeFrom.toISOString(),
+      updatedBefore: timeTo.toISOString(),
       ref: branch,
     });
 
     const limiter = limiterFactory(10);
-    const builds = pipelinesToBuilds(pipelines).map(async build => ({
-      ...build,
-      duration: await limiter(() =>
-        CicdStatisticsApiGitlab.getDurationOfBuild(api, owner, build),
-      ),
-      stages: await limiter(() =>
-        CicdStatisticsApiGitlab.updateBuildWithStages(api, owner, build),
-      ),
-    }));
+    const builds = pipelinesToBuilds(pipelines as PipelineSchema[]).map(
+      async build => ({
+        ...build,
+        duration: await limiter(() =>
+          CicdStatisticsApiGitlab.getDurationOfBuild(api, owner, build),
+        ),
+        stages: await limiter(() =>
+          CicdStatisticsApiGitlab.updateBuildWithStages(api, owner, build),
+        ),
+      }),
+    );
     const promisedBuilds = (await Promise.all(builds)).filter(b =>
       filterStatus.includes(b.status),
     );

workspaces/cicd-statistics/plugins/cicd-statistics-module-gitlab/src/api/utils.test.ts

@@ -15,9 +15,9 @@
  */
 
 import { pipelinesToBuilds, jobsToStages } from './utils';
-import { Types } from '@gitbeaker/core';
+import { PipelineSchema, JobSchema } from '@gitbeaker/core';
 
-const pipelineMock: Types.PipelineSchema[] = [
+const pipelineMock: PipelineSchema[] = [
   {
     id: 1000,
     iid: 1,
@@ -52,7 +52,7 @@ const jobMock = [
     duration: 21.199465,
     queued_duration: 0.976313,
   },
-] as unknown as Array<Types.JobSchema>;
+] as unknown as Array<JobSchema>;
 
 describe('util functionality', () => {
   it('transforms the pipeline object to the build object', () => {

workspaces/cicd-statistics/plugins/cicd-statistics-module-gitlab/src/api/utils.ts

@@ -20,7 +20,7 @@ import {
   TriggerReason,
   Stage,
 } from '@backstage-community/plugin-cicd-statistics';
-import { Types } from '@gitbeaker/core';
+import { PipelineSchema, JobSchema } from '@gitbeaker/core';
 
 const statusMap: Record<string, FilterStatusType> = {
   manual: 'unknown',
@@ -51,9 +51,7 @@ const triggerReasonMap: Record<string, TriggerReason> = {
  *
  * @public
  */
-export function pipelinesToBuilds(
-  pipelines: Array<Types.PipelineSchema>,
-): Build[] {
+export function pipelinesToBuilds(pipelines: Array<PipelineSchema>): Build[] {
   return pipelines.map(pipeline => {
     return {
       id: pipeline.id.toString(),
@@ -84,7 +82,7 @@ export function pipelinesToBuilds(
  * Furthermore, we don't add the job to the sub-stage if it is has the same name as the parent stage
  * We then assume that the stage has no sub-stages
  */
-export function jobsToStages(jobs: Array<Types.JobSchema>): Stage[] {
+export function jobsToStages(jobs: Array<JobSchema>): Stage[] {
   return jobs.map(job => {
     const status = statusMap[job.status] ? statusMap[job.status] : 'unknown';
     const duration = job.duration ? ((job.duration * 1000) as number) : 0;

workspaces/cicd-statistics/plugins/cicd-statistics/report-alpha.api.md

@@ -88,9 +88,9 @@ const _default: OverridableFrontendPlugin<
         defaultGroup?: [Error: "Use the 'group' param instead"] | undefined;
         group?:
           | (string & {})
+          | 'development'
           | 'overview'
           | 'documentation'
-          | 'development'
           | 'deployment'
           | 'operation'
           | 'observability'

workspaces/cicd-statistics/yarn.lock

@@ -1410,8 +1410,8 @@ __metadata:
     "@backstage/cli": "backstage:^"
     "@backstage/core-plugin-api": "backstage:^"
     "@backstage/frontend-plugin-api": "backstage:^"
-    "@gitbeaker/browser": "npm:^35.6.0"
-    "@gitbeaker/core": "npm:^35.6.0"
+    "@gitbeaker/core": "npm:^43.0.0"
+    "@gitbeaker/rest": "npm:^43.0.0"
     "@types/react": "npm:^16.13.1 || ^17.0.0"
     "@types/react-dom": "npm:^18.2.19"
     p-limit: "npm:^3.1.0"
@@ -4229,40 +4229,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@gitbeaker/browser@npm:^35.6.0":
-  version: 35.8.1
-  resolution: "@gitbeaker/browser@npm:35.8.1"
+"@gitbeaker/core@npm:^43.0.0, @gitbeaker/core@npm:^43.8.0":
+  version: 43.8.0
+  resolution: "@gitbeaker/core@npm:43.8.0"
   dependencies:
-    "@gitbeaker/core": "npm:^35.8.1"
-    "@gitbeaker/requester-utils": "npm:^35.8.1"
-    delay: "npm:^5.0.0"
-    ky: "npm:0.28.7"
-  checksum: 10/92cd70614789bbe225ddfbbcd17ea0b002c2eca9019b11c324ac11899b77d00c7b6ec5bc16b44e83150315d603d5a3feaaeb7b52e3edd86886557103c344fe20
+    "@gitbeaker/requester-utils": "npm:^43.8.0"
+    qs: "npm:^6.14.0"
+    xcase: "npm:^2.0.1"
+  checksum: 10/1c935ffec246c854d7d543cc4ccb97271c322ea506c02ccf60774bffd42462c36cd3324d6876082da706d25e444878f76714746b1fbd77c202b0e3766ef5f4ae
   languageName: node
   linkType: hard
 
-"@gitbeaker/core@npm:^35.6.0, @gitbeaker/core@npm:^35.8.1":
-  version: 35.8.1
-  resolution: "@gitbeaker/core@npm:35.8.1"
+"@gitbeaker/requester-utils@npm:^43.8.0":
+  version: 43.8.0
+  resolution: "@gitbeaker/requester-utils@npm:43.8.0"
   dependencies:
-    "@gitbeaker/requester-utils": "npm:^35.8.1"
-    form-data: "npm:^4.0.0"
-    li: "npm:^1.3.0"
-    mime: "npm:^3.0.0"
-    query-string: "npm:^7.0.0"
+    picomatch-browser: "npm:^2.2.6"
+    qs: "npm:^6.14.0"
+    rate-limiter-flexible: "npm:^8.0.1"
     xcase: "npm:^2.0.1"
-  checksum: 10/5e3eda56f74678ceaec6d494318a0fa9b20d587f307e4d269206cf3ffb6363c8361effd43ef465f7b19f467d7a2caea0e95705a5af88c0bede06bfd897a463f0
+  checksum: 10/529685994676068a18f4bf6329252c66a62c1ef160f6e9d4b3a916330189cc1628fb30c983625d38295cef2999438e14ecb611fcd8a484b7c479b6dcf29f7679
   languageName: node
   linkType: hard
 
-"@gitbeaker/requester-utils@npm:^35.8.1":
-  version: 35.8.1
-  resolution: "@gitbeaker/requester-utils@npm:35.8.1"
+"@gitbeaker/rest@npm:^43.0.0":
+  version: 43.8.0
+  resolution: "@gitbeaker/rest@npm:43.8.0"
   dependencies:
-    form-data: "npm:^4.0.0"
-    qs: "npm:^6.10.1"
-    xcase: "npm:^2.0.1"
-  checksum: 10/f939216443682303b80b72fa59158cf3fb4a95d31251bb0b4cffa83bd0e0ad0e949645aaaa08fe4dfcd7d06ea5a1547e5688c02b608e8bc76b1e12286935c265
+    "@gitbeaker/core": "npm:^43.8.0"
+    "@gitbeaker/requester-utils": "npm:^43.8.0"
+  checksum: 10/a29493ee1e0e789a0fa4307108c616bb287f33a390262a57025461140a284ae1284918ff4d4e91d3351e61b050eea55ffe2ca7551ffcb6be29ae22c67136a463
   languageName: node
   linkType: hard
 
@@ -15336,13 +15332,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"decode-uri-component@npm:^0.2.2":
-  version: 0.2.2
-  resolution: "decode-uri-component@npm:0.2.2"
-  checksum: 10/17a0e5fa400bf9ea84432226e252aa7b5e72793e16bf80b907c99b46a799aeacc139ec20ea57121e50c7bd875a1a4365928f884e92abf02e21a5a13790a0f33e
-  languageName: node
-  linkType: hard
-
 "decompress-response@npm:^6.0.0":
   version: 6.0.0
   resolution: "decompress-response@npm:6.0.0"
@@ -15488,13 +15477,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"delay@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "delay@npm:5.0.0"
-  checksum: 10/62f151151ecfde0d9afbb8a6be37a6d103c4cb24f35a20ef3fe56f920b0d0d0bb02bc9c0a3084d0179ef669ca332b91155f2ee4d9854622cd2cdba5fc95285f9
-  languageName: node
-  linkType: hard
-
 "delayed-stream@npm:~1.0.0":
   version: 1.0.0
   resolution: "delayed-stream@npm:1.0.0"
@@ -17187,13 +17169,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"filter-obj@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "filter-obj@npm:1.1.0"
-  checksum: 10/9d681939eec2b4b129cb4f307b7e93d954a0657421d4e5357d86093b26d3f4f570909ed43717dcfd62428b3cf8cddd9841b35f9d40d12ac62cfabaa677942593
-  languageName: node
-  linkType: hard
-
 "finalhandler@npm:1.1.2":
   version: 1.1.2
   resolution: "finalhandler@npm:1.1.2"
@@ -20503,13 +20478,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ky@npm:0.28.7":
-  version: 0.28.7
-  resolution: "ky@npm:0.28.7"
-  checksum: 10/d9d8da51a337943c6133d4188f9e895ff17280cdb40f012213a9fbfbe9e66116dbeaa36372cc676fe01b98120161e83bb400ee6a6afbda4fb5ef8f66669ce8b0
-  languageName: node
-  linkType: hard
-
 "language-subtag-registry@npm:^0.3.20":
   version: 0.3.23
   resolution: "language-subtag-registry@npm:0.3.23"
@@ -20572,13 +20540,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"li@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "li@npm:1.3.0"
-  checksum: 10/825a1e132da5263e16cf24df92b787c5030c6549be66a8b2087e74ca56474aa681183f3a11b5f14e61d5d583af5f776ecf3b320ad689842511f36030339f6a0c
-  languageName: node
-  linkType: hard
-
 "lilconfig@npm:^2.0.3, lilconfig@npm:^2.0.5":
   version: 2.1.0
   resolution: "lilconfig@npm:2.1.0"
@@ -23655,6 +23616,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"picomatch-browser@npm:^2.2.6":
+  version: 2.2.6
+  resolution: "picomatch-browser@npm:2.2.6"
+  checksum: 10/0136abee4bbef256e9b6b20676873807e11cc6d04d52d4cd4e9e5c7b48b0888e67f224873eb7eaba6da2a5356647e5aa9a2ef62ad98a675c7940344bfae0238e
+  languageName: node
+  linkType: hard
+
 "picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.3, picomatch@npm:^2.3.1":
   version: 2.3.1
   resolution: "picomatch@npm:2.3.1"
@@ -24538,18 +24506,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"query-string@npm:^7.0.0":
-  version: 7.1.3
-  resolution: "query-string@npm:7.1.3"
-  dependencies:
-    decode-uri-component: "npm:^0.2.2"
-    filter-obj: "npm:^1.1.0"
-    split-on-first: "npm:^1.0.0"
-    strict-uri-encode: "npm:^2.0.0"
-  checksum: 10/3b6f2c167e76ca4094c5f1a9eb276efcbb9ebfd8b1a28c413f3c4e4e7d6428c8187bf46c8cbc9f92a229369dd0015de10a7fd712c8cee98d5d84c2ac6140357e
-  languageName: node
-  linkType: hard
-
 "querystring-es3@npm:^0.2.1":
   version: 0.2.1
   resolution: "querystring-es3@npm:0.2.1"
@@ -24667,6 +24623,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rate-limiter-flexible@npm:^8.0.1":
+  version: 8.3.0
+  resolution: "rate-limiter-flexible@npm:8.3.0"
+  checksum: 10/9c8d7a3224e3a57fdf7da721dabdb4942eb7dd7b5f3aa4cd57e2185928d5842855a8dc2e1db5e0403987d369972d0567e98aade2c2daa71436ebdae704e5a8ff
+  languageName: node
+  linkType: hard
+
 "raw-body@npm:^2.4.1, raw-body@npm:~2.5.3":
   version: 2.5.3
   resolution: "raw-body@npm:2.5.3"
@@ -26861,13 +26824,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"split-on-first@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "split-on-first@npm:1.1.0"
-  checksum: 10/16ff85b54ddcf17f9147210a4022529b343edbcbea4ce977c8f30e38408b8d6e0f25f92cd35b86a524d4797f455e29ab89eb8db787f3c10708e0b47ebf528d30
-  languageName: node
-  linkType: hard
-
 "split2@npm:^4.1.0":
   version: 4.2.0
   resolution: "split2@npm:4.2.0"
@@ -27082,13 +27038,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strict-uri-encode@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "strict-uri-encode@npm:2.0.0"
-  checksum: 10/eaac4cf978b6fbd480f1092cab8b233c9b949bcabfc9b598dd79a758f7243c28765ef7639c876fa72940dac687181b35486ea01ff7df3e65ce3848c64822c581
-  languageName: node
-  linkType: hard
-
 "string-argv@npm:~0.3.1":
   version: 0.3.2
   resolution: "string-argv@npm:0.3.2"

workspaces/scaffolder-relation-processor/.changeset/clean-humans-glow.md

@@ -0,0 +1,5 @@
+---
+'@backstage-community/plugin-catalog-backend-module-scaffolder-relation-processor': patch
+---
+
+Updated dependency `@gitbeaker/rest` to `^43.0.0`.

workspaces/scaffolder-relation-processor/plugins/catalog-backend-module-scaffolder-relation-processor/package.json

@@ -48,7 +48,7 @@
     "@backstage/plugin-events-node": "^0.4.18",
     "@backstage/plugin-notifications-common": "^0.2.0",
     "@backstage/plugin-notifications-node": "^0.2.22",
-    "@gitbeaker/rest": "^42.0.0",
+    "@gitbeaker/rest": "^43.0.0",
     "@octokit/core": "^6.0.0",
     "git-url-parse": "^16.1.0",
     "octokit-plugin-create-pull-request": "^6.0.1"