From 9f971733711aaf0895a8bb445161090f52d49557 Mon Sep 17 00:00:00 2001
From: Adrien Delorme <adrien.delorme@icloud.com>
Date: Mon, 5 Oct 2020 14:27:55 +0200
Subject: [PATCH] PostProcessorServer.PostProcess: don't close the artifact we
 are serving

Sometimes, the artifact returned by PostProcess is the artifact from client.Artifact() and in that case we don't want to close client; otherwise the outcome is sort of undetermined. See #9995 for a good test file.

fix #9995
---
 packer/rpc/post_processor.go | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/packer/rpc/post_processor.go b/packer/rpc/post_processor.go
index 4b36f2dd4..00d492a0a 100644
--- a/packer/rpc/post_processor.go
+++ b/packer/rpc/post_processor.go
@@ -99,28 +99,42 @@ func (p *PostProcessorServer) PostProcess(streamId uint32, reply *PostProcessorP
 	if err != nil {
 		return NewBasicError(err)
 	}
-	defer client.Close()
 
 	if p.context == nil {
 		p.context, p.contextCancel = context.WithCancel(context.Background())
 	}
 
-	streamId = 0
-	artifactResult, keep, forceOverride, err := p.p.PostProcess(p.context, client.Ui(), client.Artifact())
-	if err == nil && artifactResult != nil {
-		streamId = p.mux.NextId()
-		server := newServerWithMux(p.mux, streamId)
-		server.RegisterArtifact(artifactResult)
-		go server.Serve()
-	}
-
+	artifact := client.Artifact()
+	artifactResult, keep, forceOverride, err := p.p.PostProcess(p.context, client.Ui(), artifact)
 	*reply = PostProcessorProcessResponse{
 		Err:           NewBasicError(err),
 		Keep:          keep,
 		ForceOverride: forceOverride,
-		StreamId:      streamId,
+		StreamId:      0,
+	}
+	if err != nil {
+		log.Printf("error: %v", err)
+		client.Close()
+		return nil
 	}
 
+	if artifactResult != artifact {
+		// Sometimes, the artifact returned by PostProcess is the artifact from
+		// client.Artifact() and in that case we don't want to close client;
+		// otherwise the outcome is sort of undetermined. See [GH-9995] for a
+		// good test file.
+		defer client.Close()
+	}
+
+	if artifactResult != nil {
+		streamId = p.mux.NextId()
+		reply.StreamId = streamId
+		server := newServerWithMux(p.mux, streamId)
+		if err := server.RegisterArtifact(artifactResult); err != nil {
+			return err
+		}
+		go server.Serve()
+	}
 	return nil
 }