Skip to content

Commit 3156109

Browse files
HusneShabbirHusneShabbir
authored
Merge branch 'main' into scorecard-e2e-updates
2 parents f6dab0c + 887315f commit 3156109

41 files changed

Lines changed: 1884 additions & 565 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.ibm/pipelines/lib/log.sh‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,3 +145,20 @@ log::hr() {
145145
reset="$(log::reset_code)"
146146
printf '%s%s%s\n' "${color}" "--------------------------------------------------------------------------------" "${reset}" >&2
147147
}
148+
149+
# Export all log functions so they are available in subshells (e.g., timeout bash -c "...")
150+
export -f log::timestamp
151+
export -f log::level_value
152+
export -f log::should_log
153+
export -f log::reset_code
154+
export -f log::color_for_level
155+
export -f log::icon_for_level
156+
export -f log::emit_line
157+
export -f log::emit
158+
export -f log::debug
159+
export -f log::info
160+
export -f log::warn
161+
export -f log::error
162+
export -f log::success
163+
export -f log::section
164+
export -f log::hr

‎.ibm/pipelines/value_files/values_showcase.yaml‎

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,58 @@ global:
199199
disabled: false
200200
- package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-global-floating-action-button
201201
disabled: false
202-
# Orchestrator plugins completely removed for e2e tests
202+
# Enable orchestrator plugins - Official release (Backstage 1.45.3)
203+
- package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-orchestrator:bs_1.45.3__5.1.0!red-hat-developer-hub-backstage-plugin-orchestrator"
204+
disabled: false
205+
pluginConfig:
206+
dynamicPlugins:
207+
frontend:
208+
red-hat-developer-hub.backstage-plugin-orchestrator:
209+
appIcons:
210+
- importName: OrchestratorIcon
211+
name: orchestratorIcon
212+
dynamicRoutes:
213+
- importName: OrchestratorPage
214+
menuItem:
215+
icon: orchestratorIcon
216+
text: Orchestrator
217+
textKey: menuItem.orchestrator
218+
path: /orchestrator
219+
entityTabs:
220+
- path: /workflows
221+
title: Workflows
222+
titleKey: catalog.entityPage.workflows.title
223+
mountPoint: entity.page.workflows
224+
mountPoints:
225+
- mountPoint: entity.page.workflows/cards
226+
importName: OrchestratorCatalogTab
227+
config:
228+
layout:
229+
gridColumn: "1 / -1"
230+
if:
231+
anyOf:
232+
- IsOrchestratorCatalogTabAvailable
233+
- package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-orchestrator-backend:bs_1.45.3__8.3.0!red-hat-developer-hub-backstage-plugin-orchestrator-backend"
234+
disabled: false
235+
pluginConfig:
236+
orchestrator:
237+
dataIndexService:
238+
url: http://sonataflow-platform-data-index-service
239+
240+
# scaffolder-backend-module-orchestrator disabled - causes startup error with Backstage 1.45.3
241+
# - package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator:bs_1.45.3__1.1.0!red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator"
242+
# disabled: false
243+
# pluginConfig:
244+
# orchestrator:
245+
# dataIndexService:
246+
# url: http://sonataflow-platform-data-index-service
247+
248+
- package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets:bs_1.45.3__1.2.0!red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets"
249+
disabled: false
250+
pluginConfig:
251+
dynamicPlugins:
252+
frontend:
253+
red-hat-developer-hub.backstage-plugin-orchestrator-form-widgets: {}
203254

204255
# -- Upstream Backstage [chart configuration](https://github.com/backstage/charts/blob/main/charts/backstage/values.yaml)
205256
upstream:

‎.rhdh/docker/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
# Stage 1 - Build nodejs skeleton
1717
# https://registry.access.redhat.com/ubi9/nodejs-22
18-
FROM registry.access.redhat.com/ubi9/nodejs-22:9.7-1766414965@sha256:79ad5a5555751cbb59f3a9618b01af02d589b425946f2a81cb8befd1ecdf1c25 AS skeleton
18+
FROM registry.access.redhat.com/ubi9/nodejs-22:9.7-1767745544@sha256:bbd9e582dcb61f1cef28dffdc647f23b63e82674c480fc32be446c8f62b7ad7a AS skeleton
1919
# hadolint ignore=DL3002
2020
USER 0
2121

@@ -230,7 +230,7 @@ RUN hadFail=0; for d in $(find /tmp -name "yarn*log*" || true) $(find /tmp/xfs-*
230230

231231
# Stage 5 - Build the runner image
232232
# https://registry.access.redhat.com/ubi9/nodejs-22-minimal
233-
FROM registry.access.redhat.com/ubi9/nodejs-22-minimal:9.7-1766364286@sha256:31e285bca3a7f88c473a94bb1ae245a9595391802d2a66fba7fd774c3c1e7eb5 AS runner
233+
FROM registry.access.redhat.com/ubi9/nodejs-22-minimal:9.7-1767673763@sha256:65c830be98403ebe6e5ec47d2bd2ca8086aa9fe3e03dbae8f706e94eb75d4988 AS runner
234234
USER 0
235235

236236
ENV EXTERNAL_SOURCE_NESTED=.

‎docker/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
# Stage 1 - Build nodejs skeleton
1717
# https://registry.access.redhat.com/ubi9/nodejs-22
18-
FROM registry.access.redhat.com/ubi9/nodejs-22:9.7-1766414965@sha256:79ad5a5555751cbb59f3a9618b01af02d589b425946f2a81cb8befd1ecdf1c25 AS skeleton
18+
FROM registry.access.redhat.com/ubi9/nodejs-22:9.7-1767745544@sha256:bbd9e582dcb61f1cef28dffdc647f23b63e82674c480fc32be446c8f62b7ad7a AS skeleton
1919
# hadolint ignore=DL3002
2020
USER 0
2121

@@ -202,7 +202,7 @@ RUN \
202202

203203
# Stage 5 - Build the runner image
204204
# https://registry.access.redhat.com/ubi9/nodejs-22-minimal
205-
FROM registry.access.redhat.com/ubi9/nodejs-22-minimal:9.7-1766364286@sha256:31e285bca3a7f88c473a94bb1ae245a9595391802d2a66fba7fd774c3c1e7eb5 AS runner
205+
FROM registry.access.redhat.com/ubi9/nodejs-22-minimal:9.7-1767673763@sha256:65c830be98403ebe6e5ec47d2bd2ca8086aa9fe3e03dbae8f706e94eb75d4988 AS runner
206206
USER 0
207207

208208
ENV EXTERNAL_SOURCE_NESTED=.

‎docs/dynamic-plugins/versions.md‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@
55
https://github.com/redhat-developer/rhdh/blob/main/backstage.json
66
-->
77

8-
Based on [Backstage 1.42.5](https://backstage.io/docs/releases/v1.42.0)
8+
Based on [Backstage 1.45.3](https://backstage.io/docs/releases/v1.45.0)
99

1010
To bootstrap Backstage app that is compatible with RHDH 1.4, you can use:
1111

1212
```bash
13-
npx @backstage/create-app@0.7.3
13+
npx @backstage/create-app@0.7.6
1414
```
1515

1616
### Frontend packages
1717

1818

1919
| **Package** | **Version** |
2020
| ------------------------------ | ----------- |
21-
| `@backstage/catalog-model` | `1.7.5` |
22-
| `@backstage/config` | `1.3.3` |
23-
| `@backstage/core-app-api` | `1.18.0` |
24-
| `@backstage/core-components` | `0.17.5` |
25-
| `@backstage/core-plugin-api` | `1.10.9` |
26-
| `@backstage/integration-react` | `1.2.9` |
21+
| `@backstage/catalog-model` | `1.7.6` |
22+
| `@backstage/config` | `1.3.6` |
23+
| `@backstage/core-app-api` | `1.19.2` |
24+
| `@backstage/core-components` | `0.18.3` |
25+
| `@backstage/core-plugin-api` | `1.12.0` |
26+
| `@backstage/integration-react` | `1.2.12` |
2727

2828

2929

@@ -37,14 +37,14 @@ in the `main` branch of the [RHDH repository](https://github.com/redhat-develope
3737

3838
| **Package** | **Version** |
3939
| ------------------------------ | ----------- |
40-
| `@backstage/backend-app-api` | `1.2.6` |
41-
| `@backstage/backend-defaults` | `0.12.0` |
42-
| `@backstage/backend-dynamic-feature-service` | `0.7.3` |
43-
| `@backstage/backend-plugin-api` | `1.4.2` |
44-
| `@backstage/catalog-model` | `1.7.5` |
45-
| `@backstage/cli-node` | `0.2.14` |
46-
| `@backstage/config` | `1.3.3` |
47-
| `@backstage/config-loader` | `1.10.2` |
40+
| `@backstage/backend-app-api` | `1.3.0` |
41+
| `@backstage/backend-defaults` | `0.13.1` |
42+
| `@backstage/backend-dynamic-feature-service` | `0.7.6` |
43+
| `@backstage/backend-plugin-api` | `1.5.0` |
44+
| `@backstage/catalog-model` | `1.7.6` |
45+
| `@backstage/cli-node` | `0.2.15` |
46+
| `@backstage/config` | `1.3.6` |
47+
| `@backstage/config-loader` | `1.10.6` |
4848

4949

5050

‎dynamic-plugins/.yarn/patches/@backstage-plugin-auth-node-npm-0.6.0-69f2f0dc3f.patch‎

Lines changed: 0 additions & 133 deletions
This file was deleted.

‎dynamic-plugins/package.json‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,7 @@
3131
"@types/react-dom": "18.3.7",
3232
"@aws-sdk/util-utf8-browser": "npm:@smithy/util-utf8@~2",
3333
"@kubernetes/client-node@npm:0.20.0/jsonpath-plus": "^10.3.0",
34-
"@backstage/plugin-auth-node@^0.6.0": "patch:@backstage/plugin-auth-node@npm%3A0.6.0#./.yarn/patches/@backstage-plugin-auth-node-npm-0.6.0-69f2f0dc3f.patch",
35-
"@backstage/plugin-auth-node@0.6.0": "patch:@backstage/plugin-auth-node@npm%3A0.6.0#./.yarn/patches/@backstage-plugin-auth-node-npm-0.6.0-69f2f0dc3f.patch",
36-
"@backstage/plugin-auth-node@^0.5.6": "patch:@backstage/plugin-auth-node@npm%3A0.6.0#./.yarn/patches/@backstage-plugin-auth-node-npm-0.6.0-69f2f0dc3f.patch",
37-
"@backstage/plugin-auth-node@^0.5.1": "patch:@backstage/plugin-auth-node@npm%3A0.6.0#./.yarn/patches/@backstage-plugin-auth-node-npm-0.6.0-69f2f0dc3f.patch",
38-
"@backstage/plugin-auth-node@^0.4.17": "patch:@backstage/plugin-auth-node@npm%3A0.6.0#./.yarn/patches/@backstage-plugin-auth-node-npm-0.6.0-69f2f0dc3f.patch",
39-
"@backstage/plugin-auth-node@^0.4.13": "patch:@backstage/plugin-auth-node@npm%3A0.6.0#./.yarn/patches/@backstage-plugin-auth-node-npm-0.6.0-69f2f0dc3f.patch",
40-
"@backstage/plugin-auth-node@^0.5.2": "patch:@backstage/plugin-auth-node@npm%3A0.6.0#./.yarn/patches/@backstage-plugin-auth-node-npm-0.6.0-69f2f0dc3f.patch",
41-
"@backstage/plugin-auth-node@^0.4.16": "patch:@backstage/plugin-auth-node@npm%3A0.6.0#./.yarn/patches/@backstage-plugin-auth-node-npm-0.6.0-69f2f0dc3f.patch",
34+
"@backstage/plugin-auth-node": "0.6.10",
4235
"@backstage/plugin-scaffolder-node@^0.2.9": "^0.7.0",
4336
"@backstage/plugin-home@^0.8.11": "patch:@backstage/plugin-home@npm%3A0.8.12#./.yarn/patches/@backstage-plugin-home-npm-0.8.12-0d7fbcc764.patch",
4437
"refractor@npm:3.6.0/prismjs": "^1.30.0"

‎dynamic-plugins/wrappers/red-hat-developer-hub-backstage-plugin-bulk-import-backend-dynamic/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "red-hat-developer-hub-backstage-plugin-bulk-import-backend",
3-
"version": "6.5.1",
3+
"version": "6.9.1",
44
"main": "src/index.ts",
55
"types": "src/index.ts",
66
"license": "Apache-2.0",
@@ -39,7 +39,7 @@
3939
"export-dynamic:clean": "run export-dynamic --clean"
4040
},
4141
"dependencies": {
42-
"@red-hat-developer-hub/backstage-plugin-bulk-import-backend": "6.5.1"
42+
"@red-hat-developer-hub/backstage-plugin-bulk-import-backend": "6.9.1"
4343
},
4444
"devDependencies": {
4545
"@backstage/cli": "0.34.5",

‎dynamic-plugins/wrappers/red-hat-developer-hub-backstage-plugin-bulk-import/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "red-hat-developer-hub-backstage-plugin-bulk-import",
3-
"version": "1.18.1",
3+
"version": "6.9.1",
44
"main": "src/index.ts",
55
"types": "src/index.ts",
66
"license": "Apache-2.0",
@@ -43,7 +43,7 @@
4343
},
4444
"dependencies": {
4545
"@mui/material": "5.18.0",
46-
"@red-hat-developer-hub/backstage-plugin-bulk-import": "1.18.1"
46+
"@red-hat-developer-hub/backstage-plugin-bulk-import": "6.9.1"
4747
},
4848
"devDependencies": {
4949
"@backstage/cli": "0.34.5",

0 commit comments

Comments
 (0)