From cd74d7f0ef2895ac48816ac866db7c6671717eb0 Mon Sep 17 00:00:00 2001
From: Jim <jlambert@hashicorp.com>
Date: Mon, 11 May 2020 14:11:21 -0400
Subject: [PATCH] refactor ClonableResource to just be a clonable interface
 (#40)

---
 internal/iam/repository.go | 12 ++++++------
 internal/iam/scope.go      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/internal/iam/repository.go b/internal/iam/repository.go
index d46bed2dc..14fe59df4 100644
--- a/internal/iam/repository.go
+++ b/internal/iam/repository.go
@@ -41,7 +41,7 @@ func (r *Repository) create(ctx context.Context, resource Resource, opt ...Optio
 	if resource == nil {
 		return nil, errors.New("error creating resource that is nil")
 	}
-	resourceCloner, ok := resource.(ClonableResource)
+	resourceCloner, ok := resource.(Clonable)
 	if !ok {
 		return nil, errors.New("error resource is not clonable for create")
 	}
@@ -51,7 +51,7 @@ func (r *Repository) create(ctx context.Context, resource Resource, opt ...Optio
 	}
 	metadata["op-type"] = []string{strconv.Itoa(int(oplog.OpType_OP_TYPE_CREATE))}
 
-	var returnedResource Resource
+	var returnedResource interface{}
 	_, err = r.writer.DoTx(
 		ctx,
 		db.StdRetryCnt,
@@ -65,7 +65,7 @@ func (r *Repository) create(ctx context.Context, resource Resource, opt ...Optio
 			)
 		},
 	)
-	return returnedResource, err
+	return returnedResource.(Resource), err
 }
 
 // Update will update an iam resource in the db repository with an oplog entry
@@ -73,7 +73,7 @@ func (r *Repository) update(ctx context.Context, resource Resource, fieldMaskPat
 	if resource == nil {
 		return nil, errors.New("error updating resource that is nil")
 	}
-	resourceCloner, ok := resource.(ClonableResource)
+	resourceCloner, ok := resource.(Clonable)
 	if !ok {
 		return nil, errors.New("error resource is not clonable for update")
 	}
@@ -83,7 +83,7 @@ func (r *Repository) update(ctx context.Context, resource Resource, fieldMaskPat
 	}
 	metadata["op-type"] = []string{strconv.Itoa(int(oplog.OpType_OP_TYPE_UPDATE))}
 
-	var returnedResource Resource
+	var returnedResource interface{}
 	_, err = r.writer.DoTx(
 		ctx,
 		db.StdRetryCnt,
@@ -98,7 +98,7 @@ func (r *Repository) update(ctx context.Context, resource Resource, fieldMaskPat
 			)
 		},
 	)
-	return returnedResource, err
+	return returnedResource.(Resource), err
 }
 
 func (r *Repository) stdMetadata(ctx context.Context, resource Resource) (oplog.Metadata, error) {
diff --git a/internal/iam/scope.go b/internal/iam/scope.go
index 4c7bcc3c3..061347067 100644
--- a/internal/iam/scope.go
+++ b/internal/iam/scope.go
@@ -37,7 +37,7 @@ type Scope struct {
 	tableName string `gorm:"-"`
 }
 
-// ensure that Scope implements the interfaces of: Resource, ClonableResource, and db.VetForWriter
+// ensure that Scope implements the interfaces of: Resource, Clonable, and db.VetForWriter
 var _ Resource = (*Scope)(nil)
 var _ db.VetForWriter = (*Scope)(nil)
 var _ Clonable = (*Scope)(nil)