Merge pull request #204 from Cryptophobia/master

Cryptophobia · web-flow · commit 297fe6812542 · 2021-04-20T12:18:04.000-04:00
fix(reloader): fix ctx.Namespace typo
diff --git a/config-reloader/generator/generator.go b/config-reloader/generator/generator.go
@@ -280,7 +280,7 @@ func (g *Generator) makeValidationTrailer(ns *datasource.NamespaceConfig, genCtx
 
 func (g *Generator) makeContext(ns *datasource.NamespaceConfig, genCtx *processors.GenerationContext) *processors.ProcessorContext {
 	ctx := &processors.ProcessorContext{
-		Namepsace:         ns.Name,
+		Namespace:         ns.Name,
 		NamespaceLabels:   ns.Labels,
 		AllowFile:         g.cfg.AllowFile,
 		DeploymentID:      g.cfg.ID,
diff --git a/config-reloader/processors/destinations.go b/config-reloader/processors/destinations.go
@@ -20,7 +20,7 @@ type fixDestinations struct {
 }
 
 func makeSafeBufferPath(ctx *ProcessorContext, origBufPath string) string {
-	return fmt.Sprintf("/var/log/kfo-%s-%s-%s.buf", util.MakeFluentdSafeName(ctx.DeploymentID), ctx.Namepsace, util.Hash("", origBufPath))
+	return fmt.Sprintf("/var/log/kfo-%s-%s-%s.buf", util.MakeFluentdSafeName(ctx.DeploymentID), ctx.Namespace, util.Hash("", origBufPath))
 }
 
 func prohibitSources(d *fluentd.Directive, ctx *ProcessorContext) error {
diff --git a/config-reloader/processors/destinations_test.go b/config-reloader/processors/destinations_test.go
@@ -49,7 +49,7 @@ func TestDestinationsRewriteBufferPath(t *testing.T) {
 	fmt.Printf("Original:\n%s", fragment)
 
 	ctx := &ProcessorContext{
-		Namepsace: "monitoring",
+		Namespace: "monitoring",
 	}
 	fragment, err = Process(fragment, ctx, &fixDestinations{})
 	assert.Nil(t, err)
@@ -67,7 +67,7 @@ func TestDestinationsRewriteBufferPath(t *testing.T) {
 
 func TestExpandBadConfig(t *testing.T) {
 	ctx := &ProcessorContext{
-		Namepsace: "monitoring",
+		Namespace: "monitoring",
 	}
 
 	list := []string{
diff --git a/config-reloader/processors/detect_exceptions_test.go b/config-reloader/processors/detect_exceptions_test.go
@@ -13,7 +13,7 @@ import (
 
 func TestRewrite(t *testing.T) {
 	ctx := &ProcessorContext{
-		Namepsace: "monitoring",
+		Namespace: "monitoring",
 		GenerationContext: &GenerationContext{
 			ReferencedBridges: map[string]bool{},
 		},
@@ -55,7 +55,7 @@ func TestRewrite(t *testing.T) {
 func TestWithoutExceptions(t *testing.T) {
 
 	ctx := &ProcessorContext{
-		Namepsace: "monitoring",
+		Namespace: "monitoring",
 		GenerationContext: &GenerationContext{
 			ReferencedBridges: map[string]bool{},
 		},
@@ -93,7 +93,7 @@ func TestWithoutExceptions(t *testing.T) {
 func TestWithExceptions(t *testing.T) {
 
 	ctx := &ProcessorContext{
-		Namepsace: "monitoring",
+		Namespace: "monitoring",
 		GenerationContext: &GenerationContext{
 			ReferencedBridges: map[string]bool{},
 		},
diff --git a/config-reloader/processors/expand_tags_test.go b/config-reloader/processors/expand_tags_test.go
@@ -27,7 +27,7 @@ func TestTagsExpandOk(t *testing.T) {
 		fmt.Printf("Original:\n%s", fragment)
 
 		ctx := &ProcessorContext{
-			Namepsace:         "monitoring",
+			Namespace:         "monitoring",
 			GenerationContext: &GenerationContext{},
 			AllowTagExpansion: true,
 		}
@@ -70,7 +70,7 @@ func TestNestedTagsExpandOk(t *testing.T) {
 	fmt.Printf("Original:\n%s", fragment)
 
 	ctx := &ProcessorContext{
-		Namepsace:         "monitoring",
+		Namespace:         "monitoring",
 		GenerationContext: &GenerationContext{},
 		AllowTagExpansion: true,
 	}
@@ -96,7 +96,7 @@ func TestNestedTagsExpandOk(t *testing.T) {
 func TestTagsExpandBadConfig(t *testing.T) {
 
 	ctx := &ProcessorContext{
-		Namepsace:         "monitoring",
+		Namespace:         "monitoring",
 		AllowTagExpansion: true,
 	}
 
diff --git a/config-reloader/processors/extract_plugins_test.go b/config-reloader/processors/extract_plugins_test.go
@@ -84,7 +84,7 @@ func TestExpandPlugins(t *testing.T) {
 
 	ctx := &ProcessorContext{
 		GenerationContext: g,
-		Namepsace:         "unit-test",
+		Namespace:         "unit-test",
 		DeploymentID:      "whatever",
 	}
 
@@ -146,7 +146,7 @@ func TestNothingToExpand(t *testing.T) {
 
 	ctx := &ProcessorContext{
 		GenerationContext: g,
-		Namepsace:         "unit-test",
+		Namespace:         "unit-test",
 		DeploymentID:      "whatever",
 	}
 
@@ -228,7 +228,7 @@ func TestExpandPluginsInCopyStore(t *testing.T) {
 
 	ctx := &ProcessorContext{
 		GenerationContext: g,
-		Namepsace:         "unit-test",
+		Namespace:         "unit-test",
 		DeploymentID:      "whatever",
 	}
 
diff --git a/config-reloader/processors/labels.go b/config-reloader/processors/labels.go
@@ -199,7 +199,7 @@ func (p *expandLabelsMacroState) Process(input fluentd.Fragment) (fluentd.Fragme
 			return nil
 		}
 
-		d.Tag = makeTagFromFilter(ctx.Namepsace, sortedLabelNames, labelNames)
+		d.Tag = makeTagFromFilter(ctx.Namespace, sortedLabelNames, labelNames)
 		ctx.GenerationContext.augmentTag(d)
 		return nil
 	}
@@ -210,7 +210,7 @@ func (p *expandLabelsMacroState) Process(input fluentd.Fragment) (fluentd.Fragme
 		Pattern string
 		Labels  []string
 	}{
-		fmt.Sprintf("kube.%s.*.*", p.Context.Namepsace),
+		fmt.Sprintf("kube.%s.*.*", p.Context.Namespace),
 		sortedLabelNames,
 	}
 	writer := &bytes.Buffer{}
diff --git a/config-reloader/processors/labels_test.go b/config-reloader/processors/labels_test.go
@@ -81,7 +81,7 @@ func TestLabelNoLabels(t *testing.T) {
 	fmt.Printf("Original:\n%s\n", fragment)
 
 	ctx := &ProcessorContext{
-		Namepsace: "monitoring",
+		Namespace: "monitoring",
 		GenerationContext: &GenerationContext{
 			ReferencedBridges: map[string]bool{},
 		},
@@ -114,7 +114,7 @@ func TestLabelWithLabels(t *testing.T) {
 	fmt.Printf("Original:\n%s\n", fragment)
 
 	ctx := &ProcessorContext{
-		Namepsace: "monitoring",
+		Namespace: "monitoring",
 		GenerationContext: &GenerationContext{
 			ReferencedBridges: map[string]bool{},
 		},
@@ -190,7 +190,7 @@ func TestLabelWithLabelsAndElse(t *testing.T) {
 	fmt.Printf("Original:\n%s\n", fragment)
 
 	ctx := &ProcessorContext{
-		Namepsace: "monitoring",
+		Namespace: "monitoring",
 		GenerationContext: &GenerationContext{
 			ReferencedBridges: map[string]bool{},
 		},
@@ -224,7 +224,7 @@ func TestLabelWithLabelsAndContainer(t *testing.T) {
 	fmt.Printf("Original:\n%s\n", fragment)
 
 	ctx := &ProcessorContext{
-		Namepsace: "monitoring",
+		Namespace: "monitoring",
 		GenerationContext: &GenerationContext{
 			ReferencedBridges: map[string]bool{},
 		},
diff --git a/config-reloader/processors/mounted_file.go b/config-reloader/processors/mounted_file.go
@@ -118,7 +118,7 @@ func (state *mountedFileState) convertToFragement(cf *ContainerFile) fluentd.Fra
 
 				hostPath := state.makeHostPath(cf, hm, mc)
 				pos := util.Hash(state.Context.DeploymentID, fmt.Sprintf("%s-%s-%s", mc.PodID, mc.Name, hostPath))
-				tag := fmt.Sprintf("kube.%s.%s.%s-%s", state.Context.Namepsace, mc.PodName, mc.Name, pos)
+				tag := fmt.Sprintf("kube.%s.%s.%s-%s", state.Context.Namespace, mc.PodName, mc.Name, pos)
 				dir.SetParam("path", hostPath)
 				dir.SetParam("read_from_head", "true")
 				dir.SetParam("tag", tag)
@@ -164,7 +164,7 @@ func (state *mountedFileState) makeAttachK8sMetadataDirective(tag string, mc *da
 	fmt.Fprintf(buf, "record['kubernetes']=%s; ", util.ToRubyMapLiteral(map[string]string{
 		"container_name":  mc.Name,
 		"container_image": mc.Image,
-		"namespace_name":  state.Context.Namepsace,
+		"namespace_name":  state.Context.Namespace,
 		"pod_name":        mc.PodName,
 		"pod_id":          mc.PodID,
 		"host":            mc.NodeName,
diff --git a/config-reloader/processors/mounted_file_test.go b/config-reloader/processors/mounted_file_test.go
@@ -33,7 +33,7 @@ func TestMountedFileRemovedAfterProcessing(t *testing.T) {
 	fmt.Printf("Original: %s", fragment)
 
 	ctx := &ProcessorContext{
-		Namepsace: "monitoring",
+		Namespace: "monitoring",
 	}
 
 	processor := &mountedFileState{}
@@ -202,7 +202,7 @@ func TestConvertToFragment(t *testing.T) {
 	}
 
 	ctx := &ProcessorContext{
-		Namepsace:   "monitoring",
+		Namespace:   "monitoring",
 		KubeletRoot: "/kubelet-root",
 		MiniContainers: []*datasource.MiniContainer{
 			c1,
@@ -318,7 +318,7 @@ func TestProcessMountedFile(t *testing.T) {
 	}
 
 	ctx := &ProcessorContext{
-		Namepsace:   "monitoring",
+		Namespace:   "monitoring",
 		KubeletRoot: "/kubelet-root",
 		MiniContainers: []*datasource.MiniContainer{
 			c1,
diff --git a/config-reloader/processors/processor.go b/config-reloader/processors/processor.go
@@ -37,7 +37,7 @@ func (g *GenerationContext) augmentTag(d *fluentd.Directive) {
 // ProcessorContext is how a processor gets an environment to operate in.
 // It is both the model and the workspace of a processor.
 type ProcessorContext struct {
-	Namepsace         string
+	Namespace         string
 	NamespaceLabels   map[string]string
 	AllowFile         bool
 	DeploymentID      string
diff --git a/config-reloader/processors/processor_test.go b/config-reloader/processors/processor_test.go
@@ -38,7 +38,7 @@ func Test_callForEveryDirective(t *testing.T) {
 	fmt.Printf("Original:\n%s", fragment)
 
 	ctx := &ProcessorContext{
-		Namepsace: "test",
+		Namespace: "test",
 	}
 	count := 0
 	inc := func(*fluentd.Directive, *ProcessorContext) error {
diff --git a/config-reloader/processors/relabel.go b/config-reloader/processors/relabel.go
@@ -23,7 +23,7 @@ func normalizeLabelName(ctx *ProcessorContext, label string) string {
 
 	return fmt.Sprintf("@%s-%s",
 		util.MakeFluentdSafeName(label),
-		util.Hash(ctx.Namepsace, label))
+		util.Hash(ctx.Namespace, label))
 }
 
 func (p *rewriteLabelsState) Process(input fluentd.Fragment) (fluentd.Fragment, error) {
diff --git a/config-reloader/processors/relabel_test.go b/config-reloader/processors/relabel_test.go
@@ -34,7 +34,7 @@ func TestParseConfigWithBadLabels(t *testing.T) {
 	}
 
 	ctx := &ProcessorContext{
-		Namepsace: "demo",
+		Namespace: "demo",
 		GenerationContext: &GenerationContext{
 			ReferencedBridges: map[string]bool{},
 		},
@@ -58,7 +58,7 @@ func TestParseConfigWithGoodLabels(t *testing.T) {
 		`
 
 	ctx := &ProcessorContext{
-		Namepsace: "demo",
+		Namespace: "demo",
 		GenerationContext: &GenerationContext{
 			ReferencedBridges: map[string]bool{},
 		},
@@ -94,7 +94,7 @@ func TestLabelsAreRewritten(t *testing.T) {
 	fmt.Printf("Original:\n%s\n", fragment)
 
 	ctx := &ProcessorContext{
-		Namepsace: "monitoring",
+		Namespace: "monitoring",
 		GenerationContext: &GenerationContext{
 			ReferencedBridges: map[string]bool{},
 		},
@@ -151,7 +151,7 @@ func TestCopyPluginLabelsAreRewritten(t *testing.T) {
 	fmt.Printf("Original:\n%s\n", fragment)
 
 	ctx := &ProcessorContext{
-		Namepsace: "monitoring",
+		Namespace: "monitoring",
 		GenerationContext: &GenerationContext{
 			ReferencedBridges: map[string]bool{},
 		},
@@ -201,7 +201,7 @@ func TestLabelWithLabelsAndRelabelsAndElse(t *testing.T) {
 	fmt.Printf("Original:\n%s\n", fragment)
 
 	ctx := &ProcessorContext{
-		Namepsace: "demo",
+		Namespace: "demo",
 		GenerationContext: &GenerationContext{
 			ReferencedBridges: map[string]bool{},
 		},
@@ -237,7 +237,7 @@ func TestNastyRegex(t *testing.T) {
 	fmt.Printf("Original:\n%s\n", fragment)
 
 	ctx := &ProcessorContext{
-		Namepsace: "demo",
+		Namespace: "demo",
 		GenerationContext: &GenerationContext{
 			ReferencedBridges: map[string]bool{},
 		},
diff --git a/config-reloader/processors/share.go b/config-reloader/processors/share.go
@@ -83,7 +83,7 @@ func (p *shareLogsState) Prepare(input fluentd.Fragment) (fluentd.Fragment, erro
 			return nil
 		}
 
-		bridge := makeBridgeName(sourceNs, p.Context.Namepsace)
+		bridge := makeBridgeName(sourceNs, p.Context.Namespace)
 		p.Context.GenerationContext.ReferencedBridges[bridge] = true
 		return nil
 	}
@@ -122,7 +122,7 @@ func (p *shareLogsState) Process(input fluentd.Fragment) (fluentd.Fragment, erro
 			if destNs == "" {
 				return fmt.Errorf("@type share required a with_namespace parameter")
 			}
-			bridge := makeBridgeName(p.Context.Namepsace, destNs)
+			bridge := makeBridgeName(p.Context.Namespace, destNs)
 
 			// only retain @relabel stores when the bridges are being referenced
 			if _, ok := p.Context.GenerationContext.ReferencedBridges[bridge]; ok {
@@ -155,10 +155,10 @@ func (p *shareLogsState) Process(input fluentd.Fragment) (fluentd.Fragment, erro
 			return nil
 		}
 
-		bridge := makeBridgeName(sourceNs, p.Context.Namepsace)
+		bridge := makeBridgeName(sourceNs, p.Context.Namespace)
 		d.Tag = bridge
 
-		fragment, err := makeRewriteTagFragment(sourceNs, p.Context.Namepsace)
+		fragment, err := makeRewriteTagFragment(sourceNs, p.Context.Namespace)
 		if err != nil {
 			// or just panic??
 			return err
@@ -182,7 +182,7 @@ func (p *shareLogsState) GetValidationTrailer(directives fluentd.Fragment) fluen
 	res := fluentd.Fragment{}
 
 	for k := range p.Context.GenerationContext.ReferencedBridges {
-		if strings.HasPrefix(k, fmt.Sprintf("@bridge-%s__", p.Context.Namepsace)) {
+		if strings.HasPrefix(k, fmt.Sprintf("@bridge-%s__", p.Context.Namespace)) {
 			dir := &fluentd.Directive{
 				Name: "label",
 				Tag:  k,
diff --git a/config-reloader/processors/share_test.go b/config-reloader/processors/share_test.go
@@ -88,7 +88,7 @@ func TestProcessShareDirectiveFromReceivingNs(t *testing.T) {
 	}
 
 	ctx := &ProcessorContext{
-		Namepsace:         "dest-ns",
+		Namespace:         "dest-ns",
 		GenerationContext: gen,
 	}
 
@@ -134,7 +134,7 @@ func TestProcessShareDirectiveFromPublishigNs(t *testing.T) {
 	}
 
 	ctx := &ProcessorContext{
-		Namepsace:         "source-ns",
+		Namespace:         "source-ns",
 		GenerationContext: gen,
 	}
 
@@ -174,7 +174,7 @@ func TestProcessShareDirectiveCollectBridges(t *testing.T) {
 	}
 
 	ctx := &ProcessorContext{
-		Namepsace:         "dest-ns",
+		Namespace:         "dest-ns",
 		GenerationContext: gen,
 	}
 
diff --git a/config-reloader/processors/thisns.go b/config-reloader/processors/thisns.go
@@ -20,7 +20,7 @@ type expandThisnsMacroState struct {
 
 func (p *expandThisnsMacroState) Process(input fluentd.Fragment) (fluentd.Fragment, error) {
 	f := func(d *fluentd.Directive, ctx *ProcessorContext) error {
-		namespace := ctx.Namepsace
+		namespace := ctx.Namespace
 
 		if d.Name != "match" &&
 			d.Name != "filter" {
diff --git a/config-reloader/processors/thisns_test.go b/config-reloader/processors/thisns_test.go
@@ -54,7 +54,7 @@ func TestThisnsExpandOk(t *testing.T) {
 	fmt.Printf("Original:\n%s", fragment)
 
 	ctx := &ProcessorContext{
-		Namepsace:         "monitoring",
+		Namespace:         "monitoring",
 		GenerationContext: &GenerationContext{},
 	}
 	fragment, err = Process(fragment, ctx, &expandThisnsMacroState{})
@@ -76,7 +76,7 @@ func TestThisnsExpandOk(t *testing.T) {
 func TestThisnsExpandBadConfig(t *testing.T) {
 
 	ctx := &ProcessorContext{
-		Namepsace: "monitoring",
+		Namespace: "monitoring",
 	}
 
 	list := []string{
diff --git a/config-reloader/processors/unique_rewrite_tag.go b/config-reloader/processors/unique_rewrite_tag.go
diff --git a/config-reloader/processors/unique_rewrite_tag_test.go b/config-reloader/processors/unique_rewrite_tag_test.go

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ type fixDestinations struct {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`func makeSafeBufferPath(ctx *ProcessorContext, origBufPath string) string {`
`23`		`- return fmt.Sprintf("/var/log/kfo-%s-%s-%s.buf", util.MakeFluentdSafeName(ctx.DeploymentID), ctx.Namepsace, util.Hash("", origBufPath))`
	`23`	`+ return fmt.Sprintf("/var/log/kfo-%s-%s-%s.buf", util.MakeFluentdSafeName(ctx.DeploymentID), ctx.Namespace, util.Hash("", origBufPath))`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`func prohibitSources(d fluentd.Directive, ctx ProcessorContext) error {`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ func TestDestinationsRewriteBufferPath(t *testing.T) {`
`49`	`49`	`fmt.Printf("Original:\n%s", fragment)`
`50`	`50`
`51`	`51`	`ctx := &ProcessorContext{`
`52`		`- Namepsace: "monitoring",`
	`52`	`+ Namespace: "monitoring",`
`53`	`53`	`}`
`54`	`54`	`fragment, err = Process(fragment, ctx, &fixDestinations{})`
`55`	`55`	`assert.Nil(t, err)`
`@@ -67,7 +67,7 @@ func TestDestinationsRewriteBufferPath(t *testing.T) {`
`67`	`67`
`68`	`68`	`func TestExpandBadConfig(t *testing.T) {`
`69`	`69`	`ctx := &ProcessorContext{`
`70`		`- Namepsace: "monitoring",`
	`70`	`+ Namespace: "monitoring",`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`list := []string{`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ func TestExpandPlugins(t *testing.T) {`
`84`	`84`
`85`	`85`	`ctx := &ProcessorContext{`
`86`	`86`	`GenerationContext: g,`
`87`		`- Namepsace: "unit-test",`
	`87`	`+ Namespace: "unit-test",`
`88`	`88`	`DeploymentID: "whatever",`
`89`	`89`	`}`
`90`	`90`
`@@ -146,7 +146,7 @@ func TestNothingToExpand(t *testing.T) {`
`146`	`146`
`147`	`147`	`ctx := &ProcessorContext{`
`148`	`148`	`GenerationContext: g,`
`149`		`- Namepsace: "unit-test",`
	`149`	`+ Namespace: "unit-test",`
`150`	`150`	`DeploymentID: "whatever",`
`151`	`151`	`}`
`152`	`152`
`@@ -228,7 +228,7 @@ func TestExpandPluginsInCopyStore(t *testing.T) {`
`228`	`228`
`229`	`229`	`ctx := &ProcessorContext{`
`230`	`230`	`GenerationContext: g,`
`231`		`- Namepsace: "unit-test",`
	`231`	`+ Namespace: "unit-test",`
`232`	`232`	`DeploymentID: "whatever",`
`233`	`233`	`}`
`234`	`234`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ func (p *expandLabelsMacroState) Process(input fluentd.Fragment) (fluentd.Fragme`
`199`	`199`	`return nil`
`200`	`200`	`}`
`201`	`201`
`202`		`- d.Tag = makeTagFromFilter(ctx.Namepsace, sortedLabelNames, labelNames)`
	`202`	`+ d.Tag = makeTagFromFilter(ctx.Namespace, sortedLabelNames, labelNames)`
`203`	`203`	`ctx.GenerationContext.augmentTag(d)`
`204`	`204`	`return nil`
`205`	`205`	`}`
`@@ -210,7 +210,7 @@ func (p *expandLabelsMacroState) Process(input fluentd.Fragment) (fluentd.Fragme`
`210`	`210`	`Pattern string`
`211`	`211`	`Labels []string`
`212`	`212`	`}{`
`213`		`- fmt.Sprintf("kube.%s..", p.Context.Namepsace),`
	`213`	`+ fmt.Sprintf("kube.%s..", p.Context.Namespace),`
`214`	`214`	`sortedLabelNames,`
`215`	`215`	`}`
`216`	`216`	`writer := &bytes.Buffer{}`