fix: Fix nil permissions as Strings()

Emyrk · Emyrk · commit fbf4db17a760 · 2022-03-31T11:11:32.000-05:00
diff --git a/coderd/authz/authztest/group.go b/coderd/authz/authztest/group.go
@@ -1,5 +1,6 @@
 package authztest
 
+// PermissionSet defines a set of permissions with the same impact.
 type PermissionSet string
 
 const (
diff --git a/coderd/authz/authztest/group_test.go b/coderd/authz/authztest/group_test.go
@@ -28,4 +28,10 @@ func Test_PermissionSetWPlusSearchSpace(t *testing.T) {
 	for k, v := range all {
 		fmt.Printf("%s=%d\n", string(k), len(v.All()))
 	}
+
+	var i int
+	wplus.Each(func(set Set) {
+		fmt.Printf("%d: %s\n", i, set.String())
+		i++
+	})
 }
diff --git a/coderd/authz/authztest/iterator.go b/coderd/authz/authztest/iterator.go
@@ -51,7 +51,7 @@ func (si *unionIterator) Next() bool {
 		si.offset = 0
 	}
 
-	return si.setIdx >= len(si.sets)
+	return si.setIdx < len(si.sets)
 }
 
 func (si *unionIterator) Permissions() Set {
diff --git a/coderd/authz/authztest/role.go b/coderd/authz/authztest/role.go
@@ -44,10 +44,6 @@ func (r *Role) Permissions() Set {
 	for _, ps := range r.PermissionSets {
 		i += copy(r.buffer[i:], ps.Permissions())
 	}
-	//all := make(Set, 0, r.ReturnSize)
-	//for _, set := range r.PermissionSets {
-	//	all = append(all, set.Permissions()...)
-	//}
 	return r.buffer
 }
 
diff --git a/coderd/authz/authztest/set.go b/coderd/authz/authztest/set.go
@@ -18,6 +18,9 @@ func (s Set) String() string {
 	var str strings.Builder
 	sep := ""
 	for _, v := range s {
+		if v == nil {
+			continue
+		}
 		str.WriteString(sep)
 		str.WriteString(v.String())
 		sep = ", "

Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,10 @@ func Test_PermissionSetWPlusSearchSpace(t *testing.T) {`
`28`	`28`	`for k, v := range all {`
`29`	`29`	`fmt.Printf("%s=%d\n", string(k), len(v.All()))`
`30`	`30`	`}`
	`31`	`+`
	`32`	`+ var i int`
	`33`	`+ wplus.Each(func(set Set) {`
	`34`	`+ fmt.Printf("%d: %s\n", i, set.String())`
	`35`	`+ i++`
	`36`	`+ })`
`31`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ func (si *unionIterator) Next() bool {`
`51`	`51`	`si.offset = 0`
`52`	`52`	`}`
`53`	`53`
`54`		`- return si.setIdx >= len(si.sets)`
	`54`	`+ return si.setIdx < len(si.sets)`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`func (si *unionIterator) Permissions() Set {`
Original file line number	Diff line number	Diff line change
`@@ -44,10 +44,6 @@ func (r *Role) Permissions() Set {`
`44`	`44`	`for _, ps := range r.PermissionSets {`
`45`	`45`	`i += copy(r.buffer[i:], ps.Permissions())`
`46`	`46`	`}`
`47`		`- //all := make(Set, 0, r.ReturnSize)`
`48`		`- //for _, set := range r.PermissionSets {`
`49`		`- // all = append(all, set.Permissions()...)`
`50`		`- //}`
`51`	`47`	`return r.buffer`
`52`	`48`	`}`
`53`	`49`