chore(install): merge plugin config for include files

[dzemanov]

Description

Plugins defined in include files are overwriting plugin configuration as a whole. This changes the behaviour to instead merge, only overwriting the specific keys they define while retaining the keys defined in previous include files, as is being done for plugins under plugins key.

This is needed for Extensions plugin to be able to use pluginConfig from default plugins file when enabling preinstalled plugins.

Which issue(s) does this PR fix

• Fixes https://issues.redhat.com/browse/RHDHBUGS-1885
• Partially addresses https://issues.redhat.com/browse/RHIDP-5607

Demo

marketplace-include-config.mov

How to test on rhdh-local

Create dynamic-plugins.marketplace.yaml under configs/app-config with this content

plugins:
  - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import
    disabled: false
  - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-bulk-import-backend-dynamic
    disabled: false

add to dynamic-plugins.override.yaml:

# Example dynamic plugin override config.
# Copy to dynamic-plugins.override.yaml to activate local plugins.

includes:
  - dynamic-plugins.default.yaml
  - /opt/app-root/src/configs/app-config/dynamic-plugins.marketplace.yaml

# Below you can add custom dynamic plugins, including local ones.
plugins: []

Bulk import should be successfully mounted although it doesnt have pluginConfig specified in dynamic-plugins.marketplace.yaml

PR acceptance criteria

Please make sure that the following steps are complete:

• GitHub Actions are completed and successful
• Unit Tests are updated and passing
• E2E Tests are updated and passing
• Documentation is updated if necessary (requirement for new features)
• Add a screenshot if the change is UX/UI related

How to test changes / Special notes to the reviewer

[github-actions]

The image is available at:

• quay.io/rhdh-community/rhdh:pr-3143 or
• quay.io/rhdh-community/rhdh:pr-3143-ab8c78d0

[dzemanov]

/cc @kadel

[kadel]

/approve
/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kadel

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [kadel]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[PatAKnight]

/cherry-pick release-1.7

[openshift-cherrypick-robot]

@PatAKnight: new pull request created: #3148

In response to this:

/cherry-pick release-1.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.