Invert global boolean

elastic · Nov 10, 2020 · 3d0384e · 3d0384e
1 parent df8f31e
commit 3d0384e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/libbeat/template/processor.go b/libbeat/template/processor.go
@@ -28,9 +28,9 @@ import (
 
 // Processor struct to process fields to template
 type Processor struct {
-	EsVersion common.Version
-	Migration bool
-	OSS       bool
+	EsVersion       common.Version
+	Migration       bool
+	ElasticLicensed bool
 }
 
 var (
@@ -76,7 +76,7 @@ func (p *Processor) Process(fields mapping.Fields, state *fieldState, output com
 			indexMapping = p.text(&field)
 		case "wildcard":
 			noWildcards := p.EsVersion.LessThan(common.MustNewVersion("7.9.0"))
-			if p.OSS || noWildcards {
+			if !p.ElasticLicensed || noWildcards {
 				indexMapping = p.keyword(&field)
 			} else {
 				indexMapping = p.wildcard(&field)

diff --git a/libbeat/template/processor_test.go b/libbeat/template/processor_test.go
@@ -698,7 +698,7 @@ func TestProcessWildcardOSS(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	p := Processor{EsVersion: *version, OSS: true}
+	p := Processor{EsVersion: *version}
 	err = p.Process(fields, nil, output)
 	if err != nil {
 		t.Fatal(err)
@@ -740,7 +740,7 @@ func TestProcessWildcardElastic(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	p := Processor{EsVersion: *version, OSS: false}
+	p := Processor{EsVersion: *version, ElasticLicensed: true}
 	err = p.Process(fields, nil, output)
 	if err != nil {
 		t.Fatal(err)
@@ -782,7 +782,7 @@ func TestProcessWildcardPreSupport(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	p := Processor{EsVersion: *version, OSS: false}
+	p := Processor{EsVersion: *version, ElasticLicensed: true}
 	err = p.Process(fields, nil, output)
 	if err != nil {
 		t.Fatal(err)

diff --git a/libbeat/template/template.go b/libbeat/template/template.go
@@ -158,7 +158,7 @@ func (t *Template) load(fields mapping.Fields) (common.MapStr, error) {
 
 	// Start processing at the root
 	properties := common.MapStr{}
-	processor := Processor{EsVersion: t.esVersion, OSS: version.OSS, Migration: t.migration}
+	processor := Processor{EsVersion: t.esVersion, ElasticLicensed: version.ElasticLicensed, Migration: t.migration}
 	if err := processor.Process(fields, nil, properties); err != nil {
 		return nil, err
 	}

diff --git a/libbeat/version/helper.go b/libbeat/version/helper.go
@@ -33,8 +33,8 @@ var (
 	commit    = "unknown"
 	qualifier = ""
 
-	// OSS provides if this is the OSS distro
-	OSS = true
+	// ElasticLicensed provides if this is an Elastic Licensed distro or OSS
+	ElasticLicensed = false
 )
 
 // BuildTime exposes the compile-time build time information.

diff --git a/x-pack/libbeat/cmd/inject.go b/x-pack/libbeat/cmd/inject.go
@@ -23,7 +23,7 @@ import (
 )
 
 func init() {
-	version.OSS = false
+	version.ElasticLicensed = true
 }
 
 // AddXPack extends the given root folder with XPack features