Fix creating system admin rolebinding with no resource is not allowed (…

…#246)
finleap-connect · Sep 21, 2022 · 77314fc · 77314fc
1 parent 16b0397
commit 77314fc
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 26 deletions.
diff --git a/api/domain/commanddata/user.proto b/api/domain/commanddata/user.proto
@@ -47,7 +47,7 @@ message CreateUserRoleBindingCommandData {
   // Unique identifier of the affected resource within scope (UUID 128-bit
   // number)
   google.protobuf.StringValue resource = 4
-      [ (validate.rules).string.uuid = true ];
+      [ (validate.rules).string = {ignore_empty: true, uuid: true} ];
 }
 
 // Command data to update a user

diff --git a/go.mk b/go.mk
@@ -103,6 +103,9 @@ endif
 ifeq ($(PROTO_ARCH),arm64)
 PROTO_ARCH = aarch_64
 endif
+ifeq ($(PROTO_ARCH),amd64)
+PROTO_ARCH = x86_64
+endif
 PROTO_ARCH_OS := $(PROTO_OS)-$(PROTO_ARCH)
 
 ## Tool Config

diff --git a/pkg/api/domain/commanddata/user.pb.go b/pkg/api/domain/commanddata/user.pb.go
diff --git a/pkg/api/domain/commanddata/user.pb.validate.go b/pkg/api/domain/commanddata/user.pb.validate.go
diff --git a/pkg/grpc/middleware/validator/user_test.go b/pkg/grpc/middleware/validator/user_test.go
@@ -72,6 +72,12 @@ var _ = Describe("Test validation rules for user messages", func() {
 			Expect(err).NotTo(HaveOccurred())
 		})
 
+		It("should allow empty resource id for cases like system admin", func() {
+			cd.Resource = wrapperspb.String("")
+			err := cd.Validate()
+			Expect(err).NotTo(HaveOccurred())
+		})
+
 		It("should check for a valid UserId", func() {
 			cd.UserId = invalidUUID
 			ValidateErrorExpected()