chore: more linting err fix

adityachoudhari26 · adityachoudhari26 · commit 6cfac9f3d076 · 2025-10-13T15:09:25.000-07:00
diff --git a/apps/workspace-engine/pkg/events/handler/resources/resourceproviders.go b/apps/workspace-engine/pkg/events/handler/resources/resourceproviders.go
@@ -48,7 +48,9 @@ func HandleResourceProviderDeleted(
 		return err
 	}
 
-	ws.ResourceProviders().Remove(ctx, resourceProvider.Id)
+	if err := ws.ResourceProviders().Remove(ctx, resourceProvider.Id); err != nil {
+		return err
+	}
 
 	return nil
 }
diff --git a/apps/workspace-engine/pkg/workspace/releasemanager/evaluate.go b/apps/workspace-engine/pkg/workspace/releasemanager/evaluate.go
@@ -132,7 +132,10 @@ func (m *Manager) executeDeployment(ctx context.Context, releaseToDeploy *oapi.R
 	defer span.End()
 
 	// Step 1: Persist the release (WRITE)
-	m.store.Releases.Upsert(ctx, releaseToDeploy)
+	if err := m.store.Releases.Upsert(ctx, releaseToDeploy); err != nil {
+		span.RecordError(err)
+		return err
+	}
 
 	// Step 2: Cancel outdated jobs for this release target (WRITES)
 	// Cancel any pending/in-progress jobs for different releases (outdated versions)
@@ -152,7 +155,11 @@ func (m *Manager) executeDeployment(ctx context.Context, releaseToDeploy *oapi.R
 	)
 
 	// Step 4: Dispatch job to integration (ASYNC)
-	go m.IntegrationDispatch(ctx, newJob)
+	go func() {
+		if err := m.IntegrationDispatch(ctx, newJob); err != nil {
+			log.Error("error dispatching job to integration", "error", err.Error())
+		}
+	}()
 
 	return nil
 }
diff --git a/apps/workspace-engine/pkg/workspace/store/deployments.go b/apps/workspace-engine/pkg/workspace/store/deployments.go
@@ -119,7 +119,7 @@ func (e *Deployments) HasResource(deploymentId string, resourceId string) bool {
 		return false
 	}
 
-	mv.WaitRecompute()
+	_ = mv.WaitRecompute()
 	allResources := mv.Get()
 	if deploymentResources, ok := allResources[resourceId]; ok {
 		return deploymentResources != nil
@@ -133,7 +133,7 @@ func (e *Deployments) Resources(deploymentId string) map[string]*oapi.Resource {
 		return map[string]*oapi.Resource{}
 	}
 
-	mv.WaitRecompute()
+	_ = mv.WaitRecompute()
 	allResources := mv.Get()
 	return allResources
 }
diff --git a/apps/workspace-engine/pkg/workspace/store/environments.go b/apps/workspace-engine/pkg/workspace/store/environments.go
@@ -81,7 +81,7 @@ func (e *Environments) HasResource(envId string, resourceId string) bool {
 		return false
 	}
 
-	mv.WaitRecompute()
+	_ = mv.WaitRecompute()
 	allResources := mv.Get()
 	if envResources, ok := allResources[resourceId]; ok {
 		return envResources != nil
@@ -95,7 +95,7 @@ func (e *Environments) Resources(id string) map[string]*oapi.Resource {
 		return map[string]*oapi.Resource{}
 	}
 
-	mv.WaitRecompute()
+	_ = mv.WaitRecompute()
 	allResources := mv.Get()
 	return allResources
 }
@@ -107,7 +107,8 @@ func (e *Environments) RecomputeResources(ctx context.Context, environmentId str
 	}
 
 	// RunRecompute will start a new computation or wait for an existing one
-	return mv.RunRecompute(ctx)
+	_ = mv.RunRecompute(ctx)
+	return nil
 }
 
 func (e *Environments) Upsert(ctx context.Context, environment *oapi.Environment) error {
@@ -143,7 +144,7 @@ func (e *Environments) ApplyResourceUpdate(ctx context.Context, environmentId st
 		return fmt.Errorf("environment %s not found", environmentId)
 	}
 
-	mv.StartRecompute(ctx)
+	_ = mv.StartRecompute(ctx)
 
 	return nil
 }
diff --git a/apps/workspace-engine/pkg/workspace/store/materialized/view.go b/apps/workspace-engine/pkg/workspace/store/materialized/view.go
@@ -42,14 +42,14 @@ func New[V any](rf RecomputeFunc[V], opts ...Option[V]) *MaterializedView[V] {
 		opt(mv)
 	}
 
