Skip to content

Commit

Permalink
chore(backstage): update to backstage 1.18.4 (janus-idp#598)
Browse files Browse the repository at this point in the history
* chore(backstage): update to backstage 1.18.4

* chore(backstage): upgrade non-core backstage deps

* chore(backstage): update changeset to capture breaking changes

* Update .changeset/rare-laws-deny.md

Co-authored-by: Paul Schultz <pschultz@pobox.com>

* revert(deps): revert 495bd3d

* revert(deps): revert d77c4cd

---------

Co-authored-by: Paul Schultz <pschultz@pobox.com>
  • Loading branch information
Zaperex and schultzp2020 committed Oct 13, 2023
1 parent bbdac5a commit 80376b4
Show file tree
Hide file tree
Showing 8 changed files with 325 additions and 318 deletions.
6 changes: 6 additions & 0 deletions .changeset/rare-laws-deny.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'app': major
'backend': minor
---

Update backstage to [1.18.4](https://github.com/backstage/backstage/releases/tag/v1.18.4)
2 changes: 1 addition & 1 deletion app-config.example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ backend:
port: 7007
csp:
connect-src:
- 'self'
- "'self'"
- 'http:'
- 'https:'
cors:
Expand Down
2 changes: 1 addition & 1 deletion backstage.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "1.18.3"
"version": "1.18.4"
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"test": "turbo run test",
"test:e2e": "turbo run test:e2e",
"test:e2e-ci": "turbo run test:e2e-ci",
"fix": "backstage-cli repo fix",
"lint": "turbo run lint",
"lint-staged": "lint-staged",
"prettier:check": "prettier --ignore-unknown --check .",
Expand Down
4 changes: 2 additions & 2 deletions packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,15 @@
"@janus-idp/backstage-plugin-nexus-repository-manager": "1.1.2",
"@janus-idp/backstage-plugin-ocm": "3.2.2",
"@janus-idp/backstage-plugin-quay": "1.3.1",
"@janus-idp/backstage-plugin-tekton": "1.9.6",
"@janus-idp/backstage-plugin-tekton": "2.0.0",
"@janus-idp/backstage-plugin-topology": "1.15.6",
"@mui/icons-material": "5.14.11",
"@mui/lab": "5.0.0-alpha.146",
"@mui/material": "5.14.11",
"@roadiehq/backstage-plugin-argo-cd": "2.3.4",
"@roadiehq/backstage-plugin-datadog": "2.1.16",
"@roadiehq/backstage-plugin-github-insights": "2.3.21",
"@roadiehq/backstage-plugin-github-pull-requests": "2.5.16",
"@roadiehq/backstage-plugin-github-pull-requests": "2.5.18",
"@roadiehq/backstage-plugin-jira": "2.4.11",
"@roadiehq/backstage-plugin-security-insights": "2.3.9",
"history": "5.3.0",
Expand Down
48 changes: 24 additions & 24 deletions packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,33 @@
"clean": "backstage-cli package clean"
},
"dependencies": {
"@backstage/backend-common": "0.19.6",
"@backstage/backend-tasks": "0.5.9",
"@backstage/backend-common": "0.19.7",
"@backstage/backend-tasks": "0.5.10",
"@backstage/catalog-client": "1.4.4",
"@backstage/catalog-model": "1.4.2",
"@backstage/config": "1.1.0",
"@backstage/integration": "1.7.0",
"@backstage/plugin-app-backend": "0.3.52",
"@backstage/plugin-auth-backend": "0.19.1",
"@backstage/plugin-auth-node": "0.3.1",
"@backstage/plugin-azure-devops-backend": "0.4.1",
"@backstage/plugin-catalog-backend": "1.13.2",
"@backstage/plugin-catalog-backend-module-github": "0.4.2",
"@backstage/plugin-catalog-backend-module-gitlab": "0.3.1",
"@backstage/plugin-catalog-backend-module-openapi": "0.1.21",
"@backstage/plugin-jenkins-backend": "0.2.7",
"@backstage/plugin-kubernetes-backend": "0.12.1",
"@backstage/plugin-permission-backend": "0.5.27",
"@backstage/plugin-app-backend": "0.3.53",
"@backstage/plugin-auth-backend": "0.19.2",
"@backstage/plugin-auth-node": "0.3.2",
"@backstage/plugin-azure-devops-backend": "0.4.2",
"@backstage/plugin-catalog-backend": "1.13.3",
"@backstage/plugin-catalog-backend-module-github": "0.4.3",
"@backstage/plugin-catalog-backend-module-gitlab": "0.3.2",
"@backstage/plugin-catalog-backend-module-openapi": "0.1.22",
"@backstage/plugin-jenkins-backend": "0.2.8",
"@backstage/plugin-kubernetes-backend": "0.12.2",
"@backstage/plugin-permission-backend": "0.5.28",
"@backstage/plugin-permission-common": "0.7.8",
"@backstage/plugin-permission-node": "0.7.15",
"@backstage/plugin-proxy-backend": "0.4.1",
"@backstage/plugin-scaffolder-backend": "1.17.2",
"@backstage/plugin-scaffolder-backend-module-gitlab": "0.2.7",
"@backstage/plugin-search-backend": "1.4.4",
"@backstage/plugin-search-backend-module-pg": "0.5.13",
"@backstage/plugin-search-backend-node": "1.2.8",
"@backstage/plugin-sonarqube-backend": "0.2.6",
"@backstage/plugin-techdocs-backend": "1.7.1",
"@backstage/plugin-permission-node": "0.7.16",
"@backstage/plugin-proxy-backend": "0.4.2",
"@backstage/plugin-scaffolder-backend": "1.17.3",
"@backstage/plugin-scaffolder-backend-module-gitlab": "0.2.8",
"@backstage/plugin-search-backend": "1.4.5",
"@backstage/plugin-search-backend-module-pg": "0.5.14",
"@backstage/plugin-search-backend-node": "1.2.9",
"@backstage/plugin-sonarqube-backend": "0.2.7",
"@backstage/plugin-techdocs-backend": "1.7.2",
"@immobiliarelabs/backstage-plugin-gitlab-backend": "6.2.0",
"@janus-idp/backstage-plugin-keycloak-backend": "1.5.5",
"@janus-idp/backstage-plugin-ocm-backend": "3.2.2",
Expand All @@ -50,8 +50,8 @@
"@roadiehq/scaffolder-backend-argocd": "1.1.17",
"@roadiehq/scaffolder-backend-module-utils": "1.10.4",
"@backstage/backend-plugin-manager": "npm:@janus-idp/backend-plugin-manager@0.0.4-janus.0",
"@backstage/plugin-events-backend": "0.2.13",
"@backstage/plugin-events-node": "0.2.13",
"@backstage/plugin-events-backend": "0.2.14",
"@backstage/plugin-events-node": "0.2.14",
"app": "*",
"better-sqlite3": "8.6.0",
"dockerode": "3.3.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function makeCreateEnv(config: Config, pluginProvider: BackendPluginProvider) {
const cacheManager = CacheManager.fromConfig(config);
const databaseManager = DatabaseManager.fromConfig(config, { logger: root });
const tokenManager = ServerTokenManager.fromConfig(config, { logger: root });
const taskScheduler = TaskScheduler.fromConfig(config);
const taskScheduler = TaskScheduler.fromConfig(config, { databaseManager });
const eventBroker = new DefaultEventBroker(root);

const identity = DefaultIdentityClient.create({
Expand Down
Loading

0 comments on commit 80376b4

Please sign in to comment.