Merge pull request #647 from rushtehrani/master

rushtehrani · web-flow · commit 0e1e48dfc83d · 2020-10-08T20:03:51.000-07:00
fix: Use correct group for workspaces resource
diff --git a/server/workspace_server.go b/server/workspace_server.go
@@ -363,7 +363,7 @@ func (s *WorkspaceServer) RetryLastWorkspaceAction(ctx context.Context, req *api
 func (s *WorkspaceServer) GetWorkspaceStatisticsForNamespace(ctx context.Context, req *api.GetWorkspaceStatisticsForNamespaceRequest) (*api.GetWorkspaceStatisticsForNamespaceResponse, error) {
 	client := getClient(ctx)
 
-	allowed, err := auth.IsAuthorized(client, req.Namespace, "list", "argoproj.io", "workspaces", "")
+	allowed, err := auth.IsAuthorized(client, req.Namespace, "list", "onepanel.io", "workspaces", "")
 	if err != nil || !allowed {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ func (s WorkspaceServer) RetryLastWorkspaceAction(ctx context.Context, req api`
`363`	`363`	`func (s WorkspaceServer) GetWorkspaceStatisticsForNamespace(ctx context.Context, req api.GetWorkspaceStatisticsForNamespaceRequest) (*api.GetWorkspaceStatisticsForNamespaceResponse, error) {`
`364`	`364`	`client := getClient(ctx)`
`365`	`365`
`366`		`- allowed, err := auth.IsAuthorized(client, req.Namespace, "list", "argoproj.io", "workspaces", "")`
	`366`	`+ allowed, err := auth.IsAuthorized(client, req.Namespace, "list", "onepanel.io", "workspaces", "")`
`367`	`367`	`if err != nil \|\| !allowed {`
`368`	`368`	`return nil, err`
`369`	`369`	`}`