combine 2 more assignments and conditionals

hugodutka · hugodutka · commit d11fc82b9d11 · 2024-11-16T12:52:13.000Z
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -1489,8 +1489,7 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
 				}
 			}
 			for _, module := range jobType.WorkspaceBuild.Modules {
-				err = InsertWorkspaceModule(ctx, db, job.ID, workspaceBuild.Transition, module, telemetrySnapshot)
-				if err != nil {
+				if err := InsertWorkspaceModule(ctx, db, job.ID, workspaceBuild.Transition, module, telemetrySnapshot); err != nil {
 					return xerrors.Errorf("insert provisioner job module: %w", err)
 				}
 			}
@@ -1681,8 +1680,7 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
 				slog.F("module_source", module.Source),
 			)
 
-			err = InsertWorkspaceModule(ctx, s.Database, jobID, database.WorkspaceTransitionStart, module, telemetrySnapshot)
-			if err != nil {
+			if err := InsertWorkspaceModule(ctx, s.Database, jobID, database.WorkspaceTransitionStart, module, telemetrySnapshot); err != nil {
 				return nil, xerrors.Errorf("insert module: %w", err)
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -1489,8 +1489,7 @@ func (s server) CompleteJob(ctx context.Context, completed proto.CompletedJob)`
`1489`	`1489`	`}`
`1490`	`1490`	`}`
`1491`	`1491`	`for _, module := range jobType.WorkspaceBuild.Modules {`
`1492`		`- err = InsertWorkspaceModule(ctx, db, job.ID, workspaceBuild.Transition, module, telemetrySnapshot)`
`1493`		`- if err != nil {`
	`1492`	`+ if err := InsertWorkspaceModule(ctx, db, job.ID, workspaceBuild.Transition, module, telemetrySnapshot); err != nil {`
`1494`	`1493`	`return xerrors.Errorf("insert provisioner job module: %w", err)`
`1495`	`1494`	`}`
`1496`	`1495`	`}`
`@@ -1681,8 +1680,7 @@ func (s server) CompleteJob(ctx context.Context, completed proto.CompletedJob)`
`1681`	`1680`	`slog.F("module_source", module.Source),`
`1682`	`1681`	`)`
`1683`	`1682`
`1684`		`- err = InsertWorkspaceModule(ctx, s.Database, jobID, database.WorkspaceTransitionStart, module, telemetrySnapshot)`
`1685`		`- if err != nil {`
	`1683`	`+ if err := InsertWorkspaceModule(ctx, s.Database, jobID, database.WorkspaceTransitionStart, module, telemetrySnapshot); err != nil {`
`1686`	`1684`	`return nil, xerrors.Errorf("insert module: %w", err)`
`1687`	`1685`	`}`
`1688`	`1686`	`}`