From 8c1a69aa0a0b09c41bd93864ee3264b7205f9c3f Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 18 Jun 2014 16:49:34 -0700
Subject: [PATCH] rpc: implement Apply

---
 rpc/resource_provider.go      | 41 +++++++++++++++++++++++++++++++++++
 rpc/resource_provider_test.go | 31 ++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/rpc/resource_provider.go b/rpc/resource_provider.go
index 8ab0471d2..bbcabf06c 100644
--- a/rpc/resource_provider.go
+++ b/rpc/resource_provider.go
@@ -48,6 +48,26 @@ func (p *ResourceProvider) Configure(c *terraform.ResourceConfig) error {
 	return err
 }
 
+func (p *ResourceProvider) Apply(
+	s *terraform.ResourceState,
+	d *terraform.ResourceDiff) (*terraform.ResourceState, error) {
+	var resp ResourceProviderApplyResponse
+	args := &ResourceProviderApplyArgs{
+		State: s,
+		Diff:  d,
+	}
+
+	err := p.Client.Call(p.Name+".Apply", args, &resp)
+	if err != nil {
+		return nil, err
+	}
+	if resp.Error != nil {
+		err = resp.Error
+	}
+
+	return resp.State, err
+}
+
 func (p *ResourceProvider) Diff(
 	s *terraform.ResourceState,
 	c *terraform.ResourceConfig) (*terraform.ResourceDiff, error) {
@@ -89,6 +109,16 @@ type ResourceProviderConfigureResponse struct {
 	Error *BasicError
 }
 
+type ResourceProviderApplyArgs struct {
+	State *terraform.ResourceState
+	Diff  *terraform.ResourceDiff
+}
+
+type ResourceProviderApplyResponse struct {
+	State *terraform.ResourceState
+	Error *BasicError
+}
+
 type ResourceProviderDiffArgs struct {
 	State  *terraform.ResourceState
 	Config *terraform.ResourceConfig
@@ -133,6 +163,17 @@ func (s *ResourceProviderServer) Configure(
 	return nil
 }
 
+func (s *ResourceProviderServer) Apply(
+	args *ResourceProviderApplyArgs,
+	result *ResourceProviderApplyResponse) error {
+	state, err := s.Provider.Apply(args.State, args.Diff)
+	*result = ResourceProviderApplyResponse{
+		State: state,
+		Error: NewBasicError(err),
+	}
+	return nil
+}
+
 func (s *ResourceProviderServer) Diff(
 	args *ResourceProviderDiffArgs,
 	result *ResourceProviderDiffResponse) error {
diff --git a/rpc/resource_provider_test.go b/rpc/resource_provider_test.go
index 8866efe30..802b18192 100644
--- a/rpc/resource_provider_test.go
+++ b/rpc/resource_provider_test.go
@@ -92,6 +92,37 @@ func TestResourceProvider_configure_warnings(t *testing.T) {
 	}
 }
 
+func TestResourceProvider_apply(t *testing.T) {
+	p := new(terraform.MockResourceProvider)
+	client, server := testClientServer(t)
+	name, err := Register(server, p)
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+	provider := &ResourceProvider{Client: client, Name: name}
+
+	p.ApplyReturn = &terraform.ResourceState{
+		ID: "bob",
+	}
+
+	// Apply
+	state := &terraform.ResourceState{}
+	diff := &terraform.ResourceDiff{}
+	newState, err := provider.Apply(state, diff)
+	if !p.ApplyCalled {
+		t.Fatal("apply should be called")
+	}
+	if !reflect.DeepEqual(p.ApplyDiff, diff) {
+		t.Fatalf("bad: %#v", p.ApplyDiff)
+	}
+	if err != nil {
+		t.Fatalf("bad: %#v", err)
+	}
+	if !reflect.DeepEqual(p.ApplyReturn, newState) {
+		t.Fatalf("bad: %#v", newState)
+	}
+}
+
 func TestResourceProvider_diff(t *testing.T) {
 	p := new(terraform.MockResourceProvider)
 	client, server := testClientServer(t)