Merge pull request #119 from spreadshirt/bump-backstage

Bump backstage to 1.30.4

.changeset/cool-rockets-confess.md

@@ -0,0 +1,13 @@
+---
+'@spreadshirt/backstage-plugin-s3-viewer-backend': patch
+---
+
+Replace some deprecations caused by the removal of the backend-tasks plugin and deprecate old backend system.
+Please, remove any usage of `RouterOptions` and `createRouter`.
+
+The old backend system methods will be completely removed in the next release, so none of the deprecations 
+caused by these functions are going to be addressed.
+
+More info about this process [in this issue](https://github.com/backstage/community-plugins/issues/1176).
+
+To set up the backend using the new backend system, follow [this documentation](https://github.com/spreadshirt/backstage-plugin-s3/tree/main/plugins/s3-viewer-backend#new-backend-system).

.changeset/poor-falcons-collect.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.30.4

.github/workflows/ci.yml

@@ -21,4 +21,5 @@ jobs:
       - run: yarn ci
         env:
           CI: true
-      - run: yarn backstage-cli versions:check
+      # TODO: Migrate to yarn-3 and use `yarn dedupe`, which is the suggested alternative
+      # - run: yarn backstage-cli versions:check

backstage.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.29.2"
+  "version": "1.30.4"
 }

package.json

@@ -36,7 +36,7 @@
     "npm:release": "yarn install && tsc && yarn build:all && changeset publish"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.11",
+    "@backstage/cli": "^0.27.0",
     "@changesets/cli": "^2.24.4",
     "@spotify/prettier-config": "^12.0.0",
     "@types/react": "^18.0.2",

plugins/s3-viewer-backend/README.md

@@ -14,6 +14,8 @@ It also includes a permission integration, to restrict access to certain data wi
 
 ## Getting started
 
+> :warning: **This setup is deprecated and will be removed in a future release. Please, use the [new backend system instead](#new-backend-system).**
+
 To get started, follow these steps:
 
 1. Install the plugin by running this command:

plugins/s3-viewer-backend/config.d.ts

@@ -1,4 +1,4 @@
-import { TaskScheduleDefinitionConfig } from '@backstage/backend-tasks';
+import { SchedulerServiceTaskScheduleDefinitionConfig } from '@backstage/backend-plugin-api';
 
 /** Configuration for the S3 Viewer plugin */
 export interface Config {
@@ -7,7 +7,9 @@ export interface Config {
      * If defined, it sets the schedule used to refresh the list of buckets
      * @visibility backend
      * */
-    bucketRefreshSchedule: TaskScheduleDefinitionConfig | undefined;
+    bucketRefreshSchedule:
+      | SchedulerServiceTaskScheduleDefinitionConfig
+      | undefined;
 
     /** @visibility backend */
     bucketLocatorMethods: Array<

plugins/s3-viewer-backend/package.json

@@ -39,16 +39,16 @@
   "dependencies": {
     "@aws-crypto/sha256-browser": "^5.2.0",
     "@aws-sdk/client-s3": "^3.360.0",
-    "@backstage/backend-common": "^0.23.3",
-    "@backstage/backend-defaults": "^0.4.1",
-    "@backstage/backend-plugin-api": "^0.7.0",
-    "@backstage/backend-tasks": "^0.5.27",
+    "@backstage/backend-common": "^0.24.1",
+    "@backstage/backend-defaults": "^0.4.4",
+    "@backstage/backend-plugin-api": "^0.8.1",
+    "@backstage/backend-tasks": "^0.6.1",
     "@backstage/config": "^1.2.0",
     "@backstage/errors": "^1.2.4",
-    "@backstage/plugin-auth-node": "^0.4.17",
-    "@backstage/plugin-permission-backend": "^0.5.46",
-    "@backstage/plugin-permission-common": "^0.8.0",
-    "@backstage/plugin-permission-node": "^0.8.0",
+    "@backstage/plugin-auth-node": "^0.5.1",
+    "@backstage/plugin-permission-backend": "^0.5.48",
+    "@backstage/plugin-permission-common": "^0.8.1",
+    "@backstage/plugin-permission-node": "^0.8.2",
     "@backstage/types": "^1.1.1",
     "@smithy/protocol-http": "^4.1.0",
     "@smithy/signature-v4": "^4.1.0",
@@ -66,9 +66,9 @@
     "zod": "^3.21.4"
   },
   "devDependencies": {
-    "@backstage/backend-test-utils": "^0.4.4",
-    "@backstage/cli": "^0.26.11",
-    "@backstage/test-utils": "^1.5.9",
+    "@backstage/backend-test-utils": "^0.5.1",
+    "@backstage/cli": "^0.27.0",
+    "@backstage/test-utils": "^1.5.10",
     "@types/cookie-parser": "^1.4.3",
     "@types/jest": "*",
     "@types/supertest": "^2.0.8",

plugins/s3-viewer-backend/src/service/router.ts

@@ -35,6 +35,10 @@ import {
   PolicyDecision,
 } from '@backstage/plugin-permission-common';
 
+/**
+ * @deprecated Use the new backend system instead: https://github.com/spreadshirt/backstage-plugin-s3/tree/main/plugins/s3-viewer-backend#new-backend-system
+ * @public
+ */
 export interface RouterOptions {
   logger: LoggerService;
   config: RootConfigService;
@@ -45,6 +49,10 @@ export interface RouterOptions {
   httpAuth?: HttpAuthService;
 }
 
+/**
+ * @deprecated Use the new backend system instead: https://github.com/spreadshirt/backstage-plugin-s3/tree/main/plugins/s3-viewer-backend#new-backend-system
+ * @public
+ */
 export async function createRouter(
   options: RouterOptions,
 ): Promise<express.Router> {

plugins/s3-viewer-common/package.json

@@ -39,13 +39,13 @@
     "postpack": "backstage-cli package postpack"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.11"
+    "@backstage/cli": "^0.27.0"
   },
   "files": [
     "dist"
   ],
   "dependencies": {
     "@aws-sdk/client-s3": "^3.360.0",
-    "@backstage/plugin-permission-common": "^0.8.0"
+    "@backstage/plugin-permission-common": "^0.8.1"
   }
 }

plugins/s3-viewer-node/package.json

@@ -37,13 +37,13 @@
     "postpack": "backstage-cli package postpack"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.11"
+    "@backstage/cli": "^0.27.0"
   },
   "files": [
     "dist"
   ],
   "dependencies": {
-    "@backstage/backend-plugin-api": "^0.7.0",
+    "@backstage/backend-plugin-api": "^0.8.1",
     "@spreadshirt/backstage-plugin-s3-viewer-common": "^0.5.5",
     "@types/express": "*",
     "express": "^4.17.1",

plugins/s3-viewer/package.json

@@ -38,7 +38,7 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.14.9",
+    "@backstage/core-components": "^0.14.10",
     "@backstage/core-plugin-api": "^1.9.3",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -51,10 +51,10 @@
     "react-router": "^6.3.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.11",
-    "@backstage/core-app-api": "^1.14.1",
-    "@backstage/dev-utils": "^1.0.36",
-    "@backstage/test-utils": "^1.5.9",
+    "@backstage/cli": "^0.27.0",
+    "@backstage/core-app-api": "^1.14.2",
+    "@backstage/dev-utils": "^1.0.37",
+    "@backstage/test-utils": "^1.5.10",
     "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "^15.0.0",
     "@testing-library/user-event": "^14.0.0",