Adding different flag for include and exclude labels

elastic · Oct 3, 2023 · c665bc2 · c665bc2
1 parent 1f83853
commit c665bc2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/kubernetes/metadata/config.go b/kubernetes/metadata/config.go
@@ -25,7 +25,8 @@ import (
 type Config struct {
 	KubeConfig string `config:"kube_config"`
 
-	UseRegex           bool     `config:"use_regex"`
+	UseRegexInclude    bool     `config:"use_regex_include"`
+	UseRegexExclude    bool     `config:"use_regex_exclude"`
 	IncludeLabels      []string `config:"include_labels"`
 	ExcludeLabels      []string `config:"exclude_labels"`
 	IncludeAnnotations []string `config:"include_annotations"`
@@ -46,7 +47,8 @@ type AddResourceMetadataConfig struct {
 func (c *Config) InitDefaults() {
 	c.LabelsDedot = true
 	c.AnnotationsDedot = true
-	c.UseRegex = false
+	c.UseRegexInclude = false
+	c.UseRegexExclude = false
 }
 
 // Unmarshal unpacks a Config into the metagen Config

diff --git a/kubernetes/metadata/resource.go b/kubernetes/metadata/resource.go
@@ -107,20 +107,20 @@ func (r *Resource) GenerateK8s(kind string, obj kubernetes.Resource, options ...
 	if len(r.config.IncludeLabels) == 0 {
 		labelMap = GenerateMap(accessor.GetLabels(), r.config.LabelsDedot)
 	} else {
-		labelMap = generateMapSubset(accessor.GetLabels(), r.config.IncludeLabels, r.config.LabelsDedot, r.config.UseRegex)
+		labelMap = generateMapSubset(accessor.GetLabels(), r.config.IncludeLabels, r.config.LabelsDedot, r.config.UseRegexInclude)
 	}
 
 	var labelMaptoExclude mapstr.M
 	if len(r.config.ExcludeLabels) != 0 {
-		labelMaptoExclude = generateMapSubset(accessor.GetLabels(), r.config.ExcludeLabels, r.config.LabelsDedot, r.config.UseRegex)
+		labelMaptoExclude = generateMapSubset(accessor.GetLabels(), r.config.ExcludeLabels, r.config.LabelsDedot, r.config.UseRegexExclude)
 	}
 
 	// Exclude any labels that are present in the exclude_labels config
 	for label := range labelMaptoExclude {
 		_ = labelMap.Delete(label)
 	}
 
-	annotationsMap := generateMapSubset(accessor.GetAnnotations(), r.config.IncludeAnnotations, r.config.AnnotationsDedot, r.config.UseRegex)
+	annotationsMap := generateMapSubset(accessor.GetAnnotations(), r.config.IncludeAnnotations, r.config.AnnotationsDedot, r.config.UseRegexInclude)
 
 	meta := mapstr.M{
 		strings.ToLower(kind): mapstr.M{

diff --git a/kubernetes/metadata/resource_test.go b/kubernetes/metadata/resource_test.go
@@ -350,4 +350,14 @@ func Test_generateMapSubset(t *testing.T) {
 	output6 := generateMapSubset(Labelsdedot, key6, true, true)
 	assert.Equal(t, expectedresult6, output6)
 
+	//Default code, UsegexInclude=false  Validation
+	key7 := []string{
+		"app.kubernetes.io/name",
+	}
+	expectedresult7 := mapstr.M{
+		"app_kubernetes_io/name": "no",
+	}
+	output7 := generateMapSubset(Labelsdedot, key7, true, false)
+	assert.Equal(t, expectedresult7, output7)
+
 }