diff --git a/bundle/rhdh/manifests/rhdh-flavour-lightspeed-config_v1_configmap.yaml b/bundle/rhdh/manifests/rhdh-flavour-lightspeed-config_v1_configmap.yaml index 389b5d92f..c1ddb30cb 100644 --- a/bundle/rhdh/manifests/rhdh-flavour-lightspeed-config_v1_configmap.yaml +++ b/bundle/rhdh/manifests/rhdh-flavour-lightspeed-config_v1_configmap.yaml @@ -321,10 +321,10 @@ data: plugins: # Lightspeed Plugins - package: oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-lightspeed:{{inherit}} - disabled: false + enabled: true - package: oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-lightspeed-backend:{{inherit}} - disabled: false + enabled: true metadata.yaml: | # Lightspeed (AI) flavour metadata # This flavour is enabled by default and provides AI/Lightspeed functionality diff --git a/bundle/rhdh/manifests/rhdh-flavour-orchestrator-config_v1_configmap.yaml b/bundle/rhdh/manifests/rhdh-flavour-orchestrator-config_v1_configmap.yaml index 559f41d98..f68c9f697 100644 --- a/bundle/rhdh/manifests/rhdh-flavour-orchestrator-config_v1_configmap.yaml +++ b/bundle/rhdh/manifests/rhdh-flavour-orchestrator-config_v1_configmap.yaml @@ -9,15 +9,15 @@ data: dynamic-plugins.yaml: | plugins: - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator:{{inherit}}' - disabled: false + enabled: true - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-backend:{{inherit}}' - disabled: false + enabled: true dependencies: - ref: sonataflow - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator:{{inherit}}' - disabled: false + enabled: true - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets:{{inherit}}' - disabled: false + enabled: true metadata.yaml: | # Orchestrator flavour metadata # This flavour is disabled by default due to heavy infrastructure dependencies diff --git a/config/profile/rhdh/default-config/flavours/lightspeed/dynamic-plugins.yaml b/config/profile/rhdh/default-config/flavours/lightspeed/dynamic-plugins.yaml index b3db8fa28..d5434f8ba 100644 --- a/config/profile/rhdh/default-config/flavours/lightspeed/dynamic-plugins.yaml +++ b/config/profile/rhdh/default-config/flavours/lightspeed/dynamic-plugins.yaml @@ -7,7 +7,7 @@ data: plugins: # Lightspeed Plugins - package: oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-lightspeed:{{inherit}} - disabled: false + enabled: true - package: oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-lightspeed-backend:{{inherit}} - disabled: false + enabled: true diff --git a/config/profile/rhdh/default-config/flavours/orchestrator/dynamic-plugins.yaml b/config/profile/rhdh/default-config/flavours/orchestrator/dynamic-plugins.yaml index ca02ff9e2..60b080f84 100644 --- a/config/profile/rhdh/default-config/flavours/orchestrator/dynamic-plugins.yaml +++ b/config/profile/rhdh/default-config/flavours/orchestrator/dynamic-plugins.yaml @@ -6,12 +6,12 @@ data: dynamic-plugins.yaml: | plugins: - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator:{{inherit}}' - disabled: false + enabled: true - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-backend:{{inherit}}' - disabled: false + enabled: true dependencies: - ref: sonataflow - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator:{{inherit}}' - disabled: false + enabled: true - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets:{{inherit}}' - disabled: false + enabled: true diff --git a/dist/rhdh/install.yaml b/dist/rhdh/install.yaml index dd67cbea5..b9b8e0312 100644 --- a/dist/rhdh/install.yaml +++ b/dist/rhdh/install.yaml @@ -3343,10 +3343,10 @@ data: plugins: # Lightspeed Plugins - package: oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-lightspeed:{{inherit}} - disabled: false + enabled: true - package: oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-lightspeed-backend:{{inherit}} - disabled: false + enabled: true metadata.yaml: | # Lightspeed (AI) flavour metadata # This flavour is enabled by default and provides AI/Lightspeed functionality @@ -3367,15 +3367,15 @@ data: dynamic-plugins.yaml: | plugins: - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator:{{inherit}}' - disabled: false + enabled: true - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-backend:{{inherit}}' - disabled: false + enabled: true dependencies: - ref: sonataflow - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator:{{inherit}}' - disabled: false + enabled: true - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets:{{inherit}}' - disabled: false + enabled: true metadata.yaml: | # Orchestrator flavour metadata # This flavour is disabled by default due to heavy infrastructure dependencies diff --git a/docs/configuration.md b/docs/configuration.md index 542464cac..4f6d60ee9 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -719,7 +719,7 @@ data: - dynamic-plugins.default.yaml plugins: - package: './dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-dynamic' - disabled: false + enabled: true pluginConfig: catalog: providers: diff --git a/docs/dynamic-plugins.md b/docs/dynamic-plugins.md index 504dbac4b..cd874636e 100644 --- a/docs/dynamic-plugins.md +++ b/docs/dynamic-plugins.md @@ -141,7 +141,7 @@ data: includes: - dynamic-plugins.default.yaml plugins: - - disabled: false + - enabled: true package: "path-or-url-to-example-plugin" dependencies: - ref: example-dep diff --git a/docs/lightspeed.md b/docs/lightspeed.md index 9b0f4ac32..bb6c5abf9 100644 --- a/docs/lightspeed.md +++ b/docs/lightspeed.md @@ -68,9 +68,9 @@ includes: - dynamic-plugins.default.yaml plugins: - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-lightspeed:bs_1.49.4__2.2.1 - disabled: false + enabled: true - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-lightspeed-backend:bs_1.49.4__2.2.1 - disabled: false + enabled: true ``` For more information about configuring dynamic plugins, please refer to the [Configuration documentation](configuration.md). diff --git a/docs/orchestrator-cicd.md b/docs/orchestrator-cicd.md index 088770d2a..8e55c3524 100644 --- a/docs/orchestrator-cicd.md +++ b/docs/orchestrator-cicd.md @@ -286,17 +286,17 @@ To enable the ArgoCD and tekton plugins, update your Dynamic Plugins ConfigMap b plugins: ...... - package: ./dynamic-plugins/dist/backstage-community-plugin-redhat-argocd - disabled: false + enabled: true dependencies: - ref: argocd - package: ./dynamic-plugins/dist/backstage-community-plugin-tekton - disabled: false + enabled: true dependencies: - ref: tekton - package: ./dynamic-plugins/dist/roadiehq-backstage-plugin-argo-cd-backend-dynamic - disabled: false + enabled: true - package: ./dynamic-plugins/dist/roadiehq-scaffolder-backend-argocd-dynamic - disabled: false + enabled: true ``` This should create the ArgoCD AppProject resource and Tekton pipeline called `workflow-deployment`, for RHDH diff --git a/docs/orchestrator.md b/docs/orchestrator.md index a20cca315..014fe0372 100644 --- a/docs/orchestrator.md +++ b/docs/orchestrator.md @@ -81,15 +81,15 @@ To enable the orchestrator plugin, you should refer the dynamic plugins ConfigMa - dynamic-plugins.default.yaml plugins: - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator:{{inherit}}' - disabled: false + enabled: true - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-backend:{{inherit}}' - disabled: false + enabled: true dependencies: - ref: sonataflow - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator:{{inherit}}' - disabled: false + enabled: true - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets:{{inherit}}' - disabled: false + enabled: true ``` Starting from version 1.10, RHDH contains a predefined Orchestrator flavour with configured plugins. Users can enable it by configuring: diff --git a/examples/orchestrator-cicd.yaml b/examples/orchestrator-cicd.yaml index 0bef934f1..fdadf8142 100644 --- a/examples/orchestrator-cicd.yaml +++ b/examples/orchestrator-cicd.yaml @@ -8,34 +8,34 @@ data: - dynamic-plugins.default.yaml plugins: - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator:{{inherit}}' - disabled: false + enabled: true - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-backend:{{inherit}}' - disabled: false + enabled: true dependencies: - ref: sonataflow - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-scaffolder-backend-module-orchestrator:{{inherit}}' - disabled: false + enabled: true - package: 'oci://registry.access.redhat.com/rhdh/red-hat-developer-hub-backstage-plugin-orchestrator-form-widgets:{{inherit}}' - disabled: false + enabled: true # TODO These should be changed to the OCI references - package: ./dynamic-plugins/dist/backstage-community-plugin-redhat-argocd - disabled: false + enabled: true dependencies: - ref: argocd - package: ./dynamic-plugins/dist/backstage-community-plugin-tekton - disabled: false + enabled: true dependencies: - ref: tekton - package: ./dynamic-plugins/dist/roadiehq-backstage-plugin-argo-cd-backend-dynamic - disabled: false + enabled: true - package: ./dynamic-plugins/dist/roadiehq-scaffolder-backend-argocd-dynamic - disabled: false + enabled: true - package: ./dynamic-plugins/dist/backstage-plugin-scaffolder-backend-module-github-dynamic - disabled: false + enabled: true - package: ./dynamic-plugins/dist/backstage-plugin-kubernetes - disabled: false + enabled: true - package: ./dynamic-plugins/dist/backstage-plugin-kubernetes-backend-dynamic - disabled: false + enabled: true pluginConfig: kubernetes: customResources: diff --git a/examples/pvc-dp-cache.yaml b/examples/pvc-dp-cache.yaml index 17bbeb74d..272c0898a 100644 --- a/examples/pvc-dp-cache.yaml +++ b/examples/pvc-dp-cache.yaml @@ -19,7 +19,7 @@ data: - dynamic-plugins.default.yaml plugins: - package: './dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-dynamic' - disabled: true + enabled: false pluginConfig: catalog: providers: @@ -33,15 +33,15 @@ data: timeout: { minutes: 3} initialDelay: { seconds: 15} - package: ./dynamic-plugins/dist/backstage-plugin-techdocs-backend-dynamic - disabled: true + enabled: false - package: ./dynamic-plugins/dist/backstage-plugin-techdocs - disabled: false + enabled: true - package: ./dynamic-plugins/dist/backstage-plugin-techdocs-module-addons-contrib - disabled: true + enabled: false # Homepage - package: ./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-dynamic-home-page - disabled: false + enabled: true --- apiVersion: rhdh.redhat.com/v1alpha5 kind: Backstage diff --git a/examples/rhdh-cr-with-app-configs.yaml b/examples/rhdh-cr-with-app-configs.yaml index d7cc9169b..4a804da93 100644 --- a/examples/rhdh-cr-with-app-configs.yaml +++ b/examples/rhdh-cr-with-app-configs.yaml @@ -97,9 +97,9 @@ data: - dynamic-plugins.default.yaml plugins: - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/roadiehq-scaffolder-backend-module-utils:bs_1.45.3__4.1.1' - disabled: false + enabled: true - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-catalog-backend-module-github:bs_1.45.3__0.11.2' - disabled: false + enabled: true pluginConfig: catalog: providers: @@ -113,7 +113,7 @@ data: timeout: { minutes: 3} initialDelay: { seconds: 15} - package: 'oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-catalog-backend-module-gitlab:bs_1.45.3__0.7.5' - disabled: false + enabled: true pluginConfig: catalog: providers: diff --git a/examples/rhdh-cr.yaml b/examples/rhdh-cr.yaml index acfb8acdb..8a3857608 100644 --- a/examples/rhdh-cr.yaml +++ b/examples/rhdh-cr.yaml @@ -53,7 +53,7 @@ data: - dynamic-plugins.default.yaml plugins: - package: './dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-dynamic' - disabled: false + enabled: true pluginConfig: catalog: providers: diff --git a/integration_tests/testdata/raw-dynaplugins-with-deps.yaml b/integration_tests/testdata/raw-dynaplugins-with-deps.yaml index 1f3ebbe1b..f67f4abf4 100644 --- a/integration_tests/testdata/raw-dynaplugins-with-deps.yaml +++ b/integration_tests/testdata/raw-dynaplugins-with-deps.yaml @@ -5,11 +5,11 @@ metadata: data: dynamic-plugins.yaml: | plugins: - - disabled: false + - enabled: true package: "./dynamic-plugins/dist/red-hat-developer-hub-backstage-plugin-dynamic-home-page" dependencies: - ref: plugin - - disabled: true + - enabled: false package: "disabled" dependencies: - ref: disabled diff --git a/pkg/model/default-config_test.go b/pkg/model/default-config_test.go index d246d490d..2c1a084a1 100644 --- a/pkg/model/default-config_test.go +++ b/pkg/model/default-config_test.go @@ -74,7 +74,7 @@ func TestMergeDynamicPluginsFunction(t *testing.T) { } } require.NotNil(t, pluginB, "plugin-b should exist") - assert.False(t, pluginB.Disabled, "plugin-b should be enabled (overridden)") + assert.False(t, pluginB.IsDisabled(), "plugin-b should be enabled (overridden)") assert.Equal(t, "sha512-overlay", pluginB.Integrity, "plugin-b integrity should be from overlay") // Includes should be merged diff --git a/pkg/model/dynamic-plugins.go b/pkg/model/dynamic-plugins.go index bce1bef74..b54606300 100644 --- a/pkg/model/dynamic-plugins.go +++ b/pkg/model/dynamic-plugins.go @@ -53,11 +53,22 @@ type DynaPluginsConfig struct { type DynaPlugin struct { Package string `yaml:"package,omitempty"` Integrity string `yaml:"integrity,omitempty"` + Enabled *bool `yaml:"enabled,omitempty"` Disabled bool `yaml:"disabled"` PluginConfig map[string]interface{} `yaml:"pluginConfig,omitempty"` Dependencies []PluginDependency `yaml:"dependencies,omitempty"` } +// IsDisabled resolves the effective disabled state from the Enabled and +// Disabled fields. Enabled takes precedence when both are set. When neither +// is set the plugin is considered enabled (not disabled), preserving previous behaviour. +func (p DynaPlugin) IsDisabled() bool { + if p.Enabled != nil { + return !*p.Enabled + } + return p.Disabled +} + type PluginDependency struct { Ref string `yaml:"ref"` } @@ -185,7 +196,7 @@ func (p *DynamicPlugins) Dependencies() ([]PluginDependency, error) { result := make([]PluginDependency, 0) for _, pp := range ps { - if pp.Disabled { + if pp.IsDisabled() { continue } @@ -283,7 +294,13 @@ func MergePluginsData(firstData, secondData string) (string, error) { if plugin.Integrity != "" { existingPlugin.Integrity = plugin.Integrity } - existingPlugin.Disabled = plugin.Disabled + if plugin.Enabled != nil { + existingPlugin.Enabled = plugin.Enabled + existingPlugin.Disabled = false + } else if plugin.Disabled { + existingPlugin.Disabled = true + existingPlugin.Enabled = nil + } pluginMap[plugin.Package] = existingPlugin } else { pluginMap[plugin.Package] = plugin diff --git a/pkg/model/dynamic-plugins_test.go b/pkg/model/dynamic-plugins_test.go index 492c526fd..7d790ccd1 100644 --- a/pkg/model/dynamic-plugins_test.go +++ b/pkg/model/dynamic-plugins_test.go @@ -298,7 +298,7 @@ plugins: pluginA := config.Plugins[0] assert.Equal(t, "plugin-a", pluginA.Package) assert.Equal(t, "sha256-abc123", pluginA.Integrity) - assert.False(t, pluginA.Disabled) + assert.False(t, pluginA.IsDisabled()) assert.Equal(t, "value1", pluginA.PluginConfig["key1"]) assert.Equal(t, "value2", pluginA.PluginConfig["key2"]) assert.Equal(t, 2, len(pluginA.Dependencies)) @@ -309,7 +309,7 @@ plugins: pluginB := config.Plugins[1] assert.Equal(t, "plugin-b", pluginB.Package) assert.Equal(t, "sha256-def456", pluginB.Integrity) - assert.True(t, pluginB.Disabled) + assert.True(t, pluginB.IsDisabled()) assert.Equal(t, "value3", pluginB.PluginConfig["key3"]) assert.Empty(t, pluginB.Dependencies) } @@ -459,7 +459,7 @@ includes: pluginA := findPluginByPackage(mergedConfig.Plugins, "plugin-a") assert.NotNil(t, pluginA) assert.Equal(t, "sha256-overridden", pluginA.Integrity) - assert.Equal(t, false, pluginA.Disabled) + assert.False(t, pluginA.IsDisabled()) assert.Equal(t, "overridden", pluginA.PluginConfig["key1"]) assert.Equal(t, 1, len(pluginA.Dependencies)) assert.Equal(t, "dependency-3", pluginA.Dependencies[0].Ref) @@ -467,7 +467,7 @@ includes: // Validate plugin-b (disabled, from modelDp) pluginB := findPluginByPackage(mergedConfig.Plugins, "plugin-b") assert.NotNil(t, pluginB) - assert.Equal(t, true, pluginB.Disabled) + assert.True(t, pluginB.IsDisabled()) // Validate plugin-c (from modelDp, as plugin-b is disabled) //pluginC := mergedConfig.Plugins[1] @@ -493,7 +493,130 @@ includes: // Validate that the marshalled string omits empty fields assert.NotContains(t, string(marshalledE), "integrity", "The string should not contain 'integrity:'") // Validate that the marshalled string always includes disabled field - assert.Contains(t, string(marshalledE), "disabled", "The string should not contain 'disabled:'") + assert.Contains(t, string(marshalledE), "disabled", "The string should contain 'disabled:'") +} + +func TestIsDisabled(t *testing.T) { + true_ := true + false_ := false + + tests := []struct { + name string + plugin DynaPlugin + expected bool + }{ + {"neither set defaults to enabled", DynaPlugin{Package: "p"}, false}, + {"disabled: true", DynaPlugin{Package: "p", Disabled: true}, true}, + {"disabled: false", DynaPlugin{Package: "p", Disabled: false}, false}, + {"enabled: true", DynaPlugin{Package: "p", Enabled: &true_}, false}, + {"enabled: false", DynaPlugin{Package: "p", Enabled: &false_}, true}, + {"enabled takes precedence over disabled", DynaPlugin{Package: "p", Enabled: &true_, Disabled: true}, false}, + {"enabled: false takes precedence over disabled: false", DynaPlugin{Package: "p", Enabled: &false_, Disabled: false}, true}, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + assert.Equal(t, tt.expected, tt.plugin.IsDisabled()) + }) + } +} + +func TestMergePluginsEnabledDisabledBackwardCompat(t *testing.T) { + // Base has enabled: true, overlay disables with legacy disabled: true + t.Run("legacy disabled overlay overrides enabled base", func(t *testing.T) { + base := ` +plugins: + - package: "plugin-a" + enabled: true +` + overlay := ` +plugins: + - package: "plugin-a" + disabled: true +` + merged, err := MergePluginsData(base, overlay) + assert.NoError(t, err) + + var config DynaPluginsConfig + err = yaml.Unmarshal([]byte(merged), &config) + assert.NoError(t, err) + + plugin := findPluginByPackage(config.Plugins, "plugin-a") + assert.NotNil(t, plugin) + assert.True(t, plugin.IsDisabled(), "legacy disabled: true should override enabled: true") + }) + + // Base has disabled: true, overlay enables with enabled: true + t.Run("enabled overlay overrides disabled base", func(t *testing.T) { + base := ` +plugins: + - package: "plugin-a" + disabled: true +` + overlay := ` +plugins: + - package: "plugin-a" + enabled: true +` + merged, err := MergePluginsData(base, overlay) + assert.NoError(t, err) + + var config DynaPluginsConfig + err = yaml.Unmarshal([]byte(merged), &config) + assert.NoError(t, err) + + plugin := findPluginByPackage(config.Plugins, "plugin-a") + assert.NotNil(t, plugin) + assert.False(t, plugin.IsDisabled(), "enabled: true should override disabled: true") + }) + + // Overlay omits both fields — base state preserved + t.Run("overlay without activation fields preserves base", func(t *testing.T) { + base := ` +plugins: + - package: "plugin-a" + disabled: true + integrity: "sha256-abc" +` + overlay := ` +plugins: + - package: "plugin-a" + integrity: "sha256-overridden" +` + merged, err := MergePluginsData(base, overlay) + assert.NoError(t, err) + + var config DynaPluginsConfig + err = yaml.Unmarshal([]byte(merged), &config) + assert.NoError(t, err) + + plugin := findPluginByPackage(config.Plugins, "plugin-a") + assert.NotNil(t, plugin) + assert.True(t, plugin.IsDisabled(), "base disabled: true should be preserved when overlay omits both fields") + assert.Equal(t, "sha256-overridden", plugin.Integrity) + }) + + // Pure legacy config still works + t.Run("legacy disabled-only config works", func(t *testing.T) { + base := ` +plugins: + - package: "plugin-a" + disabled: false + - package: "plugin-b" + disabled: true +` + merged, err := MergePluginsData(base, "") + assert.NoError(t, err) + + var config DynaPluginsConfig + err = yaml.Unmarshal([]byte(merged), &config) + assert.NoError(t, err) + + pluginA := findPluginByPackage(config.Plugins, "plugin-a") + assert.False(t, pluginA.IsDisabled()) + pluginB := findPluginByPackage(config.Plugins, "plugin-b") + assert.True(t, pluginB.IsDisabled()) + }) } func TestRemoveDefaultInclude(t *testing.T) { diff --git a/pkg/model/testdata/dynamic-plugins-base.yaml b/pkg/model/testdata/dynamic-plugins-base.yaml index 336b45f3e..47c8ac59f 100644 --- a/pkg/model/testdata/dynamic-plugins-base.yaml +++ b/pkg/model/testdata/dynamic-plugins-base.yaml @@ -8,7 +8,7 @@ data: - dynamic-plugins.default.yaml plugins: - package: "plugin-a" - disabled: false + enabled: true - package: "plugin-b" - disabled: true + enabled: false integrity: "sha512-base" diff --git a/pkg/model/testdata/dynamic-plugins-overlay.yaml b/pkg/model/testdata/dynamic-plugins-overlay.yaml index fe24143fd..b5ebe35d0 100644 --- a/pkg/model/testdata/dynamic-plugins-overlay.yaml +++ b/pkg/model/testdata/dynamic-plugins-overlay.yaml @@ -8,7 +8,7 @@ data: - dynamic-plugins.custom.yaml plugins: - package: "plugin-b" - disabled: false + enabled: true integrity: "sha512-overlay" - package: "plugin-c" - disabled: false + enabled: true diff --git a/pkg/model/testdata/testflavours-nobase/default-config/flavours/flavor3/dynamic-plugins.yaml b/pkg/model/testdata/testflavours-nobase/default-config/flavours/flavor3/dynamic-plugins.yaml index 9952cfeaa..5ce8b73e6 100644 --- a/pkg/model/testdata/testflavours-nobase/default-config/flavours/flavor3/dynamic-plugins.yaml +++ b/pkg/model/testdata/testflavours-nobase/default-config/flavours/flavor3/dynamic-plugins.yaml @@ -6,4 +6,4 @@ data: "dynamic-plugins.yaml": | plugins: - package: "plugin-flavor3" - disabled: false + enabled: true diff --git a/pkg/model/testdata/testflavours/default-config/dynamic-plugins.yaml b/pkg/model/testdata/testflavours/default-config/dynamic-plugins.yaml index bcc4f8424..16cad0afb 100644 --- a/pkg/model/testdata/testflavours/default-config/dynamic-plugins.yaml +++ b/pkg/model/testdata/testflavours/default-config/dynamic-plugins.yaml @@ -8,4 +8,4 @@ data: - dynamic-plugins.default.yaml plugins: - package: "plugin-base" - disabled: false + enabled: true diff --git a/pkg/model/testdata/testflavours/default-config/flavours/flavor1/dynamic-plugins.yaml b/pkg/model/testdata/testflavours/default-config/flavours/flavor1/dynamic-plugins.yaml index f4c87ca5b..d0f1e9623 100644 --- a/pkg/model/testdata/testflavours/default-config/flavours/flavor1/dynamic-plugins.yaml +++ b/pkg/model/testdata/testflavours/default-config/flavours/flavor1/dynamic-plugins.yaml @@ -6,4 +6,4 @@ data: "dynamic-plugins.yaml": | plugins: - package: "plugin-flavor1" - disabled: false + enabled: true diff --git a/pkg/model/testdata/testflavours/default-config/flavours/flavor2/dynamic-plugins.yaml b/pkg/model/testdata/testflavours/default-config/flavours/flavor2/dynamic-plugins.yaml index 1f6e1b481..f3d963818 100644 --- a/pkg/model/testdata/testflavours/default-config/flavours/flavor2/dynamic-plugins.yaml +++ b/pkg/model/testdata/testflavours/default-config/flavours/flavor2/dynamic-plugins.yaml @@ -6,4 +6,4 @@ data: "dynamic-plugins.yaml": | plugins: - package: "plugin-flavor2" - disabled: false + enabled: true