Skip to content

Commit

Permalink
chore(deps): rebase 1.2.x plugins to their latest patch versions (#2328)
Browse files Browse the repository at this point in the history
* chore: replaced Logger with backstage implementation LoggerService (#1756)

* chore: replaced Logger with backstage implementation LoggerService

Signed-off-by: Kashish Mittal <[email protected]>

* Update plugins/kiali-backend/src/plugin.ts

Co-authored-by: Paul Schultz <[email protected]>

* removed winstonLogger

Signed-off-by: Kashish Mittal <[email protected]>

* Update plugins/kiali-backend/src/clients/fetch.ts

Co-authored-by: Paul Schultz <[email protected]>

* changed log to logger

Signed-off-by: Kashish Mittal <[email protected]>

* changed longhand instances to shorthand

Signed-off-by: Kashish Mittal <[email protected]>

* fixed plugins/scaffolder-annotator-action/src/actions/annotator/mocks/catalog-info.yaml

Signed-off-by: Kashish Mittal <[email protected]>

* ran yarn install

Signed-off-by: Kashish Mittal <[email protected]>

* fixed type errors

Signed-off-by: Kashish Mittal <[email protected]>

* Update plugins/3scale-backend/src/providers/ThreeScaleApiEntityProvider.ts

Co-authored-by: Paul Schultz <[email protected]>

* Update plugins/orchestrator-backend/src/service/ScaffolderService.ts

Co-authored-by: Paul Schultz <[email protected]>

* Update plugins/orchestrator-backend/src/service/ScaffolderService.ts

Co-authored-by: Frank Kong <[email protected]>

---------

Signed-off-by: Kashish Mittal <[email protected]>
Co-authored-by: Paul Schultz <[email protected]>
Co-authored-by: Frank Kong <[email protected]>

* fix: missing postversion script is several plugins and missing turbo dependency (#1811)

* chore: add the `postversion` script where it was missing.

Signed-off-by: David Festal <[email protected]>

* fix: `export-dynamic` should depend on `tsc` in turbo

Signed-off-by: David Festal <[email protected]>

---------

Signed-off-by: David Festal <[email protected]>

* chore(release): 1.5.16 [skip ci]

* **rbac:** add type checks with generics for audit log ([#1789](#1789)) ([ac69838](ac69838))

* **cli:** fix the removal of type definitions by `export-dynamic`. ([#1810](#1810)) ([8472d91](8472d91))
* **feedback:** fixed feedback backend plugin crashing ([#1809](#1809)) ([e4a571e](e4a571e))
* **feedback:** update EntityPage component ([#1798](#1798)) ([f5b04b5](f5b04b5))
* **kiali:** fix dev links ([#1801](#1801)) ([2a86a5e](2a86a5e))
* **kiali:** remove debug window ([#1793](#1793)) ([b5b5376](b5b5376))
* **kiali:** sanitize input for CWE-79 ([#1786](#1786)) ([9ba95bb](9ba95bb))
* missing postversion script is several plugins and missing turbo dependency ([#1811](#1811)) ([4dfe4f5](4dfe4f5))
* **orchestrator:** fix error handling in case data index failed to start ([#1804](#1804)) ([27affb7](27affb7))
* **topology:** remove check for catalog entity permission ([#1800](#1800)) ([fd6ae41](fd6ae41))

* **kiali:** update development doc for alpha backend([#1720](#1720)) ([e06e9be](e06e9be))

* chore(release): 1.6.16 [skip ci]

* **rbac:** add type checks with generics for audit log ([#1789](#1789)) ([ac69838](ac69838))

* **cli:** fix the removal of type definitions by `export-dynamic`. ([#1810](#1810)) ([8472d91](8472d91))
* **feedback:** fixed feedback backend plugin crashing ([#1809](#1809)) ([e4a571e](e4a571e))
* **feedback:** update EntityPage component ([#1798](#1798)) ([f5b04b5](f5b04b5))
* **kiali:** fix dev links ([#1801](#1801)) ([2a86a5e](2a86a5e))
* **kiali:** remove debug window ([#1793](#1793)) ([b5b5376](b5b5376))
* **kiali:** sanitize input for CWE-79 ([#1786](#1786)) ([9ba95bb](9ba95bb))
* missing postversion script is several plugins and missing turbo dependency ([#1811](#1811)) ([4dfe4f5](4dfe4f5))
* **orchestrator:** fix error handling in case data index failed to start ([#1804](#1804)) ([27affb7](27affb7))
* **topology:** remove check for catalog entity permission ([#1800](#1800)) ([fd6ae41](fd6ae41))

* **kiali:** update development doc for alpha backend([#1720](#1720)) ([e06e9be](e06e9be))

* fix(feedback): fixed feedback backend plugin crashing (#1809)

fix(feedback): Fixed feedback plugin crashing when integrations are not found

Signed-off-by: YashOswalYO <[email protected]>

* chore(release): 1.3.10 [skip ci]

* **cli:** fix the removal of type definitions by `export-dynamic`. ([#1810](#1810)) ([8472d91](8472d91))
* missing postversion script is several plugins and missing turbo dependency ([#1811](#1811)) ([4dfe4f5](4dfe4f5))

* chore(release): 1.9.13 [skip ci]

* **rbac:** add type checks with generics for audit log ([#1789](#1789)) ([ac69838](ac69838))

* **cli:** fix the removal of type definitions by `export-dynamic`. ([#1810](#1810)) ([8472d91](8472d91))
* **feedback:** fixed feedback backend plugin crashing ([#1809](#1809)) ([e4a571e](e4a571e))
* **feedback:** update EntityPage component ([#1798](#1798)) ([f5b04b5](f5b04b5))
* **kiali:** fix dev links ([#1801](#1801)) ([2a86a5e](2a86a5e))
* **kiali:** remove debug window ([#1793](#1793)) ([b5b5376](b5b5376))
* **kiali:** sanitize input for CWE-79 ([#1786](#1786)) ([9ba95bb](9ba95bb))
* missing postversion script is several plugins and missing turbo dependency ([#1811](#1811)) ([4dfe4f5](4dfe4f5))
* **orchestrator:** fix error handling in case data index failed to start ([#1804](#1804)) ([27affb7](27affb7))
* **topology:** remove check for catalog entity permission ([#1800](#1800)) ([fd6ae41](fd6ae41))

* **kiali:** update development doc for alpha backend([#1720](#1720)) ([e06e9be](e06e9be))

* chore(release): 1.10.23 [skip ci]

* **cli:** fix the removal of type definitions by `export-dynamic`. ([#1810](#1810)) ([8472d91](8472d91))
* **feedback:** fixed feedback backend plugin crashing ([#1809](#1809)) ([e4a571e](e4a571e))
* **feedback:** update EntityPage component ([#1798](#1798)) ([f5b04b5](f5b04b5))
* **kiali:** fix dev links ([#1801](#1801)) ([2a86a5e](2a86a5e))
* **kiali:** remove debug window ([#1793](#1793)) ([b5b5376](b5b5376))
* missing postversion script is several plugins and missing turbo dependency ([#1811](#1811)) ([4dfe4f5](4dfe4f5))
* **orchestrator:** fix error handling in case data index failed to start ([#1804](#1804)) ([27affb7](27affb7))
* **topology:** remove check for catalog entity permission ([#1800](#1800)) ([fd6ae41](fd6ae41))

* **kiali:** update development doc for alpha backend([#1720](#1720)) ([e06e9be](e06e9be))

* chore(release): 1.4.15 [skip ci]

* **rbac:** add type checks with generics for audit log ([#1789](#1789)) ([ac69838](ac69838))

* **cli:** fix the removal of type definitions by `export-dynamic`. ([#1810](#1810)) ([8472d91](8472d91))
* **feedback:** fixed feedback backend plugin crashing ([#1809](#1809)) ([e4a571e](e4a571e))
* **feedback:** update EntityPage component ([#1798](#1798)) ([f5b04b5](f5b04b5))
* **kiali:** fix dev links ([#1801](#1801)) ([2a86a5e](2a86a5e))
* **kiali:** remove debug window ([#1793](#1793)) ([b5b5376](b5b5376))
* **kiali:** sanitize input for CWE-79 ([#1786](#1786)) ([9ba95bb](9ba95bb))
* missing postversion script is several plugins and missing turbo dependency ([#1811](#1811)) ([4dfe4f5](4dfe4f5))
* **orchestrator:** fix error handling in case data index failed to start ([#1804](#1804)) ([27affb7](27affb7))
* **topology:** remove check for catalog entity permission ([#1800](#1800)) ([fd6ae41](fd6ae41))

* **kiali:** update development doc for alpha backend([#1720](#1720)) ([e06e9be](e06e9be))

* chore(release): 1.9.8 [skip ci]

* **cli:** fix the removal of type definitions by `export-dynamic`. ([#1810](#1810)) ([8472d91](8472d91))
* **feedback:** fixed feedback backend plugin crashing ([#1809](#1809)) ([e4a571e](e4a571e))
* missing postversion script is several plugins and missing turbo dependency ([#1811](#1811)) ([4dfe4f5](4dfe4f5))

* chore(release): 4.2.0 [skip ci]

* **rbac:** add type checks with generics for audit log ([#1789](#1789)) ([ac69838](ac69838))
* switch defaults of the `--embed-as-dependencies` and `in-place` options. ([#1787](#1787)) ([049e675](049e675))

* chore(release): 1.4.14 [skip ci]

## [1.4.14](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-06-13)

### Features

* **rbac:** add type checks with generics for audit log ([#1789](#1789)) ([ac69838](ac69838))

### Bug Fixes

* **cli:** fix the removal of type definitions by `export-dynamic`. ([#1810](#1810)) ([8472d91](8472d91))
* **feedback:** fixed feedback backend plugin crashing ([#1809](#1809)) ([e4a571e](e4a571e))
* **feedback:** update EntityPage component ([#1798](#1798)) ([f5b04b5](f5b04b5))
* **kiali:** fix dev links ([#1801](#1801)) ([2a86a5e](2a86a5e))
* **kiali:** remove debug window ([#1793](#1793)) ([b5b5376](b5b5376))
* **kiali:** sanitize input for CWE-79 ([#1786](#1786)) ([9ba95bb](9ba95bb))
* missing postversion script is several plugins and missing turbo dependency ([#1811](#1811)) ([4dfe4f5](4dfe4f5))
* **orchestrator:** fix error handling in case data index failed to start ([#1804](#1804)) ([27affb7](27affb7))
* **topology:** remove check for catalog entity permission ([#1800](#1800)) ([fd6ae41](fd6ae41))

### Documentation

* **kiali:** update development doc for alpha backend([#1720](#1720)) ([e06e9be](e06e9be))

* chore(release): 1.6.11 [skip ci]

* **rbac:** add type checks with generics for audit log ([#1789](#1789)) ([ac69838](ac69838))

* **cli:** fix the removal of type definitions by `export-dynamic`. ([#1810](#1810)) ([8472d91](8472d91))
* **feedback:** fixed feedback backend plugin crashing ([#1809](#1809)) ([e4a571e](e4a571e))
* **feedback:** update EntityPage component ([#1798](#1798)) ([f5b04b5](f5b04b5))
* **kiali:** fix dev links ([#1801](#1801)) ([2a86a5e](2a86a5e))
* **kiali:** remove debug window ([#1793](#1793)) ([b5b5376](b5b5376))
* **kiali:** sanitize input for CWE-79 ([#1786](#1786)) ([9ba95bb](9ba95bb))
* missing postversion script is several plugins and missing turbo dependency ([#1811](#1811)) ([4dfe4f5](4dfe4f5))
* **orchestrator:** fix error handling in case data index failed to start ([#1804](#1804)) ([27affb7](27affb7))
* **topology:** remove check for catalog entity permission ([#1800](#1800)) ([fd6ae41](fd6ae41))

* **kiali:** update development doc for alpha backend([#1720](#1720)) ([e06e9be](e06e9be))

* chore(release): 1.0.3 [skip ci]

* **rbac:** add type checks with generics for audit log ([#1789](#1789)) ([ac69838](ac69838))
* switch defaults of the `--embed-as-dependencies` and `in-place` options. ([#1787](#1787)) ([049e675](049e675))

* **cli:** fix the removal of type definitions by `export-dynamic`. ([#1810](#1810)) ([8472d91](8472d91))
* **feedback:** fixed feedback backend plugin crashing ([#1809](#1809)) ([e4a571e](e4a571e))
* **feedback:** update EntityPage component ([#1798](#1798)) ([f5b04b5](f5b04b5))
* **kiali:** fix dev links ([#1801](#1801)) ([2a86a5e](2a86a5e))
* **kiali:** remove debug window ([#1793](#1793)) ([b5b5376](b5b5376))
* **kiali:** sanitize input for CWE-79 ([#1786](#1786)) ([9ba95bb](9ba95bb))
* missing postversion script is several plugins and missing turbo dependency ([#1811](#1811)) ([4dfe4f5](4dfe4f5))
* **orchestrator:** fix error handling in case data index failed to start ([#1804](#1804)) ([27affb7](27affb7))
* **topology:** remove check for catalog entity permission ([#1800](#1800)) ([fd6ae41](fd6ae41))

* **kiali:** update development doc for alpha backend([#1720](#1720)) ([e06e9be](e06e9be))

* chore(release): 1.4.15 [skip ci]

* **rbac:** add type checks with generics for audit log ([#1789](#1789)) ([ac69838](ac69838))

* **cli:** fix the removal of type definitions by `export-dynamic`. ([#1810](#1810)) ([8472d91](8472d91))
* **feedback:** fixed feedback backend plugin crashing ([#1809](#1809)) ([e4a571e](e4a571e))
* **feedback:** update EntityPage component ([#1798](#1798)) ([f5b04b5](f5b04b5))
* **kiali:** fix dev links ([#1801](#1801)) ([2a86a5e](2a86a5e))
* **kiali:** remove debug window ([#1793](#1793)) ([b5b5376](b5b5376))
* **kiali:** sanitize input for CWE-79 ([#1786](#1786)) ([9ba95bb](9ba95bb))
* missing postversion script is several plugins and missing turbo dependency ([#1811](#1811)) ([4dfe4f5](4dfe4f5))
* **orchestrator:** fix error handling in case data index failed to start ([#1804](#1804)) ([27affb7](27affb7))
* **topology:** remove check for catalog entity permission ([#1800](#1800)) ([fd6ae41](fd6ae41))

* **kiali:** update development doc for alpha backend([#1720](#1720)) ([e06e9be](e06e9be))

* chore(release): 1.4.13 [skip ci]

* **rbac:** add audit log for RBAC backend ([#1726](#1726)) ([e50464b](e50464b))

* **audit-log:** deep copy objects passed into audit logger so redactor will not modify objects and remove `auditErrorLog` function ([#1730](#1730)) ([379c241](379c241))
* **deps:** update kiali dependencies (minor) ([#1779](#1779)) ([ff2b421](ff2b421))
* **rbac:** add support for scaling ([#1757](#1757)) ([caddc83](caddc83))
* **rbac:** fix handling condition action conflicts ([#1781](#1781)) ([966b2b2](966b2b2))
* **rbac:** fix role list view permission policies column value ([#1714](#1714)) ([07200e4](07200e4))

* chore(release): 1.0.2 [skip ci]

* chore(release): 1.4.13 [skip ci]

* **rbac:** add audit log for RBAC backend ([#1726](#1726)) ([e50464b](e50464b))

* **deps:** update kiali dependencies (minor) ([#1779](#1779)) ([ff2b421](ff2b421))
* **rbac:** fix handling condition action conflicts ([#1781](#1781)) ([966b2b2](966b2b2))

* chore(release): 1.9.11 [skip ci]

* **rbac:** add audit log for RBAC backend ([#1726](#1726)) ([e50464b](e50464b))

* **audit-log:** deep copy objects passed into audit logger so redactor will not modify objects and remove `auditErrorLog` function ([#1730](#1730)) ([379c241](379c241))
* **deps:** update kiali dependencies (minor) ([#1779](#1779)) ([ff2b421](ff2b421))
* **rbac:** add support for scaling ([#1757](#1757)) ([caddc83](caddc83))
* **rbac:** fix handling condition action conflicts ([#1781](#1781)) ([966b2b2](966b2b2))
* **rbac:** fix role list view permission policies column value ([#1714](#1714)) ([07200e4](07200e4))

* chore(release): 1.6.14 [skip ci]

* **rbac:** add audit log for RBAC backend ([#1726](#1726)) ([e50464b](e50464b))

* **deps:** update kiali dependencies (minor) ([#1779](#1779)) ([ff2b421](ff2b421))
* **rbac:** add support for scaling ([#1757](#1757)) ([caddc83](caddc83))
* **rbac:** fix handling condition action conflicts ([#1781](#1781)) ([966b2b2](966b2b2))
* **rbac:** fix role list view permission policies column value ([#1714](#1714)) ([07200e4](07200e4))

* chore(release): 1.5.14 [skip ci]

* **rbac:** add audit log for RBAC backend ([#1726](#1726)) ([e50464b](e50464b))

* **deps:** update kiali dependencies (minor) ([#1779](#1779)) ([ff2b421](ff2b421))
* **rbac:** add support for scaling ([#1757](#1757)) ([caddc83](caddc83))
* **rbac:** fix handling condition action conflicts ([#1781](#1781)) ([966b2b2](966b2b2))
* **rbac:** fix role list view permission policies column value ([#1714](#1714)) ([07200e4](07200e4))

* chore(deps): regen yarn.lock

* chore(deps): restore 1.2.x dependencies on rbac-backend

* chore(deps): regen yarn.lock

---------

Signed-off-by: Kashish Mittal <[email protected]>
Signed-off-by: David Festal <[email protected]>
Signed-off-by: YashOswalYO <[email protected]>
Co-authored-by: Kashish Mittal <[email protected]>
Co-authored-by: Paul Schultz <[email protected]>
Co-authored-by: Frank Kong <[email protected]>
Co-authored-by: David Festal <[email protected]>
Co-authored-by: semantic-release-bot <[email protected]>
Co-authored-by: Yash Oswal <[email protected]>
  • Loading branch information
7 people authored Oct 9, 2024
1 parent a9ea53e commit b3ca316
Show file tree
Hide file tree
Showing 109 changed files with 635 additions and 1,857 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
"@types/express": "^{{versionQuery '@types/express' '4.17.6'}}",
"express": "^{{versionQuery 'express' '4.17.1'}}",
"express-promise-router": "^{{versionQuery 'express-promise-router' '4.1.0'}}",
"winston": "^{{versionQuery 'winston' '3.2.1'}}",
"node-fetch": "^{{versionQuery 'node-fetch' '2.6.7'}}",
"yn": "^{{versionQuery 'yn' '4.0.0'}}"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { loggerToWinstonLogger } from '@backstage/backend-common';
import { coreServices, createBackendPlugin } from '@backstage/backend-plugin-api';

import { createRouter } from './service/router';
Expand All @@ -18,7 +17,7 @@ export const {{id}}Plugin = createBackendPlugin({
http: coreServices.httpRouter,
},
async init({ config, logger, http }) {
http.use(() => createRouter({...config, logger: loggerToWinstonLogger(logger)}));
http.use(() => createRouter({...config, logger}));
},
});
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { errorHandler } from '@backstage/backend-common';
import express from 'express';
import Router from 'express-promise-router';
import { Logger } from 'winston';
import { LoggerService } from '@backstage/backend-plugin-api';

export interface RouterOptions {
logger: Logger;
logger: LoggerService;
}

export async function createRouter(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { createServiceBuilder } from '@backstage/backend-common';
import { Server } from 'http';
import { Logger } from 'winston';
import { LoggerService } from '@backstage/backend-plugin-api';
import { createRouter } from './router';

export interface ServerOptions {
port: number;
enableCors: boolean;
logger: Logger;
logger: LoggerService;
}

export async function startStandaloneServer(
Expand Down
18 changes: 18 additions & 0 deletions plugins/3scale-backend/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
## @janus-idp/backstage-plugin-3scale-backend [1.5.16](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-06-13)



### Dependencies

* **@janus-idp/cli:** upgraded to 1.10.1

## @janus-idp/backstage-plugin-3scale-backend [1.5.15](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-06-05)



### Dependencies

* **@janus-idp/cli:** upgraded to 1.10.0

## @janus-idp/backstage-plugin-3scale-backend [1.5.14](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-06-04)

## @janus-idp/backstage-plugin-3scale-backend [1.5.13](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-06-03)

## @janus-idp/backstage-plugin-3scale-backend [1.5.12](https://github.com/janus-idp/backstage-plugins/compare/@janus-idp/[email protected]...@janus-idp/[email protected]) (2024-06-03)
Expand Down
23 changes: 16 additions & 7 deletions plugins/3scale-backend/dist-dynamic/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@janus-idp/backstage-plugin-3scale-backend-dynamic",
"version": "1.5.13",
"version": "1.5.16",
"license": "Apache-2.0",
"main": "dist/index.cjs.js",
"types": "dist/index.d.ts",
Expand All @@ -10,7 +10,8 @@
"types": "dist/index.d.ts"
},
"backstage": {
"role": "backend-plugin"
"role": "backend-plugin",
"supported-versions": "1.26.5"
},
"exports": {
".": {
Expand All @@ -24,9 +25,7 @@
"./package.json": "./package.json"
},
"scripts": {},
"dependencies": {
"winston": "^3.11.0"
},
"dependencies": {},
"devDependencies": {},
"files": [
"dist",
Expand All @@ -35,13 +34,23 @@
"alpha"
],
"configSchema": "config.d.ts",
"repository": "github:janus-idp/backstage-plugins",
"repository": {
"type": "git",
"url": "https://github.com/janus-idp/backstage-plugins",
"directory": "plugins/3scale-backend"
},
"keywords": [
"support:tech-preview",
"lifecycle:active",
"backstage",
"plugin"
],
"homepage": "https://janus-idp.io/",
"homepage": "https://red.ht/rhdh",
"bugs": "https://github.com/janus-idp/backstage-plugins/issues",
"maintainers": [
"@janus-idp/maintainers-plugins"
],
"author": "Red Hat",
"bundleDependencies": true,
"peerDependencies": {
"@backstage/backend-common": "^0.21.7",
Expand Down
203 changes: 0 additions & 203 deletions plugins/3scale-backend/dist-dynamic/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,6 @@
"@smithy/util-buffer-from" "^2.2.0"
tslib "^2.6.2"

"@colors/[email protected]", "@colors/colors@^1.6.0":
version "1.6.0"
resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.6.0.tgz#ec6cd237440700bc23ca23087f513c75508958b0"
integrity sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==

"@dabh/diagnostics@^2.0.2":
version "2.0.3"
resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.3.tgz#7f7e97ee9a725dffc7808d93668cc984e1dc477a"
integrity sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==
dependencies:
colorspace "1.1.x"
enabled "2.0.x"
kuler "^2.0.0"

"@smithy/is-array-buffer@^2.2.0":
version "2.2.0"
resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz#f84f0d9f9a36601a9ca9381688bd1b726fd39111"
Expand All @@ -39,196 +25,7 @@
"@smithy/is-array-buffer" "^2.2.0"
tslib "^2.6.2"

"@types/triple-beam@^1.3.2":
version "1.3.5"
resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.5.tgz#74fef9ffbaa198eb8b588be029f38b00299caa2c"
integrity sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==

async@^3.2.3:
version "3.2.5"
resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66"
integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==

color-convert@^1.9.3:
version "1.9.3"
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
dependencies:
color-name "1.1.3"

[email protected]:
version "1.1.3"
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==

color-name@^1.0.0:
version "1.1.4"
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==

color-string@^1.6.0:
version "1.9.1"
resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4"
integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==
dependencies:
color-name "^1.0.0"
simple-swizzle "^0.2.2"

color@^3.1.3:
version "3.2.1"
resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164"
integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==
dependencies:
color-convert "^1.9.3"
color-string "^1.6.0"

[email protected]:
version "1.1.4"
resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.4.tgz#8d442d1186152f60453bf8070cd66eb364e59243"
integrity sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==
dependencies:
color "^3.1.3"
text-hex "1.0.x"

[email protected]:
version "2.0.0"
resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2"
integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==

fecha@^4.2.0:
version "4.2.3"
resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd"
integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==

[email protected]:
version "1.1.0"
resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc"
integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==

inherits@^2.0.3:
version "2.0.4"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==

is-arrayish@^0.3.1:
version "0.3.2"
resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==

is-stream@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==

kuler@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3"
integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==

logform@^2.3.2, logform@^2.4.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/logform/-/logform-2.6.0.tgz#8c82a983f05d6eaeb2d75e3decae7a768b2bf9b5"
integrity sha512-1ulHeNPp6k/LD8H91o7VYFBng5i1BDE7HoKxVbZiGFidS1Rj65qcywLxX+pVfAPoQJEjRdvKcusKwOupHCVOVQ==
dependencies:
"@colors/colors" "1.6.0"
"@types/triple-beam" "^1.3.2"
fecha "^4.2.0"
ms "^2.1.1"
safe-stable-stringify "^2.3.1"
triple-beam "^1.3.0"

ms@^2.1.1:
version "2.1.3"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==

one-time@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz#e06bc174aed214ed58edede573b433bbf827cb45"
integrity sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==
dependencies:
fn.name "1.x.x"

readable-stream@^3.4.0, readable-stream@^3.6.0:
version "3.6.2"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
dependencies:
inherits "^2.0.3"
string_decoder "^1.1.1"
util-deprecate "^1.0.1"

safe-buffer@~5.2.0:
version "5.2.1"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==

safe-stable-stringify@^2.3.1:
version "2.4.3"
resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886"
integrity sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==

simple-swizzle@^0.2.2:
version "0.2.2"
resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
integrity sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==
dependencies:
is-arrayish "^0.3.1"

[email protected]:
version "0.0.10"
resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==

string_decoder@^1.1.1:
version "1.3.0"
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
dependencies:
safe-buffer "~5.2.0"

[email protected]:
version "1.0.0"
resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5"
integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==

triple-beam@^1.3.0:
version "1.4.1"
resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.4.1.tgz#6fde70271dc6e5d73ca0c3b24e2d92afb7441984"
integrity sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==

tslib@^2.6.2:
version "2.6.2"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==

util-deprecate@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==

winston-transport@^4.7.0:
version "4.7.0"
resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.7.0.tgz#e302e6889e6ccb7f383b926df6936a5b781bd1f0"
integrity sha512-ajBj65K5I7denzer2IYW6+2bNIVqLGDHqDw3Ow8Ohh+vdW+rv4MZ6eiDvHoKhfJFZ2auyN8byXieDDJ96ViONg==
dependencies:
logform "^2.3.2"
readable-stream "^3.6.0"
triple-beam "^1.3.0"

winston@^3.11.0:
version "3.13.0"
resolved "https://registry.yarnpkg.com/winston/-/winston-3.13.0.tgz#e76c0d722f78e04838158c61adc1287201de7ce3"
integrity sha512-rwidmA1w3SE4j0E5MuIufFhyJPBDG7Nu71RkZor1p2+qHvJSZ9GYDA81AyleQcZbh/+V6HjeBdfnTZJm9rSeQQ==
dependencies:
"@colors/colors" "^1.6.0"
"@dabh/diagnostics" "^2.0.2"
async "^3.2.3"
is-stream "^2.0.0"
logform "^2.4.0"
one-time "^1.0.0"
readable-stream "^3.4.0"
safe-stable-stringify "^2.3.1"
stack-trace "0.0.x"
triple-beam "^1.3.0"
winston-transport "^4.7.0"
7 changes: 3 additions & 4 deletions plugins/3scale-backend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@janus-idp/backstage-plugin-3scale-backend",
"version": "1.5.13",
"version": "1.5.16",
"license": "Apache-2.0",
"main": "src/index.ts",
"types": "src/index.ts",
Expand Down Expand Up @@ -47,12 +47,11 @@
"@backstage/catalog-model": "^1.4.5",
"@backstage/config": "^1.2.0",
"@backstage/plugin-catalog-node": "^1.11.1",
"@backstage/backend-dynamic-feature-service": "^0.2.9",
"winston": "^3.11.0"
"@backstage/backend-dynamic-feature-service": "^0.2.9"
},
"devDependencies": {
"@backstage/cli": "0.26.4",
"@janus-idp/cli": "1.9.0",
"@janus-idp/cli": "1.10.1",
"@types/supertest": "2.0.16",
"msw": "1.3.3",
"supertest": "6.3.4"
Expand Down
3 changes: 1 addition & 2 deletions plugins/3scale-backend/src/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { loggerToWinstonLogger } from '@backstage/backend-common';
import {
coreServices,
createBackendModule,
Expand All @@ -36,7 +35,7 @@ export const catalogModule3ScaleEntityProvider = createBackendModule({
async init({ catalog, config, logger, scheduler }) {
catalog.addEntityProvider(
ThreeScaleApiEntityProvider.fromConfig(config, {
logger: loggerToWinstonLogger(logger),
logger,
scheduler: scheduler,
schedule: scheduler.createScheduledTaskRunner({
frequency: { minutes: 30 },
Expand Down
Loading

0 comments on commit b3ca316

Please sign in to comment.