combine assignment and conditional

hugodutka · hugodutka · commit 73b22cf87518 · 2024-11-16T12:15:18.000Z
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -1261,8 +1261,7 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
 					slog.F("resource_type", resource.Type),
 					slog.F("transition", transition))
 
-				err = InsertWorkspaceResource(ctx, s.Database, jobID, transition, resource, telemetrySnapshot)
-				if err != nil {
+				if err := InsertWorkspaceResource(ctx, s.Database, jobID, transition, resource, telemetrySnapshot); err != nil {
 					return nil, xerrors.Errorf("insert resource: %w", err)
 				}
 			}
@@ -1279,8 +1278,7 @@ func (s *server) CompleteJob(ctx context.Context, completed *proto.CompletedJob)
 					slog.F("module_key", module.Key),
 					slog.F("transition", transition))
 
-				err = InsertWorkspaceModule(ctx, s.Database, jobID, transition, module, telemetrySnapshot)
-				if err != nil {
+				if err := InsertWorkspaceModule(ctx, s.Database, jobID, transition, module, telemetrySnapshot); err != nil {
 					return nil, xerrors.Errorf("insert module: %w", err)
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -1261,8 +1261,7 @@ func (s server) CompleteJob(ctx context.Context, completed proto.CompletedJob)`
`1261`	`1261`	`slog.F("resource_type", resource.Type),`
`1262`	`1262`	`slog.F("transition", transition))`
`1263`	`1263`
`1264`		`- err = InsertWorkspaceResource(ctx, s.Database, jobID, transition, resource, telemetrySnapshot)`
`1265`		`- if err != nil {`
	`1264`	`+ if err := InsertWorkspaceResource(ctx, s.Database, jobID, transition, resource, telemetrySnapshot); err != nil {`
`1266`	`1265`	`return nil, xerrors.Errorf("insert resource: %w", err)`
`1267`	`1266`	`}`
`1268`	`1267`	`}`
`@@ -1279,8 +1278,7 @@ func (s server) CompleteJob(ctx context.Context, completed proto.CompletedJob)`
`1279`	`1278`	`slog.F("module_key", module.Key),`
`1280`	`1279`	`slog.F("transition", transition))`
`1281`	`1280`
`1282`		`- err = InsertWorkspaceModule(ctx, s.Database, jobID, transition, module, telemetrySnapshot)`
`1283`		`- if err != nil {`
	`1281`	`+ if err := InsertWorkspaceModule(ctx, s.Database, jobID, transition, module, telemetrySnapshot); err != nil {`
`1284`	`1282`	`return nil, xerrors.Errorf("insert module: %w", err)`
`1285`	`1283`	`}`
`1286`	`1284`	`}`