Fix StopProvider RPC function call in v6 (#301)

austinvalle · web-flow · commit 9d4afbce62c7 · 2023-06-16T15:48:25.000-04:00
* Fix StopProvider RPC function call in v6

* add changelog entry
diff --git a/.changes/unreleased/BUG FIXES-20230616-153754.yaml b/.changes/unreleased/BUG FIXES-20230616-153754.yaml
@@ -0,0 +1,5 @@
+kind: BUG FIXES
+body: 'tfprotov6/tf6server: Ensure interrupts route to StopProvider RPC'
+time: 2023-06-16T15:37:54.001208-04:00
+custom:
+  Issue: "301"
diff --git a/tfprotov6/tf6server/server.go b/tfprotov6/tf6server/server.go
@@ -581,7 +581,7 @@ func (s *server) stop() {
 	s.stopCh = make(chan struct{})
 }
 
-func (s *server) Stop(ctx context.Context, req *tfplugin6.StopProvider_Request) (*tfplugin6.StopProvider_Response, error) {
+func (s *server) StopProvider(ctx context.Context, req *tfplugin6.StopProvider_Request) (*tfplugin6.StopProvider_Response, error) {
 	rpc := "StopProvider"
 	ctx = s.loggingContext(ctx)
 	ctx = logging.RpcContext(ctx, rpc)

Original file line number	Diff line number	Diff line change
`@@ -581,7 +581,7 @@ func (s *server) stop() {`
`581`	`581`	`s.stopCh = make(chan struct{})`
`582`	`582`	`}`
`583`	`583`
`584`		`-func (s server) Stop(ctx context.Context, req tfplugin6.StopProvider_Request) (*tfplugin6.StopProvider_Response, error) {`
	`584`	`+func (s server) StopProvider(ctx context.Context, req tfplugin6.StopProvider_Request) (*tfplugin6.StopProvider_Response, error) {`
`585`	`585`	`rpc := "StopProvider"`
`586`	`586`	`ctx = s.loggingContext(ctx)`
`587`	`587`	`ctx = logging.RpcContext(ctx, rpc)`