From c6e4762f2888bdfbd061afc695d1ec752c6e3349 Mon Sep 17 00:00:00 2001
From: mmetc <92726601+mmetc@users.noreply.github.com>
Date: Tue, 16 Jan 2024 09:14:33 +0100
Subject: [PATCH] apiserver: remove cached field isEnrolled (#2744)

not worth it just to avoid parsing a string twice
---
 pkg/apiserver/apiserver.go | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go
index 58caeb068..a85cffcf5 100644
--- a/pkg/apiserver/apiserver.go
+++ b/pkg/apiserver/apiserver.go
@@ -43,7 +43,6 @@ type APIServer struct {
 	papi           *Papi
 	httpServerTomb tomb.Tomb
 	consoleConfig  *csconfig.ConsoleConfig
-	isEnrolled     bool
 }
 
 func recoverFromPanic(c *gin.Context) {
@@ -226,7 +225,6 @@ func NewServer(config *csconfig.LocalApiServerCfg) (*APIServer, error) {
 	var (
 		apiClient         *apic
 		papiClient        *Papi
-		isMachineEnrolled = false
 	)
 
 	controller.AlertsAddChan = nil
@@ -245,8 +243,6 @@ func NewServer(config *csconfig.LocalApiServerCfg) (*APIServer, error) {
 		controller.AlertsAddChan = apiClient.AlertsAddChan
 
 		if apiClient.apiClient.IsEnrolled() {
-			isMachineEnrolled = true
-
 			log.Infof("Machine is enrolled in the console, Loading PAPI Client")
 
 			papiClient, err = NewPAPI(apiClient, dbClient, config.ConsoleConfig, *config.PapiLogLevel)
@@ -279,7 +275,6 @@ func NewServer(config *csconfig.LocalApiServerCfg) (*APIServer, error) {
 		papi:           papiClient,
 		httpServerTomb: tomb.Tomb{},
 		consoleConfig:  config.ConsoleConfig,
-		isEnrolled:     isMachineEnrolled,
 	}, nil
 }
 
@@ -321,7 +316,7 @@ func (s *APIServer) Run(apiReady chan bool) error {
 		})
 
 		//csConfig.API.Server.ConsoleConfig.ShareCustomScenarios
-		if s.isEnrolled {
+		if s.apic.apiClient.IsEnrolled() {
 			if s.consoleConfig.ConsoleManagement != nil && *s.consoleConfig.ConsoleManagement {
 				if s.papi.URL != "" {
 					log.Infof("Starting PAPI decision receiver")