From e2e495027daf15d6a689159461120201974aef6f Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Tue, 9 Mar 2021 09:52:45 +0100 Subject: [PATCH] Take provenance version into account for build test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The result of the test will be different depending on how it has being build via `-ldflags=-X sigs.k8s.io/kustomize/api/provenance.version=…`. We now additionally query this version within the test to make it more robust. Signed-off-by: Sascha Grunert --- kustomize/commands/build/build_test.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/kustomize/commands/build/build_test.go b/kustomize/commands/build/build_test.go index e7f5cf8fb..43d6149b0 100644 --- a/kustomize/commands/build/build_test.go +++ b/kustomize/commands/build/build_test.go @@ -5,11 +5,13 @@ package build_test import ( "bytes" + "fmt" "strings" "testing" "sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/konfig" + "sigs.k8s.io/kustomize/api/provenance" . "sigs.k8s.io/kustomize/kustomize/v4/commands/build" ) @@ -157,16 +159,17 @@ func TestBuildWithShardedOutput(t *testing.T) { "someDir/v1_namespace_ns1.yaml"); err != nil { t.Fatal(err) } - expected := `apiVersion: v1 + version := provenance.GetProvenance().Version + expected := fmt.Sprintf(`apiVersion: v1 kind: Namespace metadata: annotations: note: This is a test annotation labels: app: nginx - app.kubernetes.io/managed-by: kustomize-unknown + app.kubernetes.io/managed-by: kustomize-%s name: ns1 -` +`, version) if string(data) != expected { t.Fatalf("Expected:\n%s\nBut got:\n%s\n", expected, string(data)) } @@ -174,7 +177,7 @@ metadata: "someDir/v1_secret_foo-secret-bar-82c2g5f8f6.yaml"); err != nil { t.Fatal(err) } - expected = `apiVersion: v1 + expected = fmt.Sprintf(`apiVersion: v1 data: DB_PASSWORD: c29tZXB3 DB_USERNAME: YWRtaW4= @@ -184,11 +187,11 @@ metadata: note: This is a test annotation labels: app: nginx - app.kubernetes.io/managed-by: kustomize-unknown + app.kubernetes.io/managed-by: kustomize-%s name: foo-secret-bar-82c2g5f8f6 namespace: ns1 type: Opaque -` +`, version) if string(data) != expected { t.Fatalf("Expected:\n%s\nBut got:\n%s\n", expected, string(data)) }