fix tests

Author: iljarotar

doc/index.html

@@ -11529,13 +11529,6 @@ <h3 id="metalstack.api.v2.Switch">Switch</h3>
                   <td><p>Partition the switch belongs to. </p></td>
                 </tr>
 
-                <tr>
-                  <td>type</td>
-                  <td><a href="#metalstack.api.v2.SwitchType">SwitchType</a></td>
-                  <td></td>
-                  <td><p>Type is the role of the switch. </p></td>
-                </tr>
-              
                 <tr>
                   <td>replace_mode</td>
                   <td><a href="#metalstack.api.v2.SwitchReplaceMode">SwitchReplaceMode</a></td>
@@ -11585,6 +11578,13 @@ <h3 id="metalstack.api.v2.Switch">Switch</h3>
                   <td><p>MachineConnections map machines to the nics they are connected to. </p></td>
                 </tr>
 
+                <tr>
+                  <td>type</td>
+                  <td><a href="#metalstack.api.v2.SwitchType">SwitchType</a></td>
+                  <td></td>
+                  <td><p>Type is the role of the switch. </p></td>
+                </tr>
+              
             </tbody>
           </table>
 

go/metalstack/api/v2/switch.pb.go

@@ -27,7 +27,7 @@ func validateProtos(t *testing.T, tests prototests) {
 				t.Errorf("validate error = %v, wantErr %v", err, tt.wantErr)
 			}
 			if err != nil && tt.wantErr {
-				if diff := cmp.Diff(err.Error(), tt.wantErrorMessage); diff != "" {
+				if diff := cmp.Diff(tt.wantErrorMessage, err.Error()); diff != "" {
 					t.Errorf("validate error = %v, diff %v", err, diff)
 				}
 			}

go/tests/validation/common.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 TestValidateMACAddress(t *testing.T) {
-	validator, err := protovalidate.New()
-	require.NoError(t, err)
-
 	tests := prototests{
 		{
 			name: "Valid MAC address",
@@ -30,7 +25,7 @@ func TestValidateMACAddress(t *testing.T) {
 				Identifier: "Eth1/1",
 			},
 			wantErr:          true,
-			wantErrorMessage: "validation error:\n - mac: value does not match regex pattern `^([0-9A-Fa-f]{2}[:]){5}([0-9A-Fa-f]{2})$` [string.pattern]",
+			wantErrorMessage: "validation error: mac: this string must be a valid macaddress",
 		},
 		{
 			name: "Too short",
@@ -40,7 +35,7 @@ func TestValidateMACAddress(t *testing.T) {
 				Identifier: "Eth1/1",
 			},
 			wantErr:          true,
-			wantErrorMessage: "validation error:\n - mac: value does not match regex pattern `^([0-9A-Fa-f]{2}[:]){5}([0-9A-Fa-f]{2})$` [string.pattern]",
+			wantErrorMessage: "validation error: mac: this string must be a valid macaddress",
 		},
 		{
 			name: "Invalid separator",
@@ -50,7 +45,7 @@ func TestValidateMACAddress(t *testing.T) {
 				Identifier: "Eth1/1",
 			},
 			wantErr:          true,
-			wantErrorMessage: "validation error:\n - mac: value does not match regex pattern `^([0-9A-Fa-f]{2}[:]){5}([0-9A-Fa-f]{2})$` [string.pattern]",
+			wantErrorMessage: "validation error: mac: this string must be a valid macaddress",
 		},
 		{
 			name: "Invalid character",
@@ -60,7 +55,7 @@ func TestValidateMACAddress(t *testing.T) {
 				Identifier: "Eth1/1",
 			},
 			wantErr:          true,
-			wantErrorMessage: "validation error:\n - mac: value does not match regex pattern `^([0-9A-Fa-f]{2}[:]){5}([0-9A-Fa-f]{2})$` [string.pattern]",
+			wantErrorMessage: "validation error: mac: this string must be a valid macaddress",
 		},
 		{
 			name: "Uppercase and lowercase allowed",
@@ -70,9 +65,9 @@ func TestValidateMACAddress(t *testing.T) {
 				Identifier: "Eth1/1",
 			},
 			wantErr:          true,
-			wantErrorMessage: "validation error:\n - mac: value does not match regex pattern `^([0-9A-Fa-f]{2}[:]){5}([0-9A-Fa-f]{2})$` [string.pattern]",
+			wantErrorMessage: "validation error: mac: this string must be a valid macaddress",
 		},
 	}
 
-	validateProtos(t, tests, validator)
+	validateProtos(t, tests)
 }

go/tests/validation/switch_test.go

@@ -25,28 +25,28 @@ message Switch {
   optional string rack = 4 [(buf.validate.field).string.(metalstack.api.v2.is_name) = true];
   // Partition the switch belongs to.
   string partition = 5 [(buf.validate.field).string.(metalstack.api.v2.is_partition) = true];
-  // Type is the role of the switch.
-  SwitchType type = 6 [(buf.validate.field).enum.defined_only = true];
   // ReplaceMode is used to mark a switch ready for replacement.
-  SwitchReplaceMode replace_mode = 7 [(buf.validate.field).enum.defined_only = true];
+  SwitchReplaceMode replace_mode = 6 [(buf.validate.field).enum.defined_only = true];
   // ManagementIp is the switch's IP for management access.
-  string management_ip = 8 [(buf.validate.field).string.ip = true];
+  string management_ip = 7 [(buf.validate.field).string.ip = true];
   // ManagementUser is the user name to use for management access.
-  optional string management_user = 9 [(buf.validate.field).string = {
+  optional string management_user = 8 [(buf.validate.field).string = {
     min_len: 2
     max_len: 128
   }];
   // ConsoleCommand is the command for accessing the switch's console.
-  optional string console_command = 10 [(buf.validate.field).string = {
+  optional string console_command = 9 [(buf.validate.field).string = {
     min_len: 2
     max_len: 128
   }];
   // Nics are the front panel ports of the switch.
-  repeated SwitchNic nics = 11;
+  repeated SwitchNic nics = 10;
   // SwitchOs is the OS running on the switch.
-  SwitchOS os = 12;
+  SwitchOS os = 11;
   // MachineConnections map machines to the nics they are connected to.
-  repeated MachineConnection machine_connections = 13;
+  repeated MachineConnection machine_connections = 12;
+  // Type is the role of the switch.
+  SwitchType type = 13 [(buf.validate.field).enum.defined_only = true];
 }
 
 // SwitchOS holds information about the NOS and versions running on the switch.