Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump backstage to 1.30.4 #119

Merged
merged 6 commits into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .changeset/cool-rockets-confess.md
Original file line number Diff line number Diff line change
@@ -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`.
heyLu marked this conversation as resolved.
Show resolved Hide resolved

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).
8 changes: 8 additions & 0 deletions .changeset/poor-falcons-collect.md
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ jobs:
- run: yarn ci
env:
CI: true
- run: yarn backstage-cli versions:check
heyLu marked this conversation as resolved.
Show resolved Hide resolved
# TODO: Migrate to yarn-3 and use `yarn dedupe`, which is the suggested alternative
# - run: yarn backstage-cli versions:check
2 changes: 1 addition & 1 deletion backstage.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "1.29.2"
"version": "1.30.4"
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 2 additions & 0 deletions plugins/s3-viewer-backend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 4 additions & 2 deletions plugins/s3-viewer-backend/config.d.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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<
Expand Down
22 changes: 11 additions & 11 deletions plugins/s3-viewer-backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
8 changes: 8 additions & 0 deletions plugins/s3-viewer-backend/src/service/router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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> {
Expand Down
4 changes: 2 additions & 2 deletions plugins/s3-viewer-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions plugins/s3-viewer-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions plugins/s3-viewer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
Loading
Loading