packer/rpc: PostProcessor

packer/rpc/client.go

@@ -50,3 +50,9 @@ func (c *Client) Cache() packer.Cache {
 		client: c.client,
 	}
 }
+
+func (c *Client) PostProcessor() packer.PostProcessor {
+	return &postProcessor{
+		client: c.client,
+	}
+}

packer/rpc/post_processor_test.go

@@ -2,7 +2,6 @@ package rpc
 
 import (
 	"github.com/mitchellh/packer/packer"
-	"net/rpc"
 	"reflect"
 	"testing"
 )
@@ -35,20 +34,15 @@ func TestPostProcessorRPC(t *testing.T) {
 	p := new(TestPostProcessor)
 
 	// Start the server
-	server := rpc.NewServer()
-	RegisterPostProcessor(server, p)
-	address := serveSingleConn(server)
-
-	// Create the client over RPC and run some methods to verify it works
-	client, err := rpc.Dial("tcp", address)
-	if err != nil {
-		t.Fatalf("Error connecting to rpc: %s", err)
-	}
+	server := NewServer()
+	server.RegisterPostProcessor(p)
+	client := testClient(t, server)
+	defer client.Close()
+	ppClient := client.PostProcessor()
 
 	// Test Configure
 	config := 42
-	pClient := PostProcessor(client)
-	err = pClient.Configure(config)
+	err := ppClient.Configure(config)
 	if err != nil {
 		t.Fatalf("error: %s", err)
 	}
@@ -64,7 +58,7 @@ func TestPostProcessorRPC(t *testing.T) {
 	// Test PostProcess
 	a := new(packer.MockArtifact)
 	ui := new(testUi)
-	artifact, _, err := pClient.PostProcess(ui, a)
+	artifact, _, err := ppClient.PostProcess(ui, a)
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}

packer/rpc/server_new.go

@@ -32,6 +32,10 @@ func (s *Server) RegisterCache(c packer.Cache) {
 	s.registerComponent("Cache", &CacheServer{c}, false)
 }
 
+func (s *Server) RegisterPostProcessor(p packer.PostProcessor) {
+	s.registerComponent("PostProcessor", &PostProcessorServer{p}, false)
+}
+
 // ServeConn serves a single connection over the RPC server. It is up
 // to the caller to obtain a proper io.ReadWriteCloser.
 func (s *Server) ServeConn(conn io.ReadWriteCloser) {