🧹 decouple checkin from service startup (#1487)

Signed-off-by: Ivan Milchev <[email protected]>

apps/cnspec/cmd/backgroundjob/checkin.go

@@ -28,7 +28,6 @@ func newCheckinHandler(
 	endpoint string,
 	agentMrn string,
 	config *upstream.UpstreamConfig,
-	sysInfo *sysinfo.SystemInfo,
 ) (*CheckinHandler, error) {
 	if agentMrn == "" {
 		return nil, errors.New("could not determine agent MRN")
@@ -38,7 +37,6 @@ func newCheckinHandler(
 		httpClient: httpClient,
 		mrn:        agentMrn,
 		creds:      config.Creds,
-		sysInfo:    sysInfo,
 	}, nil
 }
 
@@ -47,15 +45,17 @@ func NewCheckInHandlerWithInfo(httpClient *http.Client,
 	agentMrn string,
 	config *upstream.UpstreamConfig,
 ) (*CheckinHandler, error) {
-	sysInfo, err := sysinfo.Get()
-	if err != nil {
-		return nil, errors.Wrap(err, "could not determine system information")
-	}
-
-	return newCheckinHandler(httpClient, endpoint, agentMrn, config, sysInfo)
+	return newCheckinHandler(httpClient, endpoint, agentMrn, config)
 }
 
 func (c *CheckinHandler) CheckIn(ctx context.Context) error {
+	if c.sysInfo == nil {
+		sysInfo, err := sysinfo.Get()
+		if err != nil {
+			return errors.Wrap(err, "could not determine system information")
+		}
+		c.sysInfo = sysInfo
+	}
 	// gather service account
 	plugins := []ranger.ClientPlugin{}
 	plugins = append(plugins, sysInfoHeader(c.sysInfo, cnquery.DefaultFeatures))

apps/cnspec/cmd/backgroundjob/checkin_pinger.go

@@ -43,7 +43,9 @@ func (c *checkinPinger) Start() {
 	}
 
 	// run check-in once on startup
-	runCheckIn()
+	go func() {
+		runCheckIn()
+	}()
 
 	jitter := time.Duration(rand.Int63n(int64(c.interval)))
 	ticker := time.NewTicker(c.interval + jitter)

apps/cnspec/cmd/backgroundjob/serve_windows.go

@@ -17,7 +17,7 @@ import (
 )
 
 func Serve(timer time.Duration, splay time.Duration, handler JobRunner) {
-	isIntSess, err := svc.IsAnInteractiveSession()
+	isIntSess, err := svc.IsWindowsService()
 	if err != nil {
 		log.Fatal().Err(err).Msg("failed to determine if we are running in an interactive session")
 	}