Merge pull request #3708 from saschagrunert/test-version

Take provenance version into account for build test
This commit is contained in:
Jeff Regan
2021-03-15 13:16:29 -07:00
committed by GitHub

View File

@@ -5,11 +5,13 @@ package build_test
import ( import (
"bytes" "bytes"
"fmt"
"strings" "strings"
"testing" "testing"
"sigs.k8s.io/kustomize/api/filesys" "sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/api/konfig" "sigs.k8s.io/kustomize/api/konfig"
"sigs.k8s.io/kustomize/api/provenance"
. "sigs.k8s.io/kustomize/kustomize/v4/commands/build" . "sigs.k8s.io/kustomize/kustomize/v4/commands/build"
) )
@@ -157,16 +159,17 @@ func TestBuildWithShardedOutput(t *testing.T) {
"someDir/v1_namespace_ns1.yaml"); err != nil { "someDir/v1_namespace_ns1.yaml"); err != nil {
t.Fatal(err) t.Fatal(err)
} }
expected := `apiVersion: v1 version := provenance.GetProvenance().Version
expected := fmt.Sprintf(`apiVersion: v1
kind: Namespace kind: Namespace
metadata: metadata:
annotations: annotations:
note: This is a test annotation note: This is a test annotation
labels: labels:
app: nginx app: nginx
app.kubernetes.io/managed-by: kustomize-unknown app.kubernetes.io/managed-by: kustomize-%s
name: ns1 name: ns1
` `, version)
if string(data) != expected { if string(data) != expected {
t.Fatalf("Expected:\n%s\nBut got:\n%s\n", expected, string(data)) 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 { "someDir/v1_secret_foo-secret-bar-82c2g5f8f6.yaml"); err != nil {
t.Fatal(err) t.Fatal(err)
} }
expected = `apiVersion: v1 expected = fmt.Sprintf(`apiVersion: v1
data: data:
DB_PASSWORD: c29tZXB3 DB_PASSWORD: c29tZXB3
DB_USERNAME: YWRtaW4= DB_USERNAME: YWRtaW4=
@@ -184,11 +187,11 @@ metadata:
note: This is a test annotation note: This is a test annotation
labels: labels:
app: nginx app: nginx
app.kubernetes.io/managed-by: kustomize-unknown app.kubernetes.io/managed-by: kustomize-%s
name: foo-secret-bar-82c2g5f8f6 name: foo-secret-bar-82c2g5f8f6
namespace: ns1 namespace: ns1
type: Opaque type: Opaque
` `, version)
if string(data) != expected { if string(data) != expected {
t.Fatalf("Expected:\n%s\nBut got:\n%s\n", expected, string(data)) t.Fatalf("Expected:\n%s\nBut got:\n%s\n", expected, string(data))
} }