fix: definition how to work with role bindings

tagesspiegel · Nov 15, 2023 · f58b7cb · f58b7cb
1 parent 14cbd28
commit f58b7cb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/internal/controller/roles.go b/internal/controller/roles.go
@@ -30,18 +30,18 @@ const (
 //
 // Example:
 //
-//	rules, err := ParseRoleBindingSubjects("kind=ServiceAccount,name=foo,namespace=bar;kind=ServiceAccount,name=foo2,namespace=bar2")
+//	rules, err := ParseRoleBindingSubjects("kind=ServiceAccount;name=foo;namespace=bar,kind=ServiceAccount;name=foo2;namespace=bar2")
 //	if err != nil {
 //		// handle error
 //	}
 //	fmt.Println(rules) // [{Kind:ServiceAccount Name:foo Namespace:bar} {Kind:ServiceAccount Name:foo2 Namespace:bar2}]
 func ParseRoleBindingSubjects(rulesStr string) ([]rbacv1.Subject, error) {
 	var subjects []rbacv1.Subject
-	rules := strc.Properties(rulesStr)
+	rules := strc.Array(rulesStr)
 	for roleIndex, rule := range rules {
 		subject := rbacv1.Subject{}
-		parseByComma := strc.Array(rule)
-		for keyIndex, item := range parseByComma {
+		properties := strc.Properties(rule)
+		for keyIndex, item := range properties {
 			key, value, err := strc.KeyValue(item)
 			if err != nil {
 				return nil, err

diff --git a/internal/controller/roles_test.go b/internal/controller/roles_test.go
@@ -20,7 +20,7 @@ func TestParseRoleBindingSubjects(t *testing.T) {
 		{
 			name: "simple",
 			args: args{
-				rulesStr: "kind=ServiceAccount,name=foo,namespace=bar",
+				rulesStr: "kind=ServiceAccount;name=foo;namespace=bar",
 			},
 			want: []rbacv1.Subject{
 				{
@@ -34,7 +34,7 @@ func TestParseRoleBindingSubjects(t *testing.T) {
 		{
 			name: "simple with apiGroup",
 			args: args{
-				rulesStr: "kind=Role,name=foo,namespace=bar,apiGroup=rbac.authorization.k8s.io",
+				rulesStr: "kind=Role;name=foo;namespace=bar;apiGroup=rbac.authorization.k8s.io",
 			},
 			want: []rbacv1.Subject{
 				{
@@ -49,7 +49,7 @@ func TestParseRoleBindingSubjects(t *testing.T) {
 		{
 			name: "multiple",
 			args: args{
-				rulesStr: "kind=ServiceAccount,name=foo,namespace=bar;kind=ServiceAccount,name=foo2,namespace=bar2",
+				rulesStr: "kind=ServiceAccount;name=foo;namespace=bar,kind=ServiceAccount;name=foo2;namespace=bar2",
 			},
 			want: []rbacv1.Subject{
 				{
@@ -68,7 +68,7 @@ func TestParseRoleBindingSubjects(t *testing.T) {
 		{
 			name: "multiple with apiGroup",
 			args: args{
-				rulesStr: "kind=Role,apiGroup=rbac.authorization.k8s.io,name=foo,namespace=bar;kind=ServiceAccount,name=foo2,namespace=bar2",
+				rulesStr: "kind=Role;apiGroup=rbac.authorization.k8s.io;name=foo;namespace=bar,kind=ServiceAccount;name=foo2;namespace=bar2",
 			},
 			want: []rbacv1.Subject{
 				{
@@ -88,15 +88,15 @@ func TestParseRoleBindingSubjects(t *testing.T) {
 		{
 			name: "invalid key",
 			args: args{
-				rulesStr: "kind=ServiceAccount,name=foo,namespace=bar;kind=ServiceAccount,name=foo2,namespace=bar2;kind=ServiceAccount,name=foo3,namespace=bar3,invalid=foo",
+				rulesStr: "kind=ServiceAccount;name=foo;namespace=bar,kind=ServiceAccount;name=foo2;namespace=bar2,kind=ServiceAccount;name=foo3;namespace=bar3;invalid=foo",
 			},
 			want:    nil,
 			wantErr: true,
 		},
 		{
 			name: "invalid amount of entries",
 			args: args{
-				rulesStr: "kind=ServiceAccount=ServiceAccount,name=foo,namespace=bar;kind=ServiceAccount,name=foo2,namespace=bar2;kind=ServiceAccount,name=foo3,namespace=bar3,invalid=foo",
+				rulesStr: "kind=ServiceAccount=ServiceAccount;name=foo;namespace=bar,kind=ServiceAccount;name=foo2;namespace=bar2,kind=ServiceAccount;name=foo3;namespace=bar3;invalid=foo",
 			},
 			want:    nil,
 			wantErr: true,