Merge pull request #96 from spreadshirt/bump-backstage

Bump backstage dependencies to version 1.26.0
spreadshirt · Apr 17, 2024 · cfed8c9 · cfed8c9
2 parents a54d30f + 5676413
commit cfed8c9
Show file tree

Hide file tree

Showing 11 changed files with 1,396 additions and 439 deletions.
diff --git a/.changeset/forty-pigs-do.md b/.changeset/forty-pigs-do.md
@@ -0,0 +1,5 @@
+---
+'@spreadshirt/backstage-plugin-s3-viewer-backend': patch
+---
+
+Use the `LoggerService` instead of the winstonLogger helper method, since the upstream plugins support the new service type now
diff --git a/.changeset/smooth-badgers-move.md b/.changeset/smooth-badgers-move.md
@@ -0,0 +1,8 @@
+---
+'@spreadshirt/backstage-plugin-s3-viewer': patch
+'@spreadshirt/backstage-plugin-s3-viewer-backend': patch
+'@spreadshirt/backstage-plugin-s3-viewer-common': patch
+'@spreadshirt/backstage-plugin-s3-viewer-node': patch
+---
+
+Bump backstage dependencies to version 1.26.0
diff --git a/.changeset/young-maps-love.md b/.changeset/young-maps-love.md
@@ -0,0 +1,5 @@
+---
+'@spreadshirt/backstage-plugin-s3-viewer': patch
+---
+
+Align some `@testing-library/*` dependencies with upstream
diff --git a/backstage.json b/backstage.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.25.0"
+  "version": "1.26.0"
 }
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "npm:release": "yarn install && tsc && yarn build:all && changeset publish"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.2",
+    "@backstage/cli": "^0.26.3",
     "@changesets/cli": "^2.24.4",
     "@spotify/prettier-config": "^12.0.0",
     "@types/react": "^18.0.2",

diff --git a/plugins/s3-viewer-backend/package.json b/plugins/s3-viewer-backend/package.json
@@ -34,15 +34,15 @@
     "@aws-sdk/client-s3": "^3.350.0",
     "@aws-sdk/protocol-http": "^3.347.0",
     "@aws-sdk/signature-v4": "^3.347.0",
-    "@backstage/backend-common": "^0.21.6",
-    "@backstage/backend-plugin-api": "^0.6.16",
-    "@backstage/backend-tasks": "^0.5.21",
+    "@backstage/backend-common": "^0.21.7",
+    "@backstage/backend-plugin-api": "^0.6.17",
+    "@backstage/backend-tasks": "^0.5.22",
     "@backstage/config": "^1.2.0",
     "@backstage/errors": "^1.2.4",
-    "@backstage/plugin-auth-node": "^0.4.11",
-    "@backstage/plugin-permission-backend": "^0.5.40",
+    "@backstage/plugin-auth-node": "^0.4.12",
+    "@backstage/plugin-permission-backend": "^0.5.41",
     "@backstage/plugin-permission-common": "^0.7.13",
-    "@backstage/plugin-permission-node": "^0.7.27",
+    "@backstage/plugin-permission-node": "^0.7.28",
     "@backstage/types": "^1.1.1",
     "@spreadshirt/backstage-plugin-s3-viewer-common": "^0.5.0",
     "@spreadshirt/backstage-plugin-s3-viewer-node": "0.2.0",
@@ -58,9 +58,9 @@
     "zod": "^3.21.4"
   },
   "devDependencies": {
-    "@backstage/backend-test-utils": "^0.3.6",
-    "@backstage/cli": "^0.26.2",
-    "@backstage/test-utils": "^1.5.3",
+    "@backstage/backend-test-utils": "^0.3.7",
+    "@backstage/cli": "^0.26.3",
+    "@backstage/test-utils": "^1.5.4",
     "@types/cookie-parser": "^1.4.3",
     "@types/jest": "*",
     "@types/supertest": "^2.0.8",

diff --git a/plugins/s3-viewer-backend/src/service/router.ts b/plugins/s3-viewer-backend/src/service/router.ts
@@ -17,8 +17,6 @@
 import {
   HostDiscovery,
   createLegacyAuthAdapters,
-  // TODO: Remove this function as soon as all plugins support new LoggerService
-  loggerToWinstonLogger,
 } from '@backstage/backend-common';
 import { PluginTaskScheduler } from '@backstage/backend-tasks';
 import { Config } from '@backstage/config';
@@ -81,10 +79,6 @@ export async function createPluginPermissions({
   config,
 }: RouterPermissionOptions): Promise<express.Router> {
   const discovery = HostDiscovery.fromConfig(config);
-  return await createPermissionPlugin({
-    config: config,
-    logger: loggerToWinstonLogger(logger),
-    discovery: discovery,
-    policy: new TestPermissionPolicy(),
-  });
+  const policy = new TestPermissionPolicy();
+  return await createPermissionPlugin({ config, logger, discovery, policy });
 }
diff --git a/plugins/s3-viewer-common/package.json b/plugins/s3-viewer-common/package.json
@@ -32,7 +32,7 @@
     "postpack": "backstage-cli package postpack"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.2"
+    "@backstage/cli": "^0.26.3"
   },
   "files": [
     "dist"

diff --git a/plugins/s3-viewer-node/package.json b/plugins/s3-viewer-node/package.json
@@ -30,13 +30,13 @@
     "postpack": "backstage-cli package postpack"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.2"
+    "@backstage/cli": "^0.26.3"
   },
   "files": [
     "dist"
   ],
   "dependencies": {
-    "@backstage/backend-plugin-api": "^0.6.16",
+    "@backstage/backend-plugin-api": "^0.6.17",
     "@spreadshirt/backstage-plugin-s3-viewer-common": "^0.5.0",
     "@types/express": "*",
     "express": "^4.17.1",

diff --git a/plugins/s3-viewer/package.json b/plugins/s3-viewer/package.json
@@ -31,8 +31,8 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.14.3",
-    "@backstage/core-plugin-api": "^1.9.1",
+    "@backstage/core-components": "^0.14.4",
+    "@backstage/core-plugin-api": "^1.9.2",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "^4.0.0-alpha.61",
@@ -44,12 +44,12 @@
     "react-router": "^6.3.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.2",
-    "@backstage/core-app-api": "^1.12.3",
-    "@backstage/dev-utils": "^1.0.30",
-    "@backstage/test-utils": "^1.5.3",
+    "@backstage/cli": "^0.26.3",
+    "@backstage/core-app-api": "^1.12.4",
+    "@backstage/dev-utils": "^1.0.31",
+    "@backstage/test-utils": "^1.5.4",
     "@testing-library/jest-dom": "^6.0.0",
-    "@testing-library/react": "^14.0.0",
+    "@testing-library/react": "^15.0.0",
     "@testing-library/user-event": "^14.0.0",
     "@types/jest": "*",
     "cross-fetch": "^3.1.5",