[gpctl] add users unblock command (#19320)

* [gpctl] unblock user command

* [gpctl] refactor blockUser

Ergonomically it is nice to block and unblock as separate commands

But we can consolidate logic to a single function

Author: kylos101

dev/gpctl/cmd/users-block.go

@@ -8,9 +8,6 @@ import (
 	"context"
 
 	"github.com/spf13/cobra"
-
-	"github.com/gitpod-io/gitpod/common-go/log"
-	protocol "github.com/gitpod-io/gitpod/gitpod-protocol"
 )
 
 // usersBlockCmd represents the describe command
@@ -21,25 +18,7 @@ var usersBlockCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
-
-		client, err := newLegacyAPIConn()
-		if err != nil {
-			log.WithError(err).Fatal("cannot connect")
-		}
-		defer client.Close()
-
-		for _, uid := range args {
-			err = client.AdminBlockUser(ctx, &protocol.AdminBlockUserRequest{
-				UserID:    uid,
-				IsBlocked: true,
-			})
-			if err != nil {
-				log.WithError(err).Error("cannot block user")
-			} else {
-				log.WithField("uid", uid).Info("user blocked")
-			}
-		}
-
+		blockUser(ctx, args, true)
 	},
 }
 

dev/gpctl/cmd/users-unblock.go

@@ -0,0 +1,27 @@
+// Copyright (c) 2020 Gitpod GmbH. All rights reserved.
+// Licensed under the GNU Affero General Public License (AGPL).
+// See License.AGPL.txt in the project root for license information.
+
+package cmd
+
+import (
+	"context"
+
+	"github.com/spf13/cobra"
+)
+
+// usersUnblockCmd represents the describe command
+var usersUnblockCmd = &cobra.Command{
+	Use:   "unblock <userID> ... <userID>",
+	Short: "unblocks a user",
+	Args:  cobra.MinimumNArgs(1),
+	Run: func(cmd *cobra.Command, args []string) {
+		ctx, cancel := context.WithCancel(context.Background())
+		defer cancel()
+		blockUser(ctx, args, false)
+	},
+}
+
+func init() {
+	usersCmd.AddCommand(usersUnblockCmd)
+}

dev/gpctl/cmd/users.go

@@ -5,11 +5,13 @@
 package cmd
 
 import (
+	"context"
 	"fmt"
 	"os"
 
 	"github.com/gitpod-io/gitpod/common-go/log"
 	api "github.com/gitpod-io/gitpod/gitpod-protocol"
+	protocol "github.com/gitpod-io/gitpod/gitpod-protocol"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
@@ -56,3 +58,26 @@ func newLegacyAPIConn() (*api.APIoverJSONRPC, error) {
 
 	return conn, nil
 }
+
+func blockUser(ctx context.Context, args []string, block bool) {
+	client, err := newLegacyAPIConn()
+	if err != nil {
+		log.WithError(err).Fatal("cannot connect")
+	}
+	defer client.Close()
+
+	for _, uid := range args {
+		err = client.AdminBlockUser(ctx, &protocol.AdminBlockUserRequest{
+			UserID:    uid,
+			IsBlocked: block,
+		})
+		if err != nil {
+			log.WithField("uid", uid).WithField("block", block).Errorf("AdminBlockUser failed with: %v", err)
+			return
+		} else {
+			log.WithField("uid", uid).WithField("block", block).Info("AdminBlockUser")
+			return
+		}
+	}
+	log.Fatal("no args")
+}