Change the external secret validation message

A secret *must* be external, not *should*

Signed-off-by: Djordje Lukic <[email protected]>

Author: rumpl

e2e/testdata/init-invalid-output.golden

@@ -1,4 +1,4 @@
 Compose file validation failed:
 * can't use relative path as volume source ("./src:/src") in service "api"
 * can't use relative path as volume source ("./static:/opt/${static_subdir}") in service "web"
-* secret "my_secret" should be external
+* secret "my_secret" must be external

internal/validator/rules/externalsecrets.go

@@ -23,15 +23,15 @@ func (s *externalSecretsValidator) Validate(cfgMap interface{}) []error {
 	errs := []error{}
 	if value, ok := cfgMap.(map[string]interface{}); ok {
 		for secretName, secret := range value {
-			if v1, ok := secret.(map[string]interface{}); ok {
+			if secretMap, ok := secret.(map[string]interface{}); ok {
 				var hasExternal = false
-				for key := range v1 {
+				for key := range secretMap {
 					if key == "external" {
 						hasExternal = true
 					}
 				}
 				if !hasExternal {
-					errs = append(errs, errors.Errorf(`secret %q should be external`, secretName))
+					errs = append(errs, errors.Errorf(`secret %q must be external`, secretName))
 				}
 			}
 		}

internal/validator/rules/externalsecrets_test.go

@@ -35,7 +35,7 @@ func TestExternalSecrets(t *testing.T) {
 
 		errs := s.Validate(input)
 		assert.Equal(t, len(errs), 1)
-		assert.ErrorContains(t, errs[0], `secret "my_secret" should be external`)
+		assert.ErrorContains(t, errs[0], `secret "my_secret" must be external`)
 	})
 
 	t.Run("should return all errors", func(t *testing.T) {

internal/validator/rules/relativepath.go

@@ -39,7 +39,7 @@ func (s *relativePathRule) Validate(value interface{}) []error {
 		}
 		_, volumeExists := s.volumes[src.(string)]
 		if !filepath.IsAbs(src.(string)) && !volumeExists {
-			return []error{fmt.Errorf("1 can't use relative path as volume source (%q) in service %q", src, s.service)}
+			return []error{fmt.Errorf("can't use relative path as volume source (%q) in service %q", src, s.service)}
 		}
 	}
 

internal/validator/rules/relativepath_test.go

@@ -1,7 +1,6 @@
 package rules
 
 import (
-	"fmt"
 	"testing"
 
 	"gotest.tools/assert"
@@ -62,7 +61,6 @@ func TestRelativePathRule(t *testing.T) {
 			1,
 		}
 		errs := s.Validate(input)
-		fmt.Println(errs)
 		assert.Equal(t, len(errs), 1)
 
 		assert.ErrorContains(t, errs[0], `invalid volume in service "test"`)