Fix cancel error check

kylecarbs · kylecarbs · commit dac812d7c216 · 2022-02-27T23:30:34.000Z
diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go
@@ -449,6 +449,7 @@ func (server *provisionerdServer) FailJob(ctx context.Context, failJob *proto.Fa
 		if err != nil {
 			return nil, xerrors.Errorf("update workspace history state: %w", err)
 		}
+	case *proto.FailedJob_ProjectImport_:
 	}
 	return &proto.Empty{}, nil
 }
diff --git a/provisioner/terraform/serve.go b/provisioner/terraform/serve.go
@@ -62,7 +62,7 @@ type terraform struct {
 }
 
 // Shutdown signals to begin graceful shutdown of any running operations.
-func (t *terraform) Shutdown(ctx context.Context, _ *proto.Empty) (*proto.Empty, error) {
+func (t *terraform) Shutdown(_ context.Context, _ *proto.Empty) (*proto.Empty, error) {
 	t.shutdownCancel()
 	return &proto.Empty{}, nil
 }
diff --git a/provisionerd/provisionerd_test.go b/provisionerd/provisionerd_test.go
@@ -399,15 +399,13 @@ func TestProvisionerd(t *testing.T) {
 		}, provisionerd.Provisioners{
 			"someprovisioner": createProvisionerClient(t, provisionerTestServer{
 				provision: func(request *sdkproto.Provision_Request, stream sdkproto.DRPCProvisioner_ProvisionStream) error {
-					err := stream.Send(&sdkproto.Provision_Response{
+					return stream.Send(&sdkproto.Provision_Response{
 						Type: &sdkproto.Provision_Response_Complete{
 							Complete: &sdkproto.Provision_Complete{
 								Error: "some error",
 							},
 						},
 					})
-					require.NoError(t, err)
-					return nil
 				},
 			}),
 		})

Original file line number	Diff line number	Diff line change
`@@ -449,6 +449,7 @@ func (server provisionerdServer) FailJob(ctx context.Context, failJob proto.Fa`
`449`	`449`	`if err != nil {`
`450`	`450`	`return nil, xerrors.Errorf("update workspace history state: %w", err)`
`451`	`451`	`}`
	`452`	`+ case *proto.FailedJob_ProjectImport_:`
`452`	`453`	`}`
`453`	`454`	`return &proto.Empty{}, nil`
`454`	`455`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ type terraform struct {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`// Shutdown signals to begin graceful shutdown of any running operations.`
`65`		`-func (t terraform) Shutdown(ctx context.Context, _ proto.Empty) (*proto.Empty, error) {`
	`65`	`+func (t terraform) Shutdown(_ context.Context, _ proto.Empty) (*proto.Empty, error) {`
`66`	`66`	`t.shutdownCancel()`
`67`	`67`	`return &proto.Empty{}, nil`
`68`	`68`	`}`