chore: remove sources and fix resulting breaks

Signed-off-by: nwneisen <[email protected]>

chronograf/server/config.go

@@ -12,6 +12,10 @@ type configLinks struct {
 	Auth string `json:"auth"` // Auth link to the auth config endpoint
 }
 
+type selfLinks struct {
+	Self string `json:"self"` // Self link mapping to this resource
+}
+
 type configResponse struct {
 	Links configLinks `json:"links"`
 	chronograf.Config

chronograf/server/mux.go

@@ -156,15 +156,6 @@ func NewMux(opts MuxOpts, service Service) http.Handler {
 	router.PUT("/chronograf/v1/mappings/:id", EnsureSuperAdmin(service.UpdateMapping))
 	router.DELETE("/chronograf/v1/mappings/:id", EnsureSuperAdmin(service.RemoveMapping))
 
-	// Sources
-	router.GET("/chronograf/v1/sources", EnsureViewer(service.Sources))
-	router.POST("/chronograf/v1/sources", EnsureEditor(service.NewSource))
-
-	router.GET("/chronograf/v1/sources/:id", EnsureViewer(service.SourcesID))
-	router.PATCH("/chronograf/v1/sources/:id", EnsureEditor(service.UpdateSource))
-	router.DELETE("/chronograf/v1/sources/:id", EnsureEditor(service.RemoveSource))
-	router.GET("/chronograf/v1/sources/:id/health", EnsureViewer(service.SourceHealth))
-
 	// Source Proxy to Influx; Has gzip compression around the handler
 	influx := gziphandler.GzipHandler(http.HandlerFunc(EnsureViewer(service.Influx)))
 	router.Handler("POST", "/chronograf/v1/sources/:id/proxy", influx)
@@ -190,22 +181,6 @@ func NewMux(opts MuxOpts, service Service) http.Handler {
 	// All possible permissions for users in this source
 	router.GET("/chronograf/v1/sources/:id/permissions", EnsureViewer(service.Permissions))
 
-	// Users associated with the data source
-	router.GET("/chronograf/v1/sources/:id/users", EnsureAdmin(service.SourceUsers))
-	router.POST("/chronograf/v1/sources/:id/users", EnsureAdmin(service.NewSourceUser))
-
-	router.GET("/chronograf/v1/sources/:id/users/:uid", EnsureAdmin(service.SourceUserID))
-	router.DELETE("/chronograf/v1/sources/:id/users/:uid", EnsureAdmin(service.RemoveSourceUser))
-	router.PATCH("/chronograf/v1/sources/:id/users/:uid", EnsureAdmin(service.UpdateSourceUser))
-
-	// Roles associated with the data source
-	router.GET("/chronograf/v1/sources/:id/roles", EnsureViewer(service.SourceRoles))
-	router.POST("/chronograf/v1/sources/:id/roles", EnsureEditor(service.NewSourceRole))
-
-	router.GET("/chronograf/v1/sources/:id/roles/:rid", EnsureViewer(service.SourceRoleID))
-	router.DELETE("/chronograf/v1/sources/:id/roles/:rid", EnsureEditor(service.RemoveSourceRole))
-	router.PATCH("/chronograf/v1/sources/:id/roles/:rid", EnsureEditor(service.UpdateSourceRole))
-
 	// Services are resources that chronograf proxies to
 	router.GET("/chronograf/v1/sources/:id/services", EnsureViewer(service.Services))
 	router.POST("/chronograf/v1/sources/:id/services", EnsureEditor(service.NewService))
@@ -219,29 +194,6 @@ func NewMux(opts MuxOpts, service Service) http.Handler {
 	router.PATCH("/chronograf/v1/sources/:id/services/:kid/proxy", EnsureEditor(service.ProxyPatch))
 	router.DELETE("/chronograf/v1/sources/:id/services/:kid/proxy", EnsureEditor(service.ProxyDelete))
 
-	// Kapacitor
-	//router.GET("/chronograf/v1/sources/:id/kapacitors", EnsureViewer(service.Kapacitors))
-	//router.POST("/chronograf/v1/sources/:id/kapacitors", EnsureEditor(service.NewKapacitor))
-
-	//router.GET("/chronograf/v1/sources/:id/kapacitors/:kid", EnsureViewer(service.KapacitorsID))
-	//router.PATCH("/chronograf/v1/sources/:id/kapacitors/:kid", EnsureEditor(service.UpdateKapacitor))
-	//router.DELETE("/chronograf/v1/sources/:id/kapacitors/:kid", EnsureEditor(service.RemoveKapacitor))
-
-	//// Kapacitor rules
-	//router.GET("/chronograf/v1/sources/:id/kapacitors/:kid/rules", EnsureViewer(service.KapacitorRulesGet))
-	//router.POST("/chronograf/v1/sources/:id/kapacitors/:kid/rules", EnsureEditor(service.KapacitorRulesPost))
-
-	//router.GET("/chronograf/v1/sources/:id/kapacitors/:kid/rules/:tid", EnsureViewer(service.KapacitorRulesID))
-	//router.PUT("/chronograf/v1/sources/:id/kapacitors/:kid/rules/:tid", EnsureEditor(service.KapacitorRulesPut))
-	//router.PATCH("/chronograf/v1/sources/:id/kapacitors/:kid/rules/:tid", EnsureEditor(service.KapacitorRulesStatus))
-	//router.DELETE("/chronograf/v1/sources/:id/kapacitors/:kid/rules/:tid", EnsureEditor(service.KapacitorRulesDelete))
-
-	//// Kapacitor Proxy
-	//router.GET("/chronograf/v1/sources/:id/kapacitors/:kid/proxy", EnsureViewer(service.ProxyGet))
-	//router.POST("/chronograf/v1/sources/:id/kapacitors/:kid/proxy", EnsureEditor(service.ProxyPost))
-	//router.PATCH("/chronograf/v1/sources/:id/kapacitors/:kid/proxy", EnsureEditor(service.ProxyPatch))
-	//router.DELETE("/chronograf/v1/sources/:id/kapacitors/:kid/proxy", EnsureEditor(service.ProxyDelete))
-
 	// Layouts
 	router.GET("/chronograf/v1/layouts", EnsureViewer(service.Layouts))
 	router.GET("/chronograf/v1/layouts/:id", EnsureViewer(service.LayoutsID))

chronograf/server/permissions.go

@@ -53,18 +53,3 @@ func (s *Service) Permissions(w http.ResponseWriter, r *http.Request) {
 	}
 	encodeJSON(w, http.StatusOK, res, s.Logger)
 }
-
-func validPermissions(perms *chronograf.Permissions) error {
-	if perms == nil {
-		return nil
-	}
-	for _, perm := range *perms {
-		if perm.Scope != chronograf.AllScope && perm.Scope != chronograf.DBScope {
-			return fmt.Errorf("invalid permission scope")
-		}
-		if perm.Scope == chronograf.DBScope && perm.Name == "" {
-			return fmt.Errorf("database scoped permission requires a name")
-		}
-	}
-	return nil
-}

chronograf/server/server.go

@@ -338,13 +338,6 @@ func (s *Server) Serve(ctx context.Context) error {
 	service.Env = chronograf.Environment{
 		TelegrafSystemInterval: s.TelegrafSystemInterval,
 	}
-	if err := service.HandleNewSources(ctx, s.NewSources); err != nil {
-		logger.
-			WithField("component", "server").
-			WithField("new-sources", "invalid").
-			Error(err)
-		return err
-	}
 
 	if !validBasepath(s.Basepath) {
 		err := fmt.Errorf("invalid basepath, must follow format \"/mybasepath\"")