From 8f1292454250c378af0432606bb99418cc19c753 Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Tue, 14 Jan 2025 23:50:30 +0100 Subject: [PATCH] Allow to override default deployment mode (#854) Add a setting that allows to make agentless the default deployment mode in cases where a policy template has multiple deployment modes enabled. --- spec/changelog.yml | 3 +++ spec/integration/manifest.spec.yml | 18 ++++++++++++++++++ .../bad_deployment_mode_resources/manifest.yml | 2 +- test/packages/good_v3/manifest.yml | 1 + 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/spec/changelog.yml b/spec/changelog.yml index e1430408..de36dc11 100644 --- a/spec/changelog.yml +++ b/spec/changelog.yml @@ -15,6 +15,9 @@ - description: Add support for Agentless resources. type: enhancement link: https://github.com/elastic/package-spec/pull/853 + - description: Allow to override default deployment mode. + type: enhancement + link: https://github.com/elastic/package-spec/pull/854 - version: 3.3.1 changes: - description: Add validation rule to ensure security capability is added if there is any security rule asset. diff --git a/spec/integration/manifest.spec.yml b/spec/integration/manifest.spec.yml index cdc07b34..4091767d 100644 --- a/spec/integration/manifest.spec.yml +++ b/spec/integration/manifest.spec.yml @@ -163,6 +163,9 @@ spec: type: object properties: enabled: + description: > + Indicates if the default deployment mode is available for this template policy. + It is enabled by default. type: boolean default: true agentless: @@ -173,6 +176,15 @@ spec: additionalProperties: false properties: enabled: + description: > + Indicates if the agentless deployment mode is available for this template policy. + It is disabled by default. + type: boolean + default: false + is_default: + description: > + On policy templates that support multiple deployment modes, this setting can be set to + true to use agentless mode by default. type: boolean default: false organization: @@ -577,6 +589,12 @@ spec: # JSON patches for newer versions should be placed on top versions: + - before: 3.3.2 + patch: + - op: remove + path: "/definitions/deployment_modes/properties/agentless/properties/is_default" + - op: remove + path: "/definitions/deployment_modes/properties/agentless/properties/resources" - before: 3.3.1 patch: - op: remove diff --git a/test/packages/bad_deployment_mode_resources/manifest.yml b/test/packages/bad_deployment_mode_resources/manifest.yml index 35df8814..6b643118 100644 --- a/test/packages/bad_deployment_mode_resources/manifest.yml +++ b/test/packages/bad_deployment_mode_resources/manifest.yml @@ -1,4 +1,4 @@ -format_version: 3.2.2 +format_version: 3.3.2 name: bad_deployment_mode title: "Bad Deployment Mode" version: 0.0.1 diff --git a/test/packages/good_v3/manifest.yml b/test/packages/good_v3/manifest.yml index a360db9e..9270fc79 100644 --- a/test/packages/good_v3/manifest.yml +++ b/test/packages/good_v3/manifest.yml @@ -36,6 +36,7 @@ policy_templates: deployment_modes: agentless: enabled: true + is_default: true organization: elastic division: observability team: obs-infraobs-integrations