Skip to content
Open
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
2 changes: 1 addition & 1 deletion .claude/memories/ci-e2e-testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ brew install gnu-sed
- [Cluster Login Script](.ci/pipelines/ocp-cluster-claim-login.sh)
- [Test Reporting Script](.ci/pipelines/reporting.sh)
- [Environment Variables](.ci/pipelines/env_variables.sh)
- [Dynamic Plugin Installer](scripts/install-dynamic-plugins/install-dynamic-plugins.py)
- [Dynamic Plugin Installer](scripts/install-dynamic-plugins/install-dynamic-plugins.sh)

## Test Configuration Files (Config Maps)

Expand Down
2 changes: 1 addition & 1 deletion .claude/rules/ci-e2e-testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ brew install gnu-sed
- [Cluster Login Script](.ci/pipelines/ocp-cluster-claim-login.sh)
- [Test Reporting Script](.ci/pipelines/reporting.sh)
- [Environment Variables](.ci/pipelines/env_variables.sh)
- [Dynamic Plugin Installer](scripts/install-dynamic-plugins/install-dynamic-plugins.py)
- [Dynamic Plugin Installer](scripts/install-dynamic-plugins/install-dynamic-plugins.sh)

## Test Configuration Files (Config Maps)

Expand Down
2 changes: 1 addition & 1 deletion .cursor/rules/ci-e2e-testing.mdc
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ brew install gnu-sed
- [Cluster Login Script](.ci/pipelines/ocp-cluster-claim-login.sh)
- [Test Reporting Script](.ci/pipelines/reporting.sh)
- [Environment Variables](.ci/pipelines/env_variables.sh)
- [Dynamic Plugin Installer](scripts/install-dynamic-plugins/install-dynamic-plugins.py)
- [Dynamic Plugin Installer](scripts/install-dynamic-plugins/install-dynamic-plugins.sh)

## Test Configuration Files (Config Maps)

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ jobs:
if: ${{ steps.check-image.outputs.is_skipped != 'true' }}
run: yarn run test --continue --affected

- name: Run Python tests
- name: Run install-dynamic-plugins tests
if: ${{ steps.check-image.outputs.is_skipped != 'true' }}
run: pytest scripts/install-dynamic-plugins/test_install-dynamic-plugins.py -v
run: cd scripts/install-dynamic-plugins && yarn install && yarn test

- name: Change directory to dynamic-plugins
if: ${{ steps.check-image.outputs.is_skipped != 'true' }}
Expand Down
2 changes: 1 addition & 1 deletion .opencode/memories/ci-e2e-testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ brew install gnu-sed
- [Cluster Login Script](.ci/pipelines/ocp-cluster-claim-login.sh)
- [Test Reporting Script](.ci/pipelines/reporting.sh)
- [Environment Variables](.ci/pipelines/env_variables.sh)
- [Dynamic Plugin Installer](scripts/install-dynamic-plugins/install-dynamic-plugins.py)
- [Dynamic Plugin Installer](scripts/install-dynamic-plugins/install-dynamic-plugins.sh)

## Test Configuration Files (Config Maps)

Expand Down
2 changes: 1 addition & 1 deletion .rulesync/rules/ci-e2e-testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ brew install gnu-sed
- [Cluster Login Script](.ci/pipelines/ocp-cluster-claim-login.sh)
- [Test Reporting Script](.ci/pipelines/reporting.sh)
- [Environment Variables](.ci/pipelines/env_variables.sh)
- [Dynamic Plugin Installer](scripts/install-dynamic-plugins/install-dynamic-plugins.py)
- [Dynamic Plugin Installer](scripts/install-dynamic-plugins/install-dynamic-plugins.sh)

## Test Configuration Files (Config Maps)

Expand Down
9 changes: 6 additions & 3 deletions build/containerfiles/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,12 @@ COPY --from=build --chown=1001:1001 "$CONTAINER_SOURCE"/ ./
# RHIDP-4220 - make Konflux preflight and EC checks happy - [check-container] Create a directory named /licenses and include all relevant licensing
COPY $EXTERNAL_SOURCE_NESTED/LICENSE /licenses/

# Copy script to gather dynamic plugins; copy embedded dynamic plugins to root folder; fix permissions
COPY $EXTERNAL_SOURCE_NESTED/scripts/install-dynamic-plugins/install-dynamic-plugins.py $EXTERNAL_SOURCE_NESTED/scripts/install-dynamic-plugins/install-dynamic-plugins.sh ./
RUN chmod -R a+rx ./install-dynamic-plugins.*
# Copy TypeScript installer bundle (yarn install && yarn build in scripts/install-dynamic-plugins) + launcher
COPY $EXTERNAL_SOURCE_NESTED/scripts/install-dynamic-plugins/dist/install-dynamic-plugins.cjs \
$EXTERNAL_SOURCE_NESTED/scripts/install-dynamic-plugins/install-dynamic-plugins.sh \
./
RUN chmod a+rx ./install-dynamic-plugins.sh ./install-dynamic-plugins.cjs && \
cd scripts/install-dynamic-plugins; yarn install && yarn build

# Fix for https://issues.redhat.com/browse/RHIDP-728
RUN mkdir -p /opt/app-root/src/.npm; chown -R 1001:1001 /opt/app-root/src/.npm
Expand Down
2 changes: 1 addition & 1 deletion docs/dynamic-plugins/installing-plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ plugins:

### Catalog Entities Extraction

When the `CATALOG_INDEX_IMAGE` is set and the index image contains a `catalog-entities/marketplace` directory, the [`install-dynamic-plugins.py`](../../scripts/install-dynamic-plugins/install-dynamic-plugins.py) will automatically extract these catalog entities to a configurable location.
When the `CATALOG_INDEX_IMAGE` is set and the index image contains a `catalog-entities/marketplace` directory, the [`install-dynamic-plugins`](../../scripts/install-dynamic-plugins/) (TypeScript; from `scripts/install-dynamic-plugins/` run `yarn install && yarn build` to produce `dist/install-dynamic-plugins.cjs`) will automatically extract these catalog entities to a configurable location.

The extraction destination is governed by the `CATALOG_ENTITIES_EXTRACT_DIR` environment variable:

Expand Down
1 change: 1 addition & 0 deletions scripts/install-dynamic-plugins/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ pyvenv.cfg
**/__pycache__/
**/.pytest_cache/
**/.venv/
node_modules/
20 changes: 20 additions & 0 deletions scripts/install-dynamic-plugins/esbuild.config.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
'use strict';

const esbuild = require('esbuild');
const path = require('path');

Check warning on line 4 in scripts/install-dynamic-plugins/esbuild.config.cjs

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Prefer `node:path` over `path`.

See more on https://sonarcloud.io/project/issues?id=redhat-developer_rhdh&issues=AZ1AW1mP7c7kP5FazkoT&open=AZ1AW1mP7c7kP5FazkoT&pullRequest=4499

esbuild
.build({
entryPoints: [path.join(__dirname, 'dist', 'cli.js')],
bundle: true,
platform: 'node',
target: 'node22',
format: 'cjs',
outfile: path.join(__dirname, 'dist', 'install-dynamic-plugins.cjs'),
banner: {
js: '#!/usr/bin/env node\n'
},
sourcemap: true,
logLevel: 'info'
})
.catch(() => process.exit(1));
Loading
Loading