From 21d279c66b9bb4327cc19fd1177a91ee54b24389 Mon Sep 17 00:00:00 2001
From: alteredCoder <kevin@crowdsec.net>
Date: Wed, 13 Oct 2021 18:36:29 +0200
Subject: [PATCH] add console enroll name and tags in this PR

---
 cmd/crowdsec-cli/console.go        | 8 ++++++--
 pkg/apiclient/auth_service.go      | 8 +++++---
 pkg/apiclient/auth_service_test.go | 6 +++---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/cmd/crowdsec-cli/console.go b/cmd/crowdsec-cli/console.go
index a9ad8627c..87c86ab5e 100644
--- a/cmd/crowdsec-cli/console.go
+++ b/cmd/crowdsec-cli/console.go
@@ -82,6 +82,9 @@ func NewConsoleCmd() *cobra.Command {
 		},
 	}
 
+	name := ""
+	tags := []string{}
+
 	cmdEnroll := &cobra.Command{
 		Use:   "enroll [enroll-key]",
 		Short: "Enroll this instance to https://app.crowdsec.net [requires local API]",
@@ -126,14 +129,15 @@ After running this command your will need to validate the enrollment in the weba
 				URL:           apiURL,
 				VersionPrefix: "v2",
 			})
-			_, err = c.Auth.EnrollWatcher(context.Background(), args[0])
+			_, err = c.Auth.EnrollWatcher(context.Background(), args[0], name, tags)
 			if err != nil {
 				log.Fatalf("Could not enroll instance: %s", err)
 			}
 			log.Infof("Watcher successfully enrolled. Visit https://app.crowdsec.net to accept it.")
 		},
 	}
-
+	cmdEnroll.Flags().StringVarP(&name, "name", "n", "", "Name to appear in the console")
+	cmdEnroll.Flags().StringSliceVarP(&tags, "tags", "t", tags, "Tags to appear in the console")
 	cmdConsole.AddCommand(cmdEnroll)
 
 	var enableAll, disableAll bool
diff --git a/pkg/apiclient/auth_service.go b/pkg/apiclient/auth_service.go
index 632fb8778..6809aba30 100644
--- a/pkg/apiclient/auth_service.go
+++ b/pkg/apiclient/auth_service.go
@@ -13,7 +13,9 @@ type AuthService service
 
 // Don't add it to the models, as they are used with LAPI, but the enroll endpoint is specific to CAPI
 type enrollRequest struct {
-	EnrollKey string `json:"attachment_key"`
+	EnrollKey string   `json:"attachment_key"`
+	Name      string   `json:"name"`
+	Tags      []string `json:"tags"`
 }
 
 func (s *AuthService) UnregisterWatcher(ctx context.Context) (*Response, error) {
@@ -61,9 +63,9 @@ func (s *AuthService) AuthenticateWatcher(ctx context.Context, auth models.Watch
 	return resp, nil
 }
 
-func (s *AuthService) EnrollWatcher(ctx context.Context, enrollKey string) (*Response, error) {
+func (s *AuthService) EnrollWatcher(ctx context.Context, enrollKey string, name string, tags []string) (*Response, error) {
 	u := fmt.Sprintf("%s/watchers/enroll", s.client.URLPrefix)
-	req, err := s.client.NewRequest("POST", u, &enrollRequest{EnrollKey: enrollKey})
+	req, err := s.client.NewRequest("POST", u, &enrollRequest{EnrollKey: enrollKey, Name: name, Tags: tags})
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/apiclient/auth_service_test.go b/pkg/apiclient/auth_service_test.go
index 7c217b70a..81818eb51 100644
--- a/pkg/apiclient/auth_service_test.go
+++ b/pkg/apiclient/auth_service_test.go
@@ -228,11 +228,11 @@ func TestWatcherEnroll(t *testing.T) {
 		log.Fatalf("new api client: %s", err.Error())
 	}
 
-	_, err = client.Auth.EnrollWatcher(context.Background(), "goodkey")
+	_, err = client.Auth.EnrollWatcher(context.Background(), "goodkey", "", []string{})
 	if err != nil {
-		t.Fatalf("unexpect auth err: %s", err)
+		t.Fatalf("unexpect enroll err: %s", err)
 	}
 
-	_, err = client.Auth.EnrollWatcher(context.Background(), "badkey")
+	_, err = client.Auth.EnrollWatcher(context.Background(), "badkey", "", []string{})
 	assert.Contains(t, err.Error(), "the attachment key provided is not valid")
 }