Simplify validation tests (#56)

majst01 · web-flow · commit 7afe27d5922c · 2025-10-13T09:04:09.000+02:00
diff --git a/go/tests/validation/common.go b/go/tests/validation/common.go
@@ -19,10 +19,10 @@ type (
 	prototests []prototest
 )
 
-func validateProtos(t *testing.T, tests prototests, validator protovalidate.Validator) {
+func validateProtos(t *testing.T, tests prototests) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			err := validator.Validate(tt.msg)
+			err := protovalidate.Validate(tt.msg)
 			if err != nil && !tt.wantErr {
 				t.Errorf("validate error = %v, wantErr %v", err, tt.wantErr)
 			}
diff --git a/go/tests/validation/filesystem_test.go b/go/tests/validation/filesystem_test.go
@@ -3,17 +3,13 @@ package validation
 import (
 	"testing"
 
-	"buf.build/go/protovalidate"
 	"github.com/metal-stack/api/go/enum"
 	apiv2 "github.com/metal-stack/api/go/metalstack/api/v2"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/proto"
 )
 
 func TestValidateFilesystem(t *testing.T) {
-	validator, err := protovalidate.New()
-	require.NoError(t, err)
-
 	tests := prototests{
 		{
 			name: "Valid Filesystem minimal config",
@@ -71,7 +67,7 @@ func TestValidateFilesystem(t *testing.T) {
  - name: must be within 2 and 128 characters [string.is_name]`},
 	}
 
-	validateProtos(t, tests, validator)
+	validateProtos(t, tests)
 }
 
 func TestGetStringValue(t *testing.T) {
diff --git a/go/tests/validation/firewall-rule_test.go b/go/tests/validation/firewall-rule_test.go
@@ -3,15 +3,10 @@ package validation
 import (
 	"testing"
 
-	"buf.build/go/protovalidate"
 	apiv2 "github.com/metal-stack/api/go/metalstack/api/v2"
-	"github.com/stretchr/testify/require"
 )
 
 func TestValidateFirewallRules(t *testing.T) {
-	validator, err := protovalidate.New()
-	require.NoError(t, err)
-
 	tests := prototests{
 		{
 			name: "Invalid Rule with valid comment",
@@ -40,5 +35,5 @@ func TestValidateFirewallRules(t *testing.T) {
 		},
 	}
 
-	validateProtos(t, tests, validator)
+	validateProtos(t, tests)
 }
diff --git a/go/tests/validation/image_test.go b/go/tests/validation/image_test.go
@@ -3,17 +3,12 @@ package validation
 import (
 	"testing"
 
-	"buf.build/go/protovalidate"
 	adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2"
 	apiv2 "github.com/metal-stack/api/go/metalstack/api/v2"
-	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/proto"
 )
 
 func TestValidateImage(t *testing.T) {
-	validator, err := protovalidate.New()
-	require.NoError(t, err)
-
 	tests := prototests{
 		{
 			name: "Valid Image minimal config",
@@ -86,5 +81,5 @@ func TestValidateImage(t *testing.T) {
 		},
 	}
 
-	validateProtos(t, tests, validator)
+	validateProtos(t, tests)
 }
diff --git a/go/tests/validation/ip_test.go b/go/tests/validation/ip_test.go
@@ -3,16 +3,11 @@ package validation
 import (
 	"testing"
 
-	"buf.build/go/protovalidate"
 	apiv2 "github.com/metal-stack/api/go/metalstack/api/v2"
-	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/proto"
 )
 
 func TestValidateIP(t *testing.T) {
-	validator, err := protovalidate.New()
-	require.NoError(t, err)
-
 	tests := prototests{
 		{
 			name: "Invalid IP",
@@ -168,5 +163,5 @@ func TestValidateIP(t *testing.T) {
 		},
 	}
 
-	validateProtos(t, tests, validator)
+	validateProtos(t, tests)
 }
diff --git a/go/tests/validation/machine_test.go b/go/tests/validation/machine_test.go
@@ -3,15 +3,10 @@ package validation
 import (
 	"testing"
 
-	"buf.build/go/protovalidate"
 	apiv2 "github.com/metal-stack/api/go/metalstack/api/v2"
-	"github.com/stretchr/testify/require"
 )
 
 func TestValidateMachine(t *testing.T) {
-	validator, err := protovalidate.New()
-	require.NoError(t, err)
-
 	tests := prototests{
 		{
 			name: "MachineNicQuery with invalid MACs",
@@ -55,5 +50,5 @@ func TestValidateMachine(t *testing.T) {
  - ips: given ips must be valid [repeated.ips]`,
 		},
 	}
-	validateProtos(t, tests, validator)
+	validateProtos(t, tests)
 }
diff --git a/go/tests/validation/network_test.go b/go/tests/validation/network_test.go
@@ -3,17 +3,12 @@ package validation
 import (
 	"testing"
 
-	"buf.build/go/protovalidate"
 	adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2"
 	apiv2 "github.com/metal-stack/api/go/metalstack/api/v2"
-	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/proto"
 )
 
 func TestValidateNetwork(t *testing.T) {
-	validator, err := protovalidate.New()
-	require.NoError(t, err)
-
 	tests := prototests{
 		{
 			name: "Valid NetworkCreateRequest minimal config",
@@ -57,5 +52,5 @@ func TestValidateNetwork(t *testing.T) {
  - destination_prefixes: given prefixes must be valid [repeated.prefixes]`,
 		},
 	}
-	validateProtos(t, tests, validator)
+	validateProtos(t, tests)
 }
diff --git a/go/tests/validation/switch_test.go b/go/tests/validation/switch_test.go
@@ -3,16 +3,11 @@ package validation
 import (
 	"testing"
 
-	"buf.build/go/protovalidate"
 	apiv2 "github.com/metal-stack/api/go/metalstack/api/v2"
-	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/proto"
 )
 
 func TestValidateSwitch(t *testing.T) {
-	validator, err := protovalidate.New()
-	require.NoError(t, err)
-
 	tests := prototests{
 		{
 			name: "SwitchNic with invalid MAC",
@@ -71,5 +66,5 @@ func TestValidateSwitch(t *testing.T) {
  - id: value must be a valid hostname [string.hostname]`,
 		},
 	}
-	validateProtos(t, tests, validator)
+	validateProtos(t, tests)
 }
diff --git a/go/tests/validation/token_test.go b/go/tests/validation/token_test.go
@@ -3,15 +3,10 @@ package validation
 import (
 	"testing"
 
-	"buf.build/go/protovalidate"
 	apiv2 "github.com/metal-stack/api/go/metalstack/api/v2"
-	"github.com/stretchr/testify/require"
 )
 
 func TestValidateToken(t *testing.T) {
-	validator, err := protovalidate.New()
-	require.NoError(t, err)
-
 	tests := prototests{
 		{
 			name: "Valid Token Create Request",
@@ -42,5 +37,5 @@ func TestValidateToken(t *testing.T) {
 		},
 	}
 
-	validateProtos(t, tests, validator)
+	validateProtos(t, tests)
 }

Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,10 @@ type (`
`19`	`19`	`prototests []prototest`
`20`	`20`	`)`
`21`	`21`
`22`		`-func validateProtos(t *testing.T, tests prototests, validator protovalidate.Validator) {`
	`22`	`+func validateProtos(t *testing.T, tests prototests) {`
`23`	`23`	`for _, tt := range tests {`
`24`	`24`	`t.Run(tt.name, func(t *testing.T) {`
`25`		`- err := validator.Validate(tt.msg)`
	`25`	`+ err := protovalidate.Validate(tt.msg)`
`26`	`26`	`if err != nil && !tt.wantErr {`
`27`	`27`	`t.Errorf("validate error = %v, wantErr %v", err, tt.wantErr)`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,17 +3,13 @@ package validation`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`		`- "buf.build/go/protovalidate"`
`7`	`6`	`"github.com/metal-stack/api/go/enum"`
`8`	`7`	`apiv2 "github.com/metal-stack/api/go/metalstack/api/v2"`
`9`	`8`	`"github.com/stretchr/testify/require"`
`10`	`9`	`"google.golang.org/protobuf/proto"`
`11`	`10`	`)`
`12`	`11`
`13`	`12`	`func TestValidateFilesystem(t *testing.T) {`
`14`		`- validator, err := protovalidate.New()`
`15`		`- require.NoError(t, err)`
`16`		`-`
`17`	`13`	`tests := prototests{`
`18`	`14`	`{`
`19`	`15`	`name: "Valid Filesystem minimal config",`
`@@ -71,7 +67,7 @@ func TestValidateFilesystem(t *testing.T) {`
`71`	`67`	- name: must be within 2 and 128 characters [string.is_name]`},
`72`	`68`	`}`
`73`	`69`
`74`		`- validateProtos(t, tests, validator)`
	`70`	`+ validateProtos(t, tests)`
`75`	`71`	`}`
`76`	`72`
`77`	`73`	`func TestGetStringValue(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -3,15 +3,10 @@ package validation`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`		`- "buf.build/go/protovalidate"`
`7`	`6`	`apiv2 "github.com/metal-stack/api/go/metalstack/api/v2"`
`8`		`- "github.com/stretchr/testify/require"`
`9`	`7`	`)`
`10`	`8`
`11`	`9`	`func TestValidateFirewallRules(t *testing.T) {`
`12`		`- validator, err := protovalidate.New()`
`13`		`- require.NoError(t, err)`
`14`		`-`
`15`	`10`	`tests := prototests{`
`16`	`11`	`{`
`17`	`12`	`name: "Invalid Rule with valid comment",`
`@@ -40,5 +35,5 @@ func TestValidateFirewallRules(t *testing.T) {`
`40`	`35`	`},`
`41`	`36`	`}`
`42`	`37`
`43`		`- validateProtos(t, tests, validator)`
	`38`	`+ validateProtos(t, tests)`
`44`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,17 +3,12 @@ package validation`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`		`- "buf.build/go/protovalidate"`
`7`	`6`	`adminv2 "github.com/metal-stack/api/go/metalstack/admin/v2"`
`8`	`7`	`apiv2 "github.com/metal-stack/api/go/metalstack/api/v2"`
`9`		`- "github.com/stretchr/testify/require"`
`10`	`8`	`"google.golang.org/protobuf/proto"`
`11`	`9`	`)`
`12`	`10`
`13`	`11`	`func TestValidateImage(t *testing.T) {`
`14`		`- validator, err := protovalidate.New()`
`15`		`- require.NoError(t, err)`
`16`		`-`
`17`	`12`	`tests := prototests{`
`18`	`13`	`{`
`19`	`14`	`name: "Valid Image minimal config",`
`@@ -86,5 +81,5 @@ func TestValidateImage(t *testing.T) {`
`86`	`81`	`},`
`87`	`82`	`}`
`88`	`83`
`89`		`- validateProtos(t, tests, validator)`
	`84`	`+ validateProtos(t, tests)`
`90`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,16 +3,11 @@ package validation`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`		`- "buf.build/go/protovalidate"`
`7`	`6`	`apiv2 "github.com/metal-stack/api/go/metalstack/api/v2"`
`8`		`- "github.com/stretchr/testify/require"`
`9`	`7`	`"google.golang.org/protobuf/proto"`
`10`	`8`	`)`
`11`	`9`
`12`	`10`	`func TestValidateIP(t *testing.T) {`
`13`		`- validator, err := protovalidate.New()`
`14`		`- require.NoError(t, err)`
`15`		`-`
`16`	`11`	`tests := prototests{`
`17`	`12`	`{`
`18`	`13`	`name: "Invalid IP",`
`@@ -168,5 +163,5 @@ func TestValidateIP(t *testing.T) {`
`168`	`163`	`},`
`169`	`164`	`}`
`170`	`165`
`171`		`- validateProtos(t, tests, validator)`
	`166`	`+ validateProtos(t, tests)`
`172`	`167`	`}`