Simplify default config code.

This commit is contained in:
jregan
2018-09-28 10:17:14 -07:00
parent 986c7cc31b
commit f35e16bd8d
8 changed files with 27 additions and 51 deletions

View File

@@ -414,12 +414,9 @@ func TestLabelsRun(t *testing.T) {
},
}),
}
tcfg, err := transformerconfig.MakeDefaultTransformerConfig()
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
lt, err := NewLabelsMapTransformer(map[string]string{"label-key1": "label-value1", "label-key2": "label-value2"}, tcfg.CommonLabels)
lt, err := NewLabelsMapTransformer(
map[string]string{"label-key1": "label-value1", "label-key2": "label-value2"},
transformerconfig.MakeDefaultTransformerConfig().CommonLabels)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
@@ -554,11 +551,9 @@ func TestAnnotationsRun(t *testing.T) {
},
}),
}
tcfg, err := transformerconfig.MakeDefaultTransformerConfig()
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
at, err := NewAnnotationsMapTransformer(map[string]string{"anno-key1": "anno-value1", "anno-key2": "anno-value2"}, tcfg.CommonAnnotations)
at, err := NewAnnotationsMapTransformer(
map[string]string{"anno-key1": "anno-value1", "anno-key2": "anno-value2"},
transformerconfig.MakeDefaultTransformerConfig().CommonAnnotations)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}

View File

@@ -322,12 +322,7 @@ func TestNameReferenceRun(t *testing.T) {
},
},
)
tcfg, err := transformerconfig.MakeDefaultTransformerConfig()
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
nrt, err := NewNameReferenceTransformer(tcfg.NameReference)
nrt, err := NewNameReferenceTransformer(transformerconfig.MakeDefaultTransformerConfig().NameReference)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}

View File

@@ -184,12 +184,8 @@ func TestNamespaceRun(t *testing.T) {
}),
}
tcfg, err := transformerconfig.MakeDefaultTransformerConfig()
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
nst := NewNamespaceTransformer("test", tcfg.NameSpace)
err = nst.Transform(m)
nst := NewNamespaceTransformer("test", transformerconfig.MakeDefaultTransformerConfig().NameSpace)
err := nst.Transform(m)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}

View File

@@ -79,11 +79,8 @@ func TestPrefixNameRun(t *testing.T) {
}),
}
tcfg, err := transformerconfig.MakeDefaultTransformerConfig()
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
npt, err := NewNamePrefixTransformer("someprefix-", tcfg.NamePrefix)
npt, err := NewNamePrefixTransformer(
"someprefix-", transformerconfig.MakeDefaultTransformerConfig().NamePrefix)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}