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

chore(deps): update to backstage 1.26.x #1536

Merged
merged 43 commits into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
023e1c6
chore(deps): update to backstage 1.26.x
schultzp2020 Apr 22, 2024
27b0ca9
update to new backend
schultzp2020 Apr 23, 2024
c01ba96
update to 1.26.4
schultzp2020 Apr 26, 2024
ca096f2
Merge branch 'main' of https://github.com/janus-idp/backstage-plugins…
schultzp2020 Apr 26, 2024
c392d17
lint
schultzp2020 Apr 26, 2024
fd10cff
Merge branch 'main' of https://github.com/janus-idp/backstage-plugins…
schultzp2020 Apr 29, 2024
37346e7
Merge branch 'main' of https://github.com/janus-idp/backstage-plugins…
schultzp2020 Apr 30, 2024
dae12a1
Merge branch 'main' of https://github.com/janus-idp/backstage-plugins…
schultzp2020 May 2, 2024
8b6be1c
fix scripts
schultzp2020 May 2, 2024
a7f277b
update frontend to match showcase
schultzp2020 May 2, 2024
df3984f
Merge branch 'main' of https://github.com/janus-idp/backstage-plugins…
schultzp2020 May 2, 2024
333424a
format files
schultzp2020 May 2, 2024
5589305
fix keycloak test
schultzp2020 May 2, 2024
556aad8
fix(deps): remove react-router-dom from dev dependencies and as it's …
invincibleJai May 3, 2024
0cc4535
Merge branch 'main' of https://github.com/janus-idp/backstage-plugins…
schultzp2020 May 3, 2024
fedfb0b
update to backstage 1.26.5
schultzp2020 May 3, 2024
64aad59
fix kiali
schultzp2020 May 3, 2024
22296b8
Merge branch 'main' of https://github.com/janus-idp/backstage-plugins…
schultzp2020 May 6, 2024
e5d609a
revert to basic frontend
schultzp2020 May 6, 2024
a5ff565
fix linting
schultzp2020 May 6, 2024
600d486
Merge branch 'main' of https://github.com/janus-idp/backstage-plugins…
schultzp2020 May 6, 2024
0d49655
fix lint config
schultzp2020 May 6, 2024
56fc59c
lint files
schultzp2020 May 6, 2024
b5199c3
update dist-dynamic
schultzp2020 May 7, 2024
f7d0ff9
fix resolutions
schultzp2020 May 7, 2024
afc6467
update react-router-dom
schultzp2020 May 7, 2024
3c32940
fix react deps
schultzp2020 May 7, 2024
5da9407
Merge branch 'main' of https://github.com/janus-idp/backstage-plugins…
schultzp2020 May 7, 2024
f568e3f
fix deprecations
schultzp2020 May 7, 2024
9a5952d
potential fix for react
schultzp2020 May 7, 2024
2d81377
fix dep resolution
schultzp2020 May 8, 2024
a634165
Merge branch 'main' of https://github.com/janus-idp/backstage-plugins…
schultzp2020 May 8, 2024
cefc12e
skip orchestrator test
schultzp2020 May 8, 2024
09be0f8
add eslint rule
schultzp2020 May 8, 2024
22af5c8
fix tsc error
schultzp2020 May 8, 2024
cc44a83
fix(orchestrator): force react dependency to be 18.3 and return test …
batzionb May 9, 2024
2bd5ed4
fix(e2e): update e2e tests to allow guest login (#4)
debsmita1 May 9, 2024
67b467e
Merge branch 'main' of https://github.com/janus-idp/backstage-plugins…
schultzp2020 May 9, 2024
b273d56
update common test file
schultzp2020 May 9, 2024
0a68181
update lockfiles
schultzp2020 May 9, 2024
f3a4f19
Merge branch 'main' of https://github.com/janus-idp/backstage-plugins…
schultzp2020 May 9, 2024
609bcf3
fix react
schultzp2020 May 9, 2024
d033bab
Merge branch 'main' of https://github.com/janus-idp/backstage-plugins…
schultzp2020 May 9, 2024
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
51 changes: 8 additions & 43 deletions app-config.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
app:
title: Scaffolded Backstage App
title: Janus IDP Plugins
baseUrl: http://localhost:3000

organization:
name: My Company
name: Red Hat

backend:
# Used for enabling authentication, secret is shared by all backend plugins
Expand Down Expand Up @@ -34,21 +34,9 @@ backend:
store: memory
# workingDirectory: /tmp # Use this to configure a working directory for the scaffolder, defaults to the OS temp-dir

integrations:
github:
- host: github.com
# This is a Personal Access Token or PAT from GitHub. You can find out how to generate this token, and more information
# about setting up the GitHub integration here: https://backstage.io/docs/getting-started/configuration#setting-up-a-github-integration
token: ${GITHUB_TOKEN}
### Example for how to add your GitHub Enterprise instance using the API:
# - host: ghe.example.net
# apiBaseUrl: https://ghe.example.net/api/v3
# token: ${GHE_TOKEN}
integrations: {}

proxy:
'/test':
target: 'https://example.com'
changeOrigin: true
'/quay/api':
target: 'https://quay.io'
headers:
Expand All @@ -62,10 +50,6 @@ proxy:
quay:
uiUrl: 'https://quay.io'

# Reference documentation http://backstage.io/docs/features/techdocs/configuration
# Note: After experimenting with basic setup, use CI/CD to generate docs
# and an external cloud storage when deploying TechDocs for production use-case.
# https://backstage.io/docs/features/techdocs/how-to-guides#how-to-migrate-from-techdocs-basic-to-recommended-deployment-approach
techdocs:
builder: 'local' # Alternatives - 'external'
generator:
Expand All @@ -86,33 +70,14 @@ catalog:
entityFilename: catalog-info.yaml
pullRequestBranchName: backstage-integration
rules:
- allow: [Component, System, API, Resource, Location]
- allow: [Component, System, Group, Resource, Location, Template, API]
locations:
# Local example data, file locations are relative to the backend process, typically `packages/backend`
- type: file
target: ../../examples/entities.yaml

# Local example template
- type: file
target: ../../examples/template/template.yaml
rules:
- allow: [Template]

# Local example organizational data
- type: file
target: ../../examples/org.yaml
rules:
- allow: [User, Group]
- type: url
target: https://github.com/janus-idp/backstage-showcase/blob/main/catalog-entities/all.yaml

## Uncomment these lines to add more example data
# - type: url
# target: https://github.com/backstage/backstage/blob/master/packages/catalog-model/examples/all.yaml
- type: url
target: https://github.com/redhat-developer/red-hat-developer-hub-software-templates/blob/main/templates.yaml

## Uncomment these lines to add an example org
# - type: url
# target: https://github.com/backstage/backstage/blob/master/packages/catalog-model/examples/acme-corp.yaml
# rules:
# - allow: [User, Group]
dynamicPlugins:
frontend:
janus.dynamic-frontend-plugin:
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.25.2"
"version": "1.26.4"
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
]
},
"devDependencies": {
"@backstage/cli": "0.26.2",
"@backstage/cli": "0.26.4",
"@ianvs/prettier-plugin-sort-imports": "4.1.1",
"@janus-idp/cli": "*",
"@semantic-release/changelog": "6.0.3",
Expand Down
50 changes: 25 additions & 25 deletions packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,30 +24,28 @@
"lint": "backstage-cli package lint"
},
"dependencies": {
"@backstage/app-defaults": "^1.5.3",
"@backstage/app-defaults": "^1.5.4",
"@backstage/catalog-model": "^1.4.5",
"@backstage/core-app-api": "^1.12.3",
"@backstage/core-components": "^0.14.3",
"@backstage/core-plugin-api": "^1.9.1",
"@backstage/integration-react": "^1.1.25",
"@backstage/plugin-api-docs": "^0.11.3",
"@backstage/plugin-catalog": "^1.18.2",
"@backstage/core-app-api": "^1.12.4",
"@backstage/core-components": "^0.14.5",
"@backstage/core-plugin-api": "^1.9.2",
"@backstage/integration-react": "^1.1.26",
"@backstage/plugin-api-docs": "^0.11.4",
"@backstage/plugin-catalog": "^1.19.0",
"@backstage/plugin-catalog-common": "^1.0.22",
"@backstage/plugin-catalog-graph": "^0.4.3",
"@backstage/plugin-catalog-import": "^0.10.9",
"@backstage/plugin-catalog-react": "^1.11.2",
"@backstage/plugin-github-actions": "^0.6.14",
"@backstage/plugin-org": "^0.6.23",
"@backstage/plugin-permission-react": "^0.4.21",
"@backstage/plugin-scaffolder": "^1.19.2",
"@backstage/plugin-search": "^1.4.9",
"@backstage/plugin-search-react": "^1.7.9",
"@backstage/plugin-tech-radar": "^0.7.2",
"@backstage/plugin-techdocs": "^1.10.3",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.8",
"@backstage/plugin-techdocs-react": "^1.2.2",
"@backstage/plugin-user-settings": "^0.8.4",
"@backstage/theme": "^0.5.2",
"@backstage/plugin-catalog-graph": "^0.4.4",
"@backstage/plugin-catalog-import": "^0.10.10",
"@backstage/plugin-catalog-react": "^1.11.3",
"@backstage/plugin-org": "^0.6.24",
"@backstage/plugin-permission-react": "^0.4.22",
"@backstage/plugin-scaffolder": "^1.19.3",
"@backstage/plugin-search": "^1.4.10",
"@backstage/plugin-search-react": "^1.7.10",
"@backstage/plugin-techdocs": "^1.10.4",
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.9",
"@backstage/plugin-techdocs-react": "^1.2.3",
"@backstage/plugin-user-settings": "^0.8.5",
"@backstage/theme": "^0.5.3",
"@material-ui/core": "^4.12.4",
"@material-ui/icons": "^4.11.3",
"@openshift/dynamic-plugin-sdk": "^4.0.0",
Expand All @@ -59,11 +57,13 @@
"react-dom": "^18.2.0",
"react-router": "^6.17.0",
"react-router-dom": "^6.17.0",
"react-use": "^17.4.0"
"react-use": "^17.4.0",
"@backstage-community/plugin-github-actions": "^0.6.16",
"@backstage-community/plugin-tech-radar": "^0.7.4"
},
"devDependencies": {
"@backstage/cli": "0.26.2",
"@backstage/test-utils": "1.5.3",
"@backstage/cli": "0.26.4",
"@backstage/test-utils": "1.5.4",
"@janus-idp/cli": "*",
"@scalprum/react-test-utils": "0.0.4",
"@testing-library/jest-dom": "6.4.2",
Expand Down
8 changes: 4 additions & 4 deletions packages/app/src/components/catalog/EntityPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ import {
Direction,
EntityCatalogGraphCard,
} from '@backstage/plugin-catalog-graph';
import {
EntityGithubActionsContent,
isGithubActionsAvailable,
} from '@backstage/plugin-github-actions';
import {
EntityGroupProfileCard,
EntityMembersListCard,
Expand All @@ -55,6 +51,10 @@ import { EntityTechdocsContent } from '@backstage/plugin-techdocs';
import { ReportIssue } from '@backstage/plugin-techdocs-module-addons-contrib';
import { TechDocsAddons } from '@backstage/plugin-techdocs-react';

import {
EntityGithubActionsContent,
isGithubActionsAvailable,
} from '@backstage-community/plugin-github-actions';
import { Button, Grid } from '@material-ui/core';

const techdocsContent = (
Expand Down
51 changes: 15 additions & 36 deletions packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,44 +17,23 @@
"clean": "backstage-cli package clean"
},
"dependencies": {
"app": "*",
"@backstage/backend-common": "^0.21.6",
"@backstage/backend-tasks": "^0.5.21",
"@backstage/catalog-model": "^1.4.5",
"@backstage/catalog-client": "^1.6.3",
"@backstage/config": "^1.2.0",
"@backstage/plugin-app-backend": "^0.3.64",
"@backstage/plugin-auth-backend": "^0.22.3",
"@backstage/plugin-auth-node": "^0.4.11",
"@backstage/plugin-catalog-backend": "^1.21.0",
"@backstage/plugin-events-backend": "^0.3.3",
"@backstage/plugin-events-node": "^0.3.2",
"@backstage/plugin-permission-backend": "^0.5.40",
"@backstage/plugin-permission-common": "^0.7.13",
"@backstage/plugin-permission-node": "^0.7.27",
"@backstage/plugin-proxy-backend": "^0.4.14",
"@backstage/plugin-scaffolder-backend": "^1.22.3",
"@backstage/plugin-search-backend": "^1.5.6",
"@backstage/plugin-search-backend-module-pg": "^0.5.25",
"@backstage/plugin-search-backend-node": "^1.2.20",
"@backstage/plugin-techdocs-backend": "^1.10.3",
"@janus-idp/backstage-plugin-rbac-backend": "^2.4.1",
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.14",
"@backstage/plugin-search-backend-module-catalog": "^0.1.21",
"@backstage/plugin-search-backend-module-techdocs": "^0.1.21",
"better-sqlite3": "^9.0.0",
"dockerode": "^4.0.0",
"express": "^4.18.2",
"express-promise-router": "^4.1.1",
"pg": "^8.11.3",
"winston": "^3.11.0"
"@backstage/backend-defaults": "^0.2.17",
"@backstage/plugin-app-backend": "^0.3.65",
"@backstage/plugin-auth-backend": "^0.22.4",
"@backstage/plugin-auth-backend-module-guest-provider": "^0.1.3",
"@backstage/plugin-catalog-backend": "^1.21.1",
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.15",
"@backstage/plugin-proxy-backend": "^0.4.15",
"@backstage/plugin-scaffolder-backend": "^1.22.4",
"@backstage/plugin-search-backend": "^1.5.7",
"@backstage/plugin-search-backend-module-catalog": "^0.1.23",
"@backstage/plugin-search-backend-module-techdocs": "^0.1.22",
"@backstage/plugin-techdocs-backend": "^1.10.4",
"@janus-idp/backstage-plugin-rbac-backend": "*",
"app": "*"
},
"devDependencies": {
"@backstage/cli": "0.26.2",
"@types/dockerode": "3.3.21",
"@types/express-serve-static-core": "4.17.38",
"@types/express": "4.17.20",
"@types/luxon": "3.3.3"
"@backstage/cli": "0.26.4"
},
"files": [
"dist"
Expand Down
8 changes: 0 additions & 8 deletions packages/backend/src/index.test.ts

This file was deleted.

Loading
Loading