-	mv.StartRecompute(context.Background())
+	_ = mv.StartRecompute(context.Background())
 
 	return mv
 }
 
 // Get returns the current cached value.
 func (m *MaterializedView[V]) Get() V {
-	m.WaitIfRunning()
+	_ = m.WaitIfRunning()
 	m.mu.RLock()
 	defer m.mu.RUnlock()
 	return m.val
diff --git a/apps/workspace-engine/pkg/workspace/store/release_targets.go b/apps/workspace-engine/pkg/workspace/store/release_targets.go
@@ -26,12 +26,12 @@ type ReleaseTargets struct {
 
 // CurrentState returns the current state of all release targets in the system.
 func (r *ReleaseTargets) Items(ctx context.Context) map[string]*oapi.ReleaseTarget {
-	r.targets.WaitIfRunning()
+	_ = r.targets.WaitIfRunning()
 	return r.targets.Get()
 }
 
 func (r *ReleaseTargets) Recompute(ctx context.Context) {
-	r.targets.StartRecompute(ctx)
+	_ = r.targets.StartRecompute(ctx)
 }
 
 func (r *ReleaseTargets) computeTargets(ctx context.Context) (map[string]*oapi.ReleaseTarget, error) {
diff --git a/apps/workspace-engine/pkg/workspace/store/repository/repo.go b/apps/workspace-engine/pkg/workspace/store/repository/repo.go
@@ -32,7 +32,11 @@ func WriteToJSONFile(r *Repository, filePath string) error {
 	if err != nil {
 		return err
 	}
-	defer f.Close()
+	defer func() {
+		if closeErr := f.Close(); closeErr != nil && err == nil {
+			err = closeErr
+		}
+	}()
 
 	// Write JSON data to file.
 	_, err = f.Write(data)
diff --git a/apps/workspace-engine/pkg/workspace/store/resource_providers.go b/apps/workspace-engine/pkg/workspace/store/resource_providers.go
@@ -34,15 +34,18 @@ func (r *ResourceProviders) Upsert(ctx context.Context, id string, resourceProvi
 	}
 }
 
-func (r *ResourceProviders) Remove(ctx context.Context, id string) {
+func (r *ResourceProviders) Remove(ctx context.Context, id string) error {
 	r.repo.ResourceProviders.Remove(id)
 	for _, resource := range r.resources.Items() {
 		if resource.ProviderId != nil && *resource.ProviderId == id {
 			resource.ProviderId = nil
-			r.resources.Upsert(ctx, resource)
+			if _, err := r.resources.Upsert(ctx, resource); err != nil {
+				return err
+			}
 		}
 	}
 	if cs, ok := changeset.FromContext(ctx); ok {
 		cs.Record("resource-provider", changeset.ChangeTypeDelete, id, nil)
 	}
+	return nil
 }
diff --git a/apps/workspace-engine/pkg/workspace/store/resources.go b/apps/workspace-engine/pkg/workspace/store/resources.go
@@ -6,6 +6,8 @@ import (
 	"workspace-engine/pkg/changeset"
 	"workspace-engine/pkg/oapi"
 	"workspace-engine/pkg/workspace/store/repository"
+
+	"github.com/charmbracelet/log"
 )
 
 func NewResources(store *Store) *Resources {
@@ -29,14 +31,18 @@ func (r *Resources) Upsert(ctx context.Context, resource *oapi.Resource) (*oapi.
 		defer wg.Done()
 		for item := range r.store.Environments.IterBuffered() {
 			environment := item.Val
-			r.store.Environments.RecomputeResources(ctx, environment.Id)
+			if err := r.store.Environments.RecomputeResources(ctx, environment.Id); err != nil {
+				log.Error("Failed to recompute resources for environment", "environmentId", environment.Id, "error", err)
+			}
 		}
 	}()
 	go func() {
 		defer wg.Done()
 		for item := range r.store.Deployments.IterBuffered() {
 			deployment := item.Val
-			r.store.Deployments.RecomputeResources(ctx, deployment.Id)
+			if err := r.store.Deployments.RecomputeResources(ctx, deployment.Id); err != nil {
+				log.Error("Failed to recompute resources for deployment", "deploymentId", deployment.Id, "error", err)
+			}
 		}
 	}()
 	wg.Wait()
@@ -63,14 +69,18 @@ func (r *Resources) Remove(ctx context.Context, id string) {
 		defer wg.Done()
 		for item := range r.store.Environments.IterBuffered() {
 			environment := item.Val
-			r.store.Environments.RecomputeResources(ctx, environment.Id)
+			if err := r.store.Environments.RecomputeResources(ctx, environment.Id); err != nil {
+				log.Error("Failed to recompute resources for environment", "environmentId", environment.Id, "error", err)
+			}
 		}
 	}()
 	go func() {
 		defer wg.Done()
 		for item := range r.store.Deployments.IterBuffered() {
 			deployment := item.Val
-			r.store.Deployments.RecomputeResources(ctx, deployment.Id)
+			if err := r.store.Deployments.RecomputeResources(ctx, deployment.Id); err != nil {
+				log.Error("Failed to recompute resources for deployment", "deploymentId", deployment.Id, "error", err)
+			}
 		}
 	}()
 	wg.Wait()
diff --git a/apps/workspace-engine/pkg/workspace/store/systems.go b/apps/workspace-engine/pkg/workspace/store/systems.go
@@ -67,7 +67,7 @@ func (s *Systems) Deployments(systemId string) map[string]*oapi.Deployment {
 	if !ok {
 		return map[string]*oapi.Deployment{}
 	}
-	mv.WaitIfRunning()
+	_ = mv.WaitIfRunning()
 	return mv.Get()
 }
 
@@ -89,7 +89,7 @@ func (s *Systems) Environments(systemId string) map[string]*oapi.Environment {
 	if !ok {
 		return map[string]*oapi.Environment{}
 	}
-	mv.WaitIfRunning()
+	_ = mv.WaitIfRunning()
 	return mv.Get()
 }
 
@@ -117,20 +117,19 @@ func (s *Systems) ApplyDeploymentUpdate(
 	ctx context.Context,
 	previousSystemId string,
 	deployment *oapi.Deployment,
-) error {
+) {
 	// Recompute deployments for the previous system, if it exists
 	if oldDeployments, exists := s.deployments.Get(previousSystemId); exists {
-		oldDeployments.StartRecompute(ctx)
+		_ = oldDeployments.StartRecompute(ctx)
 	}
 
 	deploymentHasMoved := previousSystemId != deployment.SystemId
 	if deploymentHasMoved {
 		if newDeployments, exists := s.deployments.Get(deployment.SystemId); exists {
-			newDeployments.StartRecompute(ctx)
+			_ = newDeployments.StartRecompute(ctx)
 		}
 	}
 
-	return nil
 }
 
 // ApplyEnvironmentUpdate triggers a recompute of environments for the affected systems
@@ -139,20 +138,18 @@ func (s *Systems) ApplyEnvironmentUpdate(
 	ctx context.Context,
 	previousSystemId string,
 	environment *oapi.Environment,
-) error {
+) {
 	// Recompute deployments for the previous system, if it exists
 	if oldEnvironments, exists := s.environments.Get(previousSystemId); exists {
-		oldEnvironments.StartRecompute(ctx)
+		_ = oldEnvironments.StartRecompute(ctx)
 	}
 
 	environmentHasMoved := previousSystemId != environment.SystemId
 	if environmentHasMoved {
 		if newEnvironments, exists := s.environments.Get(environment.SystemId); exists {
-			newEnvironments.StartRecompute(ctx)
+			_ = newEnvironments.StartRecompute(ctx)
 		}
 	}
-
-	return nil
 }
 
 func (s *Systems) Items() map[string]*oapi.System {
diff --git a/apps/workspace-engine/test/e2e/engine_repo_write_test.go b/apps/workspace-engine/test/e2e/engine_repo_write_test.go
@@ -494,5 +494,7 @@ func TestEngineRepoWrite(t *testing.T) {
 	)
 
 	repo := engine.Workspace().Store().Repo()
-	repository.WriteToJSONFile(repo, "repo.json")
+	if err := repository.WriteToJSONFile(repo, "repo.json"); err != nil {
+		t.Fatalf("Failed to write repository to JSON file: %v", err)
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,9 @@ func HandleResourceProviderDeleted(`
`48`	`48`	`return err`
`49`	`49`	`}`
`50`	`50`
`51`		`- ws.ResourceProviders().Remove(ctx, resourceProvider.Id)`
	`51`	`+ if err := ws.ResourceProviders().Remove(ctx, resourceProvider.Id); err != nil {`
	`52`	`+ return err`
	`53`	`+ }`
`52`	`54`
`53`	`55`	`return nil`
`54`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ func (e *Deployments) HasResource(deploymentId string, resourceId string) bool {`
`119`	`119`	`return false`
`120`	`120`	`}`
`121`	`121`
`122`		`- mv.WaitRecompute()`
	`122`	`+ _ = mv.WaitRecompute()`
`123`	`123`	`allResources := mv.Get()`
`124`	`124`	`if deploymentResources, ok := allResources[resourceId]; ok {`
`125`	`125`	`return deploymentResources != nil`
`@@ -133,7 +133,7 @@ func (e Deployments) Resources(deploymentId string) map[string]oapi.Resource {`
`133`	`133`	`return map[string]*oapi.Resource{}`
`134`	`134`	`}`
`135`	`135`
`136`		`- mv.WaitRecompute()`
	`136`	`+ _ = mv.WaitRecompute()`
`137`	`137`	`allResources := mv.Get()`
`138`	`138`	`return allResources`
`139`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ func (e *Environments) HasResource(envId string, resourceId string) bool {`
`81`	`81`	`return false`
`82`	`82`	`}`
`83`	`83`
`84`		`- mv.WaitRecompute()`
	`84`	`+ _ = mv.WaitRecompute()`
`85`	`85`	`allResources := mv.Get()`
`86`	`86`	`if envResources, ok := allResources[resourceId]; ok {`
`87`	`87`	`return envResources != nil`
`@@ -95,7 +95,7 @@ func (e Environments) Resources(id string) map[string]oapi.Resource {`
`95`	`95`	`return map[string]*oapi.Resource{}`
`96`	`96`	`}`
`97`	`97`
`98`		`- mv.WaitRecompute()`
	`98`	`+ _ = mv.WaitRecompute()`
`99`	`99`	`allResources := mv.Get()`
`100`	`100`	`return allResources`
`101`	`101`	`}`
`@@ -107,7 +107,8 @@ func (e *Environments) RecomputeResources(ctx context.Context, environmentId str`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`// RunRecompute will start a new computation or wait for an existing one`
`110`		`- return mv.RunRecompute(ctx)`
	`110`	`+ _ = mv.RunRecompute(ctx)`
	`111`	`+ return nil`
`111`	`112`	`}`
`112`	`113`
`113`	`114`	`func (e Environments) Upsert(ctx context.Context, environment oapi.Environment) error {`
`@@ -143,7 +144,7 @@ func (e *Environments) ApplyResourceUpdate(ctx context.Context, environmentId st`
`143`	`144`	`return fmt.Errorf("environment %s not found", environmentId)`
`144`	`145`	`}`
`145`	`146`
`146`		`- mv.StartRecompute(ctx)`
	`147`	`+ _ = mv.StartRecompute(ctx)`
`147`	`148`
`148`	`149`	`return nil`
`149`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,14 +42,14 @@ func New[V any](rf RecomputeFunc[V], opts ...Option[V]) *MaterializedView[V] {`
`42`	`42`	`opt(mv)`
`43`	`43`	`}`
`44`	`44`
`45`		`- mv.StartRecompute(context.Background())`
	`45`	`+ _ = mv.StartRecompute(context.Background())`
`46`	`46`
`47`	`47`	`return mv`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`// Get returns the current cached value.`
`51`	`51`	`func (m *MaterializedView[V]) Get() V {`
`52`		`- m.WaitIfRunning()`
	`52`	`+ _ = m.WaitIfRunning()`
`53`	`53`	`m.mu.RLock()`
`54`	`54`	`defer m.mu.RUnlock()`
`55`	`55`	`return m.val`
Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,12 @@ type ReleaseTargets struct {`
`26`	`26`
`27`	`27`	`// CurrentState returns the current state of all release targets in the system.`
`28`	`28`	`func (r ReleaseTargets) Items(ctx context.Context) map[string]oapi.ReleaseTarget {`
`29`		`- r.targets.WaitIfRunning()`
	`29`	`+ _ = r.targets.WaitIfRunning()`
`30`	`30`	`return r.targets.Get()`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`func (r *ReleaseTargets) Recompute(ctx context.Context) {`
`34`		`- r.targets.StartRecompute(ctx)`
	`34`	`+ _ = r.targets.StartRecompute(ctx)`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`func (r ReleaseTargets) computeTargets(ctx context.Context) (map[string]oapi.ReleaseTarget, error) {`
Original file line number	Diff line number	Diff line change
`@@ -34,15 +34,18 @@ func (r *ResourceProviders) Upsert(ctx context.Context, id string, resourceProvi`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`37`		`-func (r *ResourceProviders) Remove(ctx context.Context, id string) {`
	`37`	`+func (r *ResourceProviders) Remove(ctx context.Context, id string) error {`
`38`	`38`	`r.repo.ResourceProviders.Remove(id)`
`39`	`39`	`for _, resource := range r.resources.Items() {`
`40`	`40`	`if resource.ProviderId != nil && *resource.ProviderId == id {`
`41`	`41`	`resource.ProviderId = nil`
`42`		`- r.resources.Upsert(ctx, resource)`
	`42`	`+ if _, err := r.resources.Upsert(ctx, resource); err != nil {`
	`43`	`+ return err`
	`44`	`+ }`
`43`	`45`	`}`
`44`	`46`	`}`
`45`	`47`	`if cs, ok := changeset.FromContext(ctx); ok {`
`46`	`48`	`cs.Record("resource-provider", changeset.ChangeTypeDelete, id, nil)`
`47`	`49`	`}`
	`50`	`+ return nil`
`48`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ func (s Systems) Deployments(systemId string) map[string]oapi.Deployment {`
`67`	`67`	`if !ok {`
`68`	`68`	`return map[string]*oapi.Deployment{}`
`69`	`69`	`}`
`70`		`- mv.WaitIfRunning()`
	`70`	`+ _ = mv.WaitIfRunning()`
`71`	`71`	`return mv.Get()`
`72`	`72`	`}`
`73`	`73`
`@@ -89,7 +89,7 @@ func (s Systems) Environments(systemId string) map[string]oapi.Environment {`
`89`	`89`	`if !ok {`
`90`	`90`	`return map[string]*oapi.Environment{}`
`91`	`91`	`}`
`92`		`- mv.WaitIfRunning()`
	`92`	`+ _ = mv.WaitIfRunning()`
`93`	`93`	`return mv.Get()`
`94`	`94`	`}`
`95`	`95`
`@@ -117,20 +117,19 @@ func (s *Systems) ApplyDeploymentUpdate(`
`117`	`117`	`ctx context.Context,`
`118`	`118`	`previousSystemId string,`
`119`	`119`	`deployment *oapi.Deployment,`
`120`		`-) error {`
	`120`	`+) {`
`121`	`121`	`// Recompute deployments for the previous system, if it exists`
`122`	`122`	`if oldDeployments, exists := s.deployments.Get(previousSystemId); exists {`
`123`		`- oldDeployments.StartRecompute(ctx)`
	`123`	`+ _ = oldDeployments.StartRecompute(ctx)`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`deploymentHasMoved := previousSystemId != deployment.SystemId`
`127`	`127`	`if deploymentHasMoved {`
`128`	`128`	`if newDeployments, exists := s.deployments.Get(deployment.SystemId); exists {`
`129`		`- newDeployments.StartRecompute(ctx)`
	`129`	`+ _ = newDeployments.StartRecompute(ctx)`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`
`133`		`- return nil`
`134`	`133`	`}`
`135`	`134`
`136`	`135`	`// ApplyEnvironmentUpdate triggers a recompute of environments for the affected systems`
`@@ -139,20 +138,18 @@ func (s *Systems) ApplyEnvironmentUpdate(`
`139`	`138`	`ctx context.Context,`
`140`	`139`	`previousSystemId string,`
`141`	`140`	`environment *oapi.Environment,`
`142`		`-) error {`
	`141`	`+) {`
`143`	`142`	`// Recompute deployments for the previous system, if it exists`
`144`	`143`	`if oldEnvironments, exists := s.environments.Get(previousSystemId); exists {`
`145`		`- oldEnvironments.StartRecompute(ctx)`
	`144`	`+ _ = oldEnvironments.StartRecompute(ctx)`
`146`	`145`	`}`
`147`	`146`
`148`	`147`	`environmentHasMoved := previousSystemId != environment.SystemId`
`149`	`148`	`if environmentHasMoved {`
`150`	`149`	`if newEnvironments, exists := s.environments.Get(environment.SystemId); exists {`
`151`		`- newEnvironments.StartRecompute(ctx)`
	`150`	`+ _ = newEnvironments.StartRecompute(ctx)`
`152`	`151`	`}`
`153`	`152`	`}`
`154`		`-`
`155`		`- return nil`
`156`	`153`	`}`
`157`	`154`
`158`	`155`	`func (s Systems) Items() map[string]oapi.System {`