skip GetAuthorizedWorkspaces

johnstcn · johnstcn · commit c285f6fda44c · 2023-02-02T15:24:40.000Z
diff --git a/coderd/authzquery/methods_test.go b/coderd/authzquery/methods_test.go
@@ -21,9 +21,10 @@ import (
 )
 
 var (
-	skipMethods = map[string]any{
-		"InTx": struct{}{},
-		"Ping": struct{}{},
+	skipMethods = map[string]string{
+		"InTx":                    "Not relevant",
+		"Ping":                    "Not relevant",
+		"GetAuthorizedWorkspaces": "Will not be exposed",
 	}
 )
 
@@ -56,6 +57,8 @@ func (s *MethodTestSuite) SetupSuite() {
 	for i := 0; i < azt.NumMethod(); i++ {
 		method := azt.Method(i)
 		if _, ok := skipMethods[method.Name]; ok {
+			// We can't use s.T().Skip as this will skip the entire suite.
+			s.T().Logf("Skipping method %q: %s", method.Name, skipMethods[method.Name])
 			continue
 		}
 		s.methodAccounting[method.Name] = 0
@@ -212,7 +215,7 @@ func asserts(inputs ...any) []AssertRBAC {
 	for i := 0; i < len(inputs); i += 2 {
 		obj, ok := inputs[i].(rbac.Objecter)
 		if !ok {
-			panic(fmt.Sprintf("object type '%T' does not implement rbac.Objecter", obj))
+			panic(fmt.Sprintf("object type '%T' does not implement rbac.Objecter", inputs[i]))
 		}
 		rbacObj := obj.RBACObject()
 
@@ -224,7 +227,7 @@ func asserts(inputs ...any) []AssertRBAC {
 				// Could be the string type.
 				actionAsString, ok := inputs[i+1].(string)
 				if !ok {
-					panic(fmt.Sprintf("action type '%T' not a supported action", obj))
+					panic(fmt.Sprintf("action '%q' not a supported action", actionAsString))
 				}
 				action = rbac.Action(actionAsString)
 			}

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,10 @@ import (`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`var (`
`24`		`- skipMethods = map[string]any{`
`25`		`- "InTx": struct{}{},`
`26`		`- "Ping": struct{}{},`
	`24`	`+ skipMethods = map[string]string{`
	`25`	`+ "InTx": "Not relevant",`
	`26`	`+ "Ping": "Not relevant",`
	`27`	`+ "GetAuthorizedWorkspaces": "Will not be exposed",`
`27`	`28`	`}`
`28`	`29`	`)`
`29`	`30`
`@@ -56,6 +57,8 @@ func (s *MethodTestSuite) SetupSuite() {`
`56`	`57`	`for i := 0; i < azt.NumMethod(); i++ {`
`57`	`58`	`method := azt.Method(i)`
`58`	`59`	`if _, ok := skipMethods[method.Name]; ok {`
	`60`	`+ // We can't use s.T().Skip as this will skip the entire suite.`
	`61`	`+ s.T().Logf("Skipping method %q: %s", method.Name, skipMethods[method.Name])`
`59`	`62`	`continue`
`60`	`63`	`}`
`61`	`64`	`s.methodAccounting[method.Name] = 0`
`@@ -212,7 +215,7 @@ func asserts(inputs ...any) []AssertRBAC {`
`212`	`215`	`for i := 0; i < len(inputs); i += 2 {`
`213`	`216`	`obj, ok := inputs[i].(rbac.Objecter)`
`214`	`217`	`if !ok {`
`215`		`- panic(fmt.Sprintf("object type '%T' does not implement rbac.Objecter", obj))`
	`218`	`+ panic(fmt.Sprintf("object type '%T' does not implement rbac.Objecter", inputs[i]))`
`216`	`219`	`}`
`217`	`220`	`rbacObj := obj.RBACObject()`
`218`	`221`
`@@ -224,7 +227,7 @@ func asserts(inputs ...any) []AssertRBAC {`
`224`	`227`	`// Could be the string type.`
`225`	`228`	`actionAsString, ok := inputs[i+1].(string)`
`226`	`229`	`if !ok {`
`227`		`- panic(fmt.Sprintf("action type '%T' not a supported action", obj))`
	`230`	`+ panic(fmt.Sprintf("action '%q' not a supported action", actionAsString))`
`228`	`231`	`}`
`229`	`232`	`action = rbac.Action(actionAsString)`
`230`	`233`	`}`