Revert "Add support for an optional value in discovery fields"

mrodm · mrodm · commit a443b29a2960 · 2025-07-08T19:23:07.000+02:00
diff --git a/code/go/pkg/validator/validator_test.go b/code/go/pkg/validator/validator_test.go
@@ -278,7 +278,7 @@ func TestValidateFile(t *testing.T) {
 			[]string{
 				"field discovery.fields.0.name: Invalid type. Expected: string, given: integer",
 				"field discovery.fields.1: name is required",
-				"field discovery.fields.2.value: String length must be greater than or equal to 1",
+				"field discovery.fields.2: name is required",
 			},
 		},
 	}
diff --git a/compliance/testdata/packages/basic_content/manifest.yml b/compliance/testdata/packages/basic_content/manifest.yml
@@ -19,14 +19,6 @@ conditions:
 discovery:
   fields:
     - name: process.pid
-    - name: event.dataset
-      value: nginx.access
-    - name: event.dataset
-      value: nginx.error
-    - name: process.owner.id
-      value: 12345
-    - name: test.boolean
-      value: true
 screenshots:
   - src: /img/kibana-system.png
     title: kibana system
diff --git a/spec/changelog.yml b/spec/changelog.yml
@@ -15,9 +15,6 @@
     - description: Add fips_compatible boolean flag for input package policy templates.
       type: enhancement
       link: https://github.com/elastic/package-spec/pull/914
-    - description: Add support to define an optional value for discovery fields.
-      type: enhancement
-      link: https://github.com/elastic/package-spec/pull/917
 - version: 3.4.0
   changes:
     - description: Add kibana/security_ai_prompt to support security AI prompt assets.
diff --git a/spec/content/manifest.spec.yml b/spec/content/manifest.spec.yml
@@ -22,18 +22,6 @@ spec:
               name:
                 description: Name of the field.
                 type: string
-              value:
-                description: >
-                  An optional expected value for the "name" field.
-                oneOf:
-                - type: string
-                  minLength: 1
-                - type: number
-                - type: boolean
-                examples:
-                - "nginx.access"
-                - true
-                - 12345
             required:
               - name
   properties:
diff --git a/test/packages/bad_discovery_fields/manifest.yml b/test/packages/bad_discovery_fields/manifest.yml
@@ -16,9 +16,8 @@ conditions:
 discovery:
   fields:
     - name: 12345
+    - {}
     - value: nginx.access
-    - name: event.dataset
-      value: ""
 screenshots:
   - src: /img/sample-screenshot.png
     title: Sample screenshot

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ func TestValidateFile(t *testing.T) {`
`278`	`278`	`[]string{`
`279`	`279`	`"field discovery.fields.0.name: Invalid type. Expected: string, given: integer",`
`280`	`280`	`"field discovery.fields.1: name is required",`
`281`		`- "field discovery.fields.2.value: String length must be greater than or equal to 1",`
	`281`	`+ "field discovery.fields.2: name is required",`
`282`	`282`	`},`
`283`	`283`	`},`
`284`	`284`	`}`