merge with master

pkg/spec/types.go

@@ -32,7 +32,7 @@ const (
 	RoleOriginTeamsAPI
 	RoleOriginSystem
 	RoleOriginBootstrap
-	RoleConnectionPool
+	RoleConnectionPooler
 )
 
 type syncUserOperation int
@@ -183,8 +183,8 @@ func (r RoleOrigin) String() string {
 		return "system role"
 	case RoleOriginBootstrap:
 		return "bootstrapped role"
-	case RoleConnectionPool:
-		return "connection pool role"
+	case RoleConnectionPooler:
+		return "connection pooler role"
 	default:
 		panic(fmt.Sprintf("bogus role origin value %d", r))
 	}