Fix validation isssues found in apiserver (#59)

Author: majst01

doc/index.html

@@ -10414,14 +10414,14 @@ <h3 id="metalstack.api.v2.Switch">Switch</h3>
                 <tr>
                   <td>management_user</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
+                  <td>optional</td>
                   <td><p>ManagementUser is the user name to use for management access. </p></td>
                 </tr>
 
                 <tr>
                   <td>console_command</td>
                   <td><a href="#string">string</a></td>
-                  <td></td>
+                  <td>optional</td>
                   <td><p>ConsoleCommand is the command for accessing the switch&#39;s console. </p></td>
                 </tr>
 
@@ -12972,7 +12972,8 @@ <h3 id="metalstack.api.v2.TokenServiceUpdateRequest">TokenServiceUpdateRequest</
                   <td>update_meta</td>
                   <td><a href="#metalstack.api.v2.UpdateMeta">UpdateMeta</a></td>
                   <td></td>
-                  <td><p>UpdateMeta contains the timestamp and strategy to be used in this update request </p></td>
+                  <td><p>UpdateMeta contains the timestamp and strategy to be used in this update request
+TokenUpdate is not guarded with optlock in the backend </p></td>
                 </tr>
 
                 <tr>

go.mod

@@ -25,8 +25,8 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/stoewer/go-strcase v1.3.1 // indirect
 	github.com/stretchr/objx v0.5.3 // indirect
-	golang.org/x/exp v0.0.0-20251002181428-27f1f14c8bb9 // indirect
-	golang.org/x/text v0.29.0 // indirect
+	golang.org/x/exp v0.0.0-20251009144603-d2f985daa21b // indirect
+	golang.org/x/text v0.30.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20251007200510-49b9836ed3ff // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20251007200510-49b9836ed3ff // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect

go.sum

@@ -50,10 +50,10 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-golang.org/x/exp v0.0.0-20251002181428-27f1f14c8bb9 h1:TQwNpfvNkxAVlItJf6Cr5JTsVZoC/Sj7K3OZv2Pc14A=
-golang.org/x/exp v0.0.0-20251002181428-27f1f14c8bb9/go.mod h1:TwQYMMnGpvZyc+JpB/UAuTNIsVJifOlSkrZkhcvpVUk=
-golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
-golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
+golang.org/x/exp v0.0.0-20251009144603-d2f985daa21b h1:18qgiDvlvH7kk8Ioa8Ov+K6xCi0GMvmGfGW0sgd/SYA=
+golang.org/x/exp v0.0.0-20251009144603-d2f985daa21b/go.mod h1:j/pmGrbnkbPtQfxEe5D0VQhZC6qKbfKifgD0oM7sR70=
+golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
+golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
 google.golang.org/genproto/googleapis/api v0.0.0-20251007200510-49b9836ed3ff h1:8Zg5TdmcbU8A7CXGjGXF1Slqu/nIFCRaR3S5gT2plIA=
 google.golang.org/genproto/googleapis/api v0.0.0-20251007200510-49b9836ed3ff/go.mod h1:dbWfpVPvW/RqafStmRWBUpMN14puDezDMHxNYiRfQu0=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20251007200510-49b9836ed3ff h1:A90eA31Wq6HOMIQlLfzFwzqGKBTuaVztYu/g8sn+8Zc=

go/metalstack/api/v2/filesystem.pb.go

@@ -47,8 +47,8 @@ func TestValidateSwitch(t *testing.T) {
 				Id:             "leaf01",
 				Partition:      "p1",
 				ManagementIp:   "1.2.3.4",
-				ManagementUser: "admin",
-				ConsoleCommand: "ssh",
+				ManagementUser: proto.String("admin"),
+				ConsoleCommand: proto.String("ssh"),
 			},
 			wantErr: false,
 		},
@@ -58,8 +58,8 @@ func TestValidateSwitch(t *testing.T) {
 				Id:             "_1",
 				Partition:      "p1",
 				ManagementIp:   "1.2.3.4",
-				ManagementUser: "admin",
-				ConsoleCommand: "ssh",
+				ManagementUser: proto.String("admin"),
+				ConsoleCommand: proto.String("ssh"),
 			},
 			wantErr: true,
 			wantErrorMessage: `validation error:

go/metalstack/api/v2/ip.pb.go

@@ -13,9 +13,9 @@ func TestValidateToken(t *testing.T) {
 			msg: &apiv2.TokenServiceCreateRequest{
 				Description: "A Token",
 				ProjectRoles: map[string]apiv2.ProjectRole{
-					"p12": apiv2.ProjectRole_PROJECT_ROLE_EDITOR,
-					"p22": apiv2.ProjectRole_PROJECT_ROLE_VIEWER,
-					"p32": apiv2.ProjectRole_PROJECT_ROLE_OWNER,
+					"00000000-0000-0000-0000-000000000000": apiv2.ProjectRole_PROJECT_ROLE_EDITOR,
+					"00000000-0000-0000-0000-000000000001": apiv2.ProjectRole_PROJECT_ROLE_VIEWER,
+					"00000000-0000-0000-0000-000000000002": apiv2.ProjectRole_PROJECT_ROLE_OWNER,
 				},
 				TenantRoles: map[string]apiv2.TenantRole{
 					"t12": apiv2.TenantRole_TENANT_ROLE_EDITOR,
@@ -33,8 +33,21 @@ func TestValidateToken(t *testing.T) {
 			},
 			wantErr: true,
 			wantErrorMessage: `validation error:
+ - project_roles["p42"]: value must be a valid UUID [string.uuid]
  - project_roles["p42"]: value must be one of the defined enum values [enum.defined_only]`,
 		},
+		{
+			name: "InValid Token Create Request",
+			msg: &apiv2.TokenServiceCreateRequest{
+				Description: "B Token",
+				ProjectRoles: map[string]apiv2.ProjectRole{
+					"00000000-0000-0000-0000-000000000000": 5,
+				},
+			},
+			wantErr: true,
+			wantErrorMessage: `validation error:
+ - project_roles["00000000-0000-0000-0000-000000000000"]: value must be one of the defined enum values [enum.defined_only]`,
+		},
 	}
 
 	validateProtos(t, tests)