Skip to content

Commit 8b8df88

Browse files
authored
Merge branch 'main' into feature/RHIDP-8756
2 parents b791217 + 8e0526d commit 8b8df88

File tree

81 files changed

+2131
-349
lines changed

Some content is hidden

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

81 files changed

+2131
-349
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
**/node_modules
55
plugins
66
!plugins/auth-backend-module-oidc-provider
7+
!plugins/dynamic-plugins-info-backend
78
!plugins/licensed-users-info-backend
89
!plugins/scalprum-backend
910
*.local.yaml

.ibm/pipelines/env_variables.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ NAME_SPACE_RUNTIME="${NAME_SPACE_RUNTIME:-showcase-runtime}"
5757
NAME_SPACE_POSTGRES_DB="${NAME_SPACE_POSTGRES_DB:-postgress-external-db}"
5858
NAME_SPACE_SANITY_PLUGINS_CHECK="showcase-sanity-plugins"
5959
OPERATOR_MANAGER='rhdh-operator'
60-
CHART_MAJOR_VERSION="1.8"
60+
CHART_MAJOR_VERSION="1.9"
6161
GITHUB_APP_APP_ID=$(cat /tmp/secrets/GITHUB_APP_3_APP_ID)
6262
GITHUB_APP_CLIENT_ID=$(cat /tmp/secrets/GITHUB_APP_3_CLIENT_ID)
6363
GITHUB_APP_PRIVATE_KEY=$(cat /tmp/secrets/GITHUB_APP_3_PRIVATE_KEY)

.ibm/pipelines/resources/config_map/rbac-policy.csv

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,7 @@ p, role:default/kubernetes_reader, kubernetes.clusters.read, read, allow
3535
g, user:default/rhdh-qe-5, role:default/catalog_reader
3636
g, user:default/rhdh-qe-6, role:default/catalog_reader
3737
p, role:default/catalog_reader, catalog.entity.read, read, allow
38+
39+
g, user:default/rhdh-qe, role:default/extension
40+
p, role:default/extension, extension-plugin, read, allow
41+
p, role:default/extension, extension-plugin, create, allow

.ibm/pipelines/value_files/values_showcase-rbac.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ global:
118118
entityTabs:
119119
- path: "/scorecard"
120120
title: Scorecard
121+
titleKey: catalog.entityPage.scorecard.title
121122
mountPoint: entity.page.scorecard
122123
mountPoints:
123124
- mountPoint: entity.page.scorecard/cards

.rhdh/docker/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ COPY $EXTERNAL_SOURCE_NESTED/yarn.lock ./
6868
# BEGIN COPY package.json files
6969
COPY $EXTERNAL_SOURCE_NESTED/plugins/scalprum-backend/package.json ./plugins/scalprum-backend/package.json
7070
COPY $EXTERNAL_SOURCE_NESTED/plugins/licensed-users-info-backend/package.json ./plugins/licensed-users-info-backend/package.json
71+
COPY $EXTERNAL_SOURCE_NESTED/plugins/dynamic-plugins-info-backend/package.json ./plugins/dynamic-plugins-info-backend/package.json
7172
COPY $EXTERNAL_SOURCE_NESTED/packages/theme-wrapper/package.json ./packages/theme-wrapper/package.json
7273
COPY $EXTERNAL_SOURCE_NESTED/packages/plugin-utils/package.json ./packages/plugin-utils/package.json
7374
COPY $EXTERNAL_SOURCE_NESTED/packages/backend/package.json ./packages/backend/package.json

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ When contributing a new `@internal` plugin into this repo, you must remember to
170170
For example:
171171
172172
```dockerfile
173-
COPY $EXTERNAL_SOURCE_NESTED/plugins/licensed-users-info-backend/package.json ./plugins/licensed-users-info-backend/package.json
173+
COPY $EXTERNAL_SOURCE_NESTED/plugins/dynamic-plugins-info/package.json ./plugins/dynamic-plugins-info/package.json
174174
```
175175
176176
## Support

catalog-entities/marketplace/packages/all.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ spec:
3232
- ./parfuemerie-douglas-scaffolder-backend-module-azure-repositories.yaml
3333
- ./backstage-community-plugin-jenkins-backend.yaml
3434
- ./backstage-community-plugin-jenkins.yaml
35+
- ./backstage-community-plugin-mcp-chat.yaml
36+
- ./backstage-community-plugin-mcp-chat-backend.yaml
3537
- ./backstage-plugin-notifications.yaml
3638
- ./backstage-plugin-notifications-backend.yaml
3739
- ./backstage-plugin-notifications-backend-module-email.yaml
@@ -100,6 +102,10 @@ spec:
100102
- ./rhdh-backstage-plugin-adoption-insights-backend.yaml
101103
- ./rhdh-backstage-plugin-analytics-module-adoption-insights.yaml
102104
- ./rhdh-backstage-plugin-quickstart.yaml
105+
- ./rhdh-backstage-plugin-scorecard-backend-module-github.yaml
106+
- ./rhdh-backstage-plugin-scorecard-backend-module-jira.yaml
107+
- ./rhdh-backstage-plugin-scorecard-backend.yaml
108+
- ./rhdh-backstage-plugin-scorecard.yaml
103109
- ./red-hat-developer-hub-backstage-plugin-lightspeed.yaml
104110
- ./red-hat-developer-hub-backstage-plugin-lightspeed-backend.yaml
105111
- ./apic-backstage-plugin.yaml

catalog-entities/marketplace/packages/apic-backstage-plugin.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ metadata:
1515
tags: []
1616
spec:
1717
packageName: "apic-backstage"
18-
dynamicArtifact: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/apic-backstage:bs_1.39.1__1.0.0!apic-backstage
18+
dynamicArtifact: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/apic-backstage:bs_1.42.5__1.0.0!apic-backstage
1919
version: 1.0.0
2020
backstage:
2121
role: backend-plugin
22-
supportedVersions: 1.39.1
22+
supportedVersions: 1.42.5
2323
author: IBM
2424
support: production
2525
lifecycle: active
@@ -30,17 +30,17 @@ spec:
3030
- title: Plugin configuration
3131
content:
3232
ibm:
33-
schedule: '* * * * *'
33+
schedule: '* * * * *'
3434
apic:
3535
- name: apic-instance-1
3636
url: ${APIC_API_URL}
3737
clientId: ${APIC_CLIENT_ID}
3838
clientSecret: ${APIC_SECRET}
3939
username: ${PORG_USERNAME}
4040
password: ${PORG_PASSWORD}
41-
identityProvider: 'default-idp-2' # Default Local User Registry
41+
identityProvider: 'default-idp-2' # Default Local User Registry
4242
- name: apic-instance-2
4343
url: ${APIC_API_URL}
4444
clientId: ${APIC_CLIENT_ID}
4545
clientSecret: ${APIC_SECRET}
46-
apiKey: ${APIC_API_KEY} # OIDC Registry
46+
apiKey: ${APIC_API_KEY} # OIDC Registry
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/redhat-developer/rhdh-plugins/refs/heads/main/workspaces/marketplace/json-schema/packages.json
2+
apiVersion: extensions.backstage.io/v1alpha1
3+
kind: Package
4+
metadata:
5+
name: backstage-community-plugin-mcp-chat-backend
6+
namespace: rhdh
7+
title: "@backstage-community/plugin-mcp-chat-backend"
8+
links:
9+
- url: https://github.com/backstage/community-plugins/blob/main/workspaces/mcp-chat/plugins/mcp-chat-backend/README.md
10+
title: Plugin Overview (README)
11+
- title: Source Code
12+
url: https://github.com/backstage/community-plugins/tree/main/workspaces/mcp-chat/plugins/mcp-chat-backend
13+
annotations:
14+
backstage.io/source-location: url:https://github.com/backstage/community-plugins/tree/main/workspaces/mcp-chat/plugins/mcp-chat-backend
15+
tags: []
16+
spec:
17+
packageName: "@backstage-community/plugin-mcp-chat-backend"
18+
dynamicArtifact: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-mcp-chat-backend:next__0.1.0!backstage-community-plugin-mcp-chat-backend
19+
version: 0.1.0
20+
backstage:
21+
role: backend-plugin
22+
supportedVersions: 1.42.5
23+
author: Backstage Community
24+
support: community
25+
lifecycle: active
26+
partOf:
27+
- mcp-chat
28+
appConfigExamples:
29+
- title: Default configuration with Gemini provider
30+
content:
31+
mcpChat:
32+
# Configure AI providers
33+
providers:
34+
- id: gemini
35+
token: ${GEMINI_API_KEY}
36+
model: gemini-2.5-flash
37+
# Optional: Configure MCP servers
38+
mcpServers:
39+
- id: github-server
40+
name: Github Server
41+
url: 'https://api.githubcopilot.com/mcp'
42+
headers:
43+
Authorization: 'Bearer ${GITHUB_TOKEN}'
44+
# Optional: Customize the system prompt
45+
systemPrompt: "You are a helpful assistant. When using tools, provide a clear, readable summary of the results rather than showing raw data. Focus on answering the user's question with the information gathered."
46+
# Configure quick prompts
47+
quickPrompts:
48+
- title: 'List all repositories'
49+
description: 'List all repositories in a given organization'
50+
prompt: 'List all repositories in the organization Backstage'
51+
category: GitHub
52+
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/redhat-developer/rhdh-plugins/refs/heads/main/workspaces/marketplace/json-schema/packages.json
2+
apiVersion: extensions.backstage.io/v1alpha1
3+
kind: Package
4+
metadata:
5+
name: backstage-community-plugin-mcp-chat
6+
namespace: rhdh
7+
title: "@backstage-community/plugin-mcp-chat"
8+
links:
9+
- url: https://github.com/backstage/community-plugins/blob/main/workspaces/mcp-chat/plugins/mcp-chat/README.md
10+
title: Plugin Overview (README)
11+
- title: Source Code
12+
url: https://github.com/backstage/community-plugins/tree/main/workspaces/mcp-chat/plugins/mcp-chat
13+
annotations:
14+
backstage.io/source-location: url:https://github.com/backstage/community-plugins/tree/main/workspaces/mcp-chat/plugins/mcp-chat
15+
tags: []
16+
spec:
17+
packageName: "@backstage-community/plugin-mcp-chat"
18+
dynamicArtifact: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-mcp-chat:next__0.1.0!backstage-community-plugin-mcp-chat
19+
version: 0.1.0
20+
backstage:
21+
role: frontend-plugin
22+
supportedVersions: 1.42.5
23+
author: Backstage Community
24+
support: community
25+
lifecycle: active
26+
partOf:
27+
- mcp-chat
28+
appConfigExamples:
29+
- title: Default configuration
30+
content:
31+
dynamicPlugins:
32+
frontend:
33+
backstage-community.plugin-mcp-chat:
34+
dynamicRoutes:
35+
- path: /mcp-chat
36+
importName: McpChatPage
37+
menuItem:
38+
icon: MCPChatIcon
39+
text: MCP Chat

0 commit comments

Comments
 (0)