From 92bf7b44247a6b5897e073401353ca3f607d2833 Mon Sep 17 00:00:00 2001
From: Alva Zhang <140438385+Alva8756@users.noreply.github.com>
Date: Fri, 1 Dec 2023 11:00:52 -0800
Subject: [PATCH] remove EnableServerEnroll flag (#160)

---
 cmd/server.go                      |  1 -
 internal/app/config.go             |  7 -------
 internal/server/server.go          |  9 ---------
 pkg/api/v1/client/client_test.go   |  1 -
 pkg/api/v1/routes/handlers_test.go |  1 -
 pkg/api/v1/routes/routes.go        | 21 ++++++---------------
 6 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/cmd/server.go b/cmd/server.go
index f08c248d..868a05ed 100644
--- a/cmd/server.go
+++ b/cmd/server.go
@@ -67,7 +67,6 @@ var cmdServer = &cobra.Command{
 			server.WithListenAddress(app.Config.ListenAddress),
 			server.WithStore(repository),
 			server.WithFleetDBClient(fleetDBClient),
-			server.EnableServerEnroll(app.Config.EnableServerEnroll),
 			server.WithStreamBroker(streamBroker),
 			server.WithConditionDefinitions(app.Config.ConditionDefinitions),
 		}
diff --git a/internal/app/config.go b/internal/app/config.go
index 6c71ed40..534baf63 100644
--- a/internal/app/config.go
+++ b/internal/app/config.go
@@ -61,9 +61,6 @@ type Configuration struct {
 
 	// Notifications defines the properties for alerting external parties
 	Notifications notify.Configuration `mapstructure:"notifications"`
-
-	// EnableServerEnroll enables the server enrollment API.
-	EnableServerEnroll bool `mapstructure:"enable_server_enroll"`
 }
 
 // https://github.com/metal-toolbox/hollow-serverservice
@@ -140,10 +137,6 @@ func (a *App) envVarOverrides() error {
 		a.Config.Notifications.Token = a.v.GetString("notifications.token")
 	}
 
-	if a.v.GetString("fleetdb.enable.server.enroll") != "" {
-		a.Config.EnableServerEnroll = a.v.GetBool("fleetdb.enable.server.enroll")
-	}
-
 	if err := a.envVarServerserviceOverrides(); err != nil {
 		return err
 	}
diff --git a/internal/server/server.go b/internal/server/server.go
index 8227e81a..1b9fe20e 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -39,7 +39,6 @@ type Server struct {
 	conditionDefinitions rctypes.Definitions
 	repository           store.Repository
 	fleetDBClient        fleetdb.FleetDB
-	enableServerEnroll   bool
 }
 
 // Option type sets a parameter on the Server type.
@@ -59,13 +58,6 @@ func WithFleetDBClient(client fleetdb.FleetDB) Option {
 	}
 }
 
-// EnableServerEnroll enables server enroll API.
-func EnableServerEnroll(enable bool) Option {
-	return func(s *Server) {
-		s.enableServerEnroll = enable
-	}
-}
-
 // WithLogger sets the logger on the Server type.
 func WithLogger(logger *logrus.Logger) Option {
 	return func(s *Server) {
@@ -117,7 +109,6 @@ func New(opts ...Option) *http.Server {
 		routes.WithLogger(s.logger),
 		routes.WithStore(s.repository),
 		routes.WithFleetDBClient(s.fleetDBClient),
-		routes.EnableServerEnroll(s.enableServerEnroll),
 		routes.WithStreamBroker(s.streamBroker),
 		routes.WithConditionDefinitions(s.conditionDefinitions),
 	}
diff --git a/pkg/api/v1/client/client_test.go b/pkg/api/v1/client/client_test.go
index cc5caff7..97d6bfe7 100644
--- a/pkg/api/v1/client/client_test.go
+++ b/pkg/api/v1/client/client_test.go
@@ -73,7 +73,6 @@ func newTester(t *testing.T) (*integrationTester, finalizer) {
 		server.WithStore(repository),
 		server.WithFleetDBClient(fleetDBClient),
 		server.WithStreamBroker(stream),
-		server.EnableServerEnroll(true),
 		server.WithConditionDefinitions(
 			[]*rctypes.Definition{
 				{Kind: rctypes.FirmwareInstall},
diff --git a/pkg/api/v1/routes/handlers_test.go b/pkg/api/v1/routes/handlers_test.go
index e67e8d01..5669bc04 100644
--- a/pkg/api/v1/routes/handlers_test.go
+++ b/pkg/api/v1/routes/handlers_test.go
@@ -38,7 +38,6 @@ func mockserver(t *testing.T, logger *logrus.Logger, fleetDBClient fleetdb.Fleet
 		WithLogger(logger),
 		WithStore(repository),
 		WithFleetDBClient(fleetDBClient),
-		EnableServerEnroll(true),
 		WithConditionDefinitions(
 			[]*rctypes.Definition{
 				{Kind: rctypes.FirmwareInstall},
diff --git a/pkg/api/v1/routes/routes.go b/pkg/api/v1/routes/routes.go
index 73e44a1c..0f2f1be4 100644
--- a/pkg/api/v1/routes/routes.go
+++ b/pkg/api/v1/routes/routes.go
@@ -35,7 +35,6 @@ type Routes struct {
 	streamBroker         events.Stream
 	conditionDefinitions rctypes.Definitions
 	logger               *logrus.Logger
-	enableServerEnroll   bool
 }
 
 // Option type sets a parameter on the Routes type.
@@ -55,13 +54,6 @@ func WithFleetDBClient(client fleetdb.FleetDB) Option {
 	}
 }
 
-// EnableServerEnroll enables server enroll API.
-func EnableServerEnroll(enable bool) Option {
-	return func(r *Routes) {
-		r.enableServerEnroll = enable
-	}
-}
-
 // WithStreamBroker sets the event stream broker.
 func WithStreamBroker(broker events.Stream) Option {
 	return func(r *Routes) {
@@ -137,13 +129,12 @@ func (r *Routes) composeAuthHandler(scopes []string) gin.HandlerFunc {
 
 func (r *Routes) Routes(g *gin.RouterGroup) {
 	servers := g.Group("/servers/:uuid")
-	if r.enableServerEnroll {
-		serverEnroll := g.Group("/serverEnroll")
-		serverEnroll.POST("/:uuid", r.composeAuthHandler(createScopes("server")), wrapAPICall(r.serverEnroll))
-		// Create a new server ID when uuid is not provided.
-		serverEnroll.POST("/", r.composeAuthHandler(createScopes("server")), wrapAPICall(r.serverEnroll))
-		servers.DELETE("", r.composeAuthHandler(createScopes("server")), wrapAPICall(r.serverDelete))
-	}
+
+	serverEnroll := g.Group("/serverEnroll")
+	serverEnroll.POST("/:uuid", r.composeAuthHandler(createScopes("server")), wrapAPICall(r.serverEnroll))
+	// Create a new server ID when uuid is not provided.
+	serverEnroll.POST("/", r.composeAuthHandler(createScopes("server")), wrapAPICall(r.serverEnroll))
+	servers.DELETE("", r.composeAuthHandler(createScopes("server")), wrapAPICall(r.serverDelete))
 
 	{
 		// Combined API for firmwareInstall