fix tests

yannh · Dec 24, 2023 · 74a4e7e · 74a4e7e
1 parent a182e2a
commit 74a4e7e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/acceptance.bats b/acceptance.bats
@@ -182,8 +182,8 @@ resetCacheFolder() {
 
 @test "Fail early when passing a non valid -kubernetes-version" {
   run bin/kubeconform -kubernetes-version 1.25 fixtures/valid.yaml
-  [[ "$output" == "invalid value "1.25" for flag -kubernetes-version: 1.25 is not a valid version. Valid values are 'master' (default) or full version x.y.z (e.g. '1.27.2')"* ]]
-  [[ `echo "$output" | wc -l` -eq 1 ]]
+  [ "${lines[0]}" == 'invalid value "1.25" for flag -kubernetes-version: 1.25 is not a valid version. Valid values are "master" (default) or full version x.y.z (e.g. "1.27.2")' ]
+  [[ "${lines[1]}" == "Usage:"* ]]
   [ "$status" -eq 1 ]
 }
 

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -52,7 +52,7 @@ func (kv k8sVersionValue) MarshalText() ([]byte, error) {
 
 func (kv *k8sVersionValue) UnmarshalText(v []byte) error {
 	if ok, _ := regexp.MatchString(`^(master|\d+\.\d+\.\d+)$`, string(v)); ok != true {
-		return fmt.Errorf("%v is not a valid version. Valid values are 'master' (default) or full version x.y.z (e.g. '1.27.2')", kv.String())
+		return fmt.Errorf("%v is not a valid version. Valid values are \"master\" (default) or full version x.y.z (e.g. \"1.27.2\")", string(v))
 	}
 	*kv = k8sVersionValue(v)
 	return nil