chore(api,cli): remove old /mon/errors admin route (#6064)

Signed-off-by: francois samin <[email protected]>
ovh · Jan 24, 2022 · 2b56b04 · 2b56b04
1 parent be89b36
commit 2b56b04
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 177 deletions.
diff --git a/cli/cdsctl/admin.go b/cli/cdsctl/admin.go
@@ -23,7 +23,6 @@ func adminCommands() []*cobra.Command {
 		adminMigrations(),
 		adminPlugins(),
 		adminBroadcasts(),
-		adminErrors(),
 		adminCurl(),
 		adminFeatures(),
 		adminWorkflows(),

diff --git a/cli/cdsctl/admin_errors.go b/cli/cdsctl/admin_errors.go
diff --git a/cli/cdsctl/worker_model.go b/cli/cdsctl/worker_model.go
@@ -62,8 +62,6 @@ func newWorkerModelDisplay(wm sdk.Model) workerModelDisplay {
 	name := wm.Name
 	if wm.Group != nil {
 		name = fmt.Sprintf("%s/%s", wm.Group.Name, wm.Name)
-	} else {
-		name = wm.Name
 	}
 
 	var image, flavor string

diff --git a/engine/api/api.go b/engine/api/api.go
@@ -197,12 +197,7 @@ type Configuration struct {
 	} `toml:"artifact" comment:"Either filesystem local storage or Openstack Swift Storage are supported" json:"artifact"`
 	DefaultOS   string `toml:"defaultOS" default:"linux" comment:"if no model and os/arch is specified in your job's requirements then spawn worker on this operating system (example: darwin, freebsd, linux, windows)" json:"defaultOS"`
 	DefaultArch string `toml:"defaultArch" default:"amd64" comment:"if no model and no os/arch is specified in your job's requirements then spawn worker on this architecture (example: amd64, arm, 386)" json:"defaultArch"`
-	Graylog     struct {
-		AccessToken string `toml:"accessToken" json:"-"`
-		Stream      string `toml:"stream" json:"-"`
-		URL         string `toml:"url" comment:"Example: http://localhost:9000" json:"url"`
-	} `toml:"graylog" json:"graylog" comment:"###########################\n Graylog Search. \n When CDS API generates errors, you can fetch them with cdsctl. \n Examples: \n $ cdsctl admin errors get <error-id> \n $ cdsctl admin errors get 55f6e977-d39b-11e8-8513-0242ac110007 \n##########################"`
-	Log struct {
+	Log         struct {
 		StepMaxSize    int64 `toml:"stepMaxSize" default:"15728640" comment:"Max step logs size in bytes (default: 15MB)" json:"stepMaxSize"`
 		ServiceMaxSize int64 `toml:"serviceMaxSize" default:"15728640" comment:"Max service logs size in bytes (default: 15MB)" json:"serviceMaxSize"`
 	} `toml:"log" json:"log" comment:"###########################\n Log settings.\n##########################"`

diff --git a/engine/api/api_routes.go b/engine/api/api_routes.go
@@ -141,7 +141,6 @@ func (api *API) InitRouter() {
 	r.Handle("/mon/metrics", ScopeNone(), r.GET(service.GetPrometheustMetricsHandler(api), service.OverrideAuth(service.NoAuthMiddleware)))
 	r.Handle("/mon/metrics/all", ScopeNone(), r.GET(service.GetMetricsHandler, service.OverrideAuth(service.NoAuthMiddleware)))
 	r.HandlePrefix("/mon/metrics/detail/", ScopeNone(), r.GET(service.GetMetricHandler("/mon/metrics/detail/"), service.OverrideAuth(service.NoAuthMiddleware)))
-	r.Handle("/mon/errors/{uuid}", ScopeNone(), r.GET(api.getErrorHandler, service.OverrideAuth(api.authAdminMiddleware)))
 
 	r.Handle("/help", ScopeNone(), r.GET(api.getHelpHandler, service.OverrideAuth(service.NoAuthMiddleware)))
 

diff --git a/engine/api/error.go b/engine/api/error.go
diff --git a/sdk/cdsclient/client_mon.go b/sdk/cdsclient/client_mon.go
@@ -2,7 +2,6 @@ package cdsclient
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/ovh/cds/sdk"
 )
@@ -30,17 +29,3 @@ func (c *client) MonDBMigrate() ([]sdk.MonDBMigrate, error) {
 	}
 	return monDBMigrate, nil
 }
-
-func (c *client) MonErrorsGet(requestID string) ([]sdk.Error, error) {
-	res, _, _, err := c.Request(context.Background(), "GET", fmt.Sprintf("/mon/errors/%s", requestID), nil)
-	if err != nil {
-		return nil, err
-	}
-
-	var errs []sdk.Error
-	if err := sdk.JSONUnmarshal(res, &errs); err != nil {
-		return nil, err
-	}
-
-	return errs, nil
-}
diff --git a/sdk/cdsclient/interface.go b/sdk/cdsclient/interface.go
@@ -367,7 +367,6 @@ type MonitoringClient interface {
 	MonStatus() (*sdk.MonitoringStatus, error)
 	MonVersion() (*sdk.Version, error)
 	MonDBMigrate() ([]sdk.MonDBMigrate, error)
-	MonErrorsGet(requestID string) ([]sdk.Error, error)
 }
 
 // IntegrationClient exposes integration functions

diff --git a/sdk/cdsclient/mock_cdsclient/interface_mock.go b/sdk/cdsclient/mock_cdsclient/interface_mock.go