fix merge conflict with main

Author: 0div

.golangci.yml

@@ -18,18 +18,28 @@ linters:
     - bidichk
     - bodyclose
     - containedctx
+    - contextcheck
     - copyloopvar
     - dogsled
     - durationcheck
     - errname
     - errorlint
     - exptostd
+    - gocritic
     - govet
+    - iface
+    - importas
     - staticcheck
     - testifylint
     - thelper
     - tparallel
+    - usetesting
+    - wastedassign
+    - whitespace
   settings:
+    gocritic:
+      disabled-checks:
+        - appendAssign
     staticcheck:
       checks:
         - all

packages/api/internal/cache/auth/cache.go

@@ -66,7 +66,7 @@ func (c *TeamAuthCache) GetOrSet(ctx context.Context, key string, dataCallback D
 
 	templateInfo = item.Value()
 	if time.Since(templateInfo.lastRefresh) > refreshInterval {
-		go templateInfo.once.Do(key, func() (interface{}, error) {
+		go templateInfo.once.Do(key, func() (interface{}, error) { // nolint:contextcheck // TODO: fix this later
 			c.Refresh(key, dataCallback)
 			return nil, err
 		})

packages/api/internal/cache/instance/instance.go

@@ -31,57 +31,57 @@ const (
 )
 
 func NewInstanceInfo(
-	SandboxID string,
-	TemplateID string,
-	ClientID string,
-	Alias *string,
-	ExecutionID string,
-	TeamID uuid.UUID,
-	BuildID uuid.UUID,
-	Metadata map[string]string,
-	MaxInstanceLength time.Duration,
-	StartTime time.Time,
+	sandboxID string,
+	templateID string,
+	clientID string,
+	alias *string,
+	executionID string,
+	teamID uuid.UUID,
+	buildID uuid.UUID,
+	metadata map[string]string,
+	maxInstanceLength time.Duration,
+	startTime time.Time,
 	endTime time.Time,
-	VCpu int64,
-	TotalDiskSizeMB int64,
-	RamMB int64,
-	KernelVersion string,
-	FirecrackerVersion string,
-	EnvdVersion string,
-	NodeID string,
-	ClusterID uuid.UUID,
-	AutoPause bool,
-	EnvdAccessToken *string,
+	vcpu int64,
+	totalDiskSizeMB int64,
+	ramMB int64,
+	kernelVersion string,
+	firecrackerVersion string,
+	envdVersion string,
+	nodeID string,
+	clusterID uuid.UUID,
+	autoPause bool,
+	envdAccessToken *string,
 	allowInternetAccess *bool,
-	BaseTemplateID string,
+	baseTemplateID string,
 ) *InstanceInfo {
 	instance := &InstanceInfo{
-		SandboxID:  SandboxID,
-		TemplateID: TemplateID,
-		ClientID:   ClientID,
-		Alias:      Alias,
-
-		ExecutionID:         ExecutionID,
-		TeamID:              TeamID,
-		BuildID:             BuildID,
-		Metadata:            Metadata,
-		MaxInstanceLength:   MaxInstanceLength,
-		StartTime:           StartTime,
+		SandboxID:  sandboxID,
+		TemplateID: templateID,
+		ClientID:   clientID,
+		Alias:      alias,
+
+		ExecutionID:         executionID,
+		TeamID:              teamID,
+		BuildID:             buildID,
+		Metadata:            metadata,
+		MaxInstanceLength:   maxInstanceLength,
+		StartTime:           startTime,
 		endTime:             endTime,
-		VCpu:                VCpu,
-		TotalDiskSizeMB:     TotalDiskSizeMB,
-		RamMB:               RamMB,
-		KernelVersion:       KernelVersion,
-		FirecrackerVersion:  FirecrackerVersion,
-		EnvdVersion:         EnvdVersion,
-		EnvdAccessToken:     EnvdAccessToken,
+		VCpu:                vcpu,
+		TotalDiskSizeMB:     totalDiskSizeMB,
+		RamMB:               ramMB,
+		KernelVersion:       kernelVersion,
+		FirecrackerVersion:  firecrackerVersion,
+		EnvdVersion:         envdVersion,
+		EnvdAccessToken:     envdAccessToken,
 		AllowInternetAccess: allowInternetAccess,
-		NodeID:              NodeID,
-		ClusterID:           ClusterID,
-		AutoPause:           AutoPause,
+		NodeID:              nodeID,
+		ClusterID:           clusterID,
+		AutoPause:           autoPause,
 		state:               StateRunning,
 		stopping:            utils.NewSetOnce[struct{}](),
-		BaseTemplateID:      BaseTemplateID,
+		BaseTemplateID:      baseTemplateID,
 		mu:                  sync.RWMutex{},
 	}
 

packages/api/internal/cache/instance/reservation_test.go

@@ -75,7 +75,7 @@ func TestReservation_ResumeAlreadyRunningSandbox(t *testing.T) {
 		endTime:           time.Now().Add(time.Hour),
 		MaxInstanceLength: time.Hour,
 	}
-	err := cache.Add(context.Background(), info, false)
+	err := cache.Add(t.Context(), info, false)
 	require.NoError(t, err)
 
 	_, err = cache.Reserve(sandboxID, teamID, 1)

packages/api/internal/dns/server.go

@@ -233,7 +233,7 @@ func (d *DNS) Start(ctx context.Context, address string, port string) {
 
 		// Close should be a noop if it's already been called,
 		// and it caches the error.
-		_ = d.Close(shutdownCtx)
+		_ = d.Close(shutdownCtx) // nolint:contextcheck // TODO: fix this later
 	}()
 }
 

packages/api/internal/edge/pool.go

@@ -161,7 +161,14 @@ func (d poolSynchronizationStore) PoolInsert(ctx context.Context, cluster querie
 
 	zap.L().Info("Initializing newly discovered cluster", l.WithClusterID(cluster.ID))
 
-	c, err := NewCluster(d.pool.tel, cluster.Endpoint, cluster.EndpointTls, cluster.Token, cluster.ID, cluster.SandboxProxyDomain)
+	c, err := NewCluster( // nolint:contextcheck // TODO: fix this later
+		d.pool.tel,
+		cluster.Endpoint,
+		cluster.EndpointTls,
+		cluster.Token,
+		cluster.ID,
+		cluster.SandboxProxyDomain,
+	)
 	if err != nil {
 		zap.L().Error("Initializing cluster failed", zap.Error(err), l.WithClusterID(c.ID))
 		return

packages/api/internal/handlers/store.go

@@ -153,7 +153,7 @@ func NewAPIStore(ctx context.Context, tel *telemetry.Client) *APIStore {
 
 	authCache := authcache.NewTeamAuthCache()
 	templateCache := templatecache.NewTemplateCache(sqlcDB)
-	templateSpawnCounter := utils.NewTemplateSpawnCounter(time.Minute, dbClient)
+	templateSpawnCounter := utils.NewTemplateSpawnCounter(time.Minute, dbClient) // nolint:contextcheck // TODO: fix this later
 
 	accessTokenGenerator, err := sandbox.NewEnvdAccessTokenGenerator()
 	if err != nil {

packages/api/internal/handlers/template_request_build.go

@@ -530,7 +530,6 @@ func getCPUAndRAM(tier *queries.Tier, cpuCount, memoryMB *int32) (int64, int64,
 				Code:      http.StatusBadRequest,
 			}
 		}
-
 	}
 
 	if memoryMB != nil {

packages/api/internal/metrics/team.go

@@ -87,7 +87,7 @@ func (so *TeamObserver) Start(cache *instance.MemoryStore) (err error) {
 					sbxsPerTeam[teamID] = 0
 				}
 
-				sbxsPerTeam[teamID] = sbxsPerTeam[teamID] + 1
+				sbxsPerTeam[teamID]++
 			}
 
 			// Reset the max for the new interval to the current counts

packages/api/internal/middleware/otel/metrics/middleware.go

@@ -31,7 +31,7 @@ func Middleware(meterProvider metric.MeterProvider, service string, options ...O
 		ctx := ginCtx.Request.Context()
 
 		route := ginCtx.FullPath()
-		if len(route) <= 0 {
+		if len(route) == 0 {
 			route = "nonconfigured"
 		}