rearrange interfaces and structs

drlau · Jan 30, 2021 · 41f64a9 · 41f64a9
1 parent b69a737
commit 41f64a9
Show file tree

Hide file tree

Showing 18 changed files with 473 additions and 563 deletions.
diff --git a/cmd/akashi_test.go b/cmd/akashi_test.go
@@ -8,7 +8,6 @@ import (
 	"github.com/drlau/akashi/pkg/compare"
 	comparefakes "github.com/drlau/akashi/pkg/compare/fakes"
 	"github.com/drlau/akashi/pkg/plan"
-	planfakes "github.com/drlau/akashi/pkg/plan/fakes"
 )
 
 func TestRunCompare(t *testing.T) {
@@ -24,7 +23,7 @@ func TestRunCompare(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					CreateReturns: true,
 					NameReturns:   "name",
 					TypeReturns:   "type",
@@ -39,7 +38,7 @@ func TestRunCompare(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					CreateReturns: true,
 					NameReturns:   "name",
 					TypeReturns:   "type",
@@ -54,7 +53,7 @@ func TestRunCompare(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					NameReturns: "name",
 					TypeReturns: "type",
 				},
@@ -68,12 +67,12 @@ func TestRunCompare(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					CreateReturns: true,
 					NameReturns:   "name",
 					TypeReturns:   "type",
 				},
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					CreateReturns: true,
 					NameReturns:   "name",
 					TypeReturns:   "type",
@@ -91,12 +90,12 @@ func TestRunCompare(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					CreateReturns: true,
 					NameReturns:   "name",
 					TypeReturns:   "type",
 				},
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					DeleteReturns: true,
 					NameReturns:   "name",
 					TypeReturns:   "type",
@@ -134,7 +133,7 @@ func TestRunDiff(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					CreateReturns:  true,
 					AddressReturns: "address",
 					NameReturns:    "name",
@@ -152,7 +151,7 @@ func TestRunDiff(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					CreateReturns:  true,
 					AddressReturns: "address",
 					NameReturns:    "name",
@@ -169,7 +168,7 @@ func TestRunDiff(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					AddressReturns: "address",
 					NameReturns:    "name",
 					TypeReturns:    "type",
@@ -186,7 +185,7 @@ func TestRunDiff(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					AddressReturns: "address",
 					NameReturns:    "name",
 					TypeReturns:    "type",
@@ -206,13 +205,13 @@ func TestRunDiff(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					CreateReturns:  true,
 					AddressReturns: "address1",
 					NameReturns:    "name",
 					TypeReturns:    "type",
 				},
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					CreateReturns:  true,
 					AddressReturns: "address2",
 					NameReturns:    "name",
@@ -234,13 +233,13 @@ func TestRunDiff(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					CreateReturns:  true,
 					AddressReturns: "address1",
 					NameReturns:    "name",
 					TypeReturns:    "type",
 				},
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					DeleteReturns:  true,
 					AddressReturns: "address2",
 					NameReturns:    "name",
@@ -262,13 +261,13 @@ func TestRunDiff(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					CreateReturns:  true,
 					AddressReturns: "address1",
 					NameReturns:    "name",
 					TypeReturns:    "type",
 				},
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					DeleteReturns:  true,
 					AddressReturns: "address2",
 					NameReturns:    "name",
@@ -293,13 +292,13 @@ func TestRunDiff(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					CreateReturns:  true,
 					AddressReturns: "address1",
 					NameReturns:    "name",
 					TypeReturns:    "type",
 				},
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					DeleteReturns:  true,
 					AddressReturns: "address2",
 					NameReturns:    "name",

diff --git a/pkg/cmd/compare/compare_test.go b/pkg/cmd/compare/compare_test.go
@@ -6,7 +6,6 @@ import (
 	"github.com/drlau/akashi/pkg/compare"
 	comparefakes "github.com/drlau/akashi/pkg/compare/fakes"
 	"github.com/drlau/akashi/pkg/plan"
-	planfakes "github.com/drlau/akashi/pkg/plan/fakes"
 )
 
 func TestRunCompare(t *testing.T) {
@@ -22,7 +21,7 @@ func TestRunCompare(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					CreateReturns: true,
 					NameReturns:   "name",
 					TypeReturns:   "type",
@@ -37,7 +36,7 @@ func TestRunCompare(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					CreateReturns: true,
 					NameReturns:   "name",
 					TypeReturns:   "type",
@@ -52,7 +51,7 @@ func TestRunCompare(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					NameReturns: "name",
 					TypeReturns: "type",
 				},
@@ -66,12 +65,12 @@ func TestRunCompare(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					CreateReturns: true,
 					NameReturns:   "name",
 					TypeReturns:   "type",
 				},
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					CreateReturns: true,
 					NameReturns:   "name",
 					TypeReturns:   "type",
@@ -89,12 +88,12 @@ func TestRunCompare(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					CreateReturns: true,
 					NameReturns:   "name",
 					TypeReturns:   "type",
 				},
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					DeleteReturns: true,
 					NameReturns:   "name",
 					TypeReturns:   "type",

diff --git a/pkg/cmd/diff/diff_test.go b/pkg/cmd/diff/diff_test.go
@@ -8,7 +8,6 @@ import (
 	"github.com/drlau/akashi/pkg/compare"
 	comparefakes "github.com/drlau/akashi/pkg/compare/fakes"
 	"github.com/drlau/akashi/pkg/plan"
-	planfakes "github.com/drlau/akashi/pkg/plan/fakes"
 )
 
 func TestRunDiff(t *testing.T) {
@@ -27,7 +26,7 @@ func TestRunDiff(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					CreateReturns:  true,
 					AddressReturns: "address",
 					NameReturns:    "name",
@@ -46,7 +45,7 @@ func TestRunDiff(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					CreateReturns:  true,
 					AddressReturns: "address",
 					NameReturns:    "name",
@@ -64,7 +63,7 @@ func TestRunDiff(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					AddressReturns: "address",
 					NameReturns:    "name",
 					TypeReturns:    "type",
@@ -82,7 +81,7 @@ func TestRunDiff(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					AddressReturns: "address",
 					NameReturns:    "name",
 					TypeReturns:    "type",
@@ -102,13 +101,13 @@ func TestRunDiff(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					CreateReturns:  true,
 					AddressReturns: "address1",
 					NameReturns:    "name",
 					TypeReturns:    "type",
 				},
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					CreateReturns:  true,
 					AddressReturns: "address2",
 					NameReturns:    "name",
@@ -131,13 +130,13 @@ func TestRunDiff(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					CreateReturns:  true,
 					AddressReturns: "address1",
 					NameReturns:    "name",
 					TypeReturns:    "type",
 				},
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					DeleteReturns:  true,
 					AddressReturns: "address2",
 					NameReturns:    "name",
@@ -160,13 +159,13 @@ func TestRunDiff(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					CreateReturns:  true,
 					AddressReturns: "address1",
 					NameReturns:    "name",
 					TypeReturns:    "type",
 				},
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					DeleteReturns:  true,
 					AddressReturns: "address2",
 					NameReturns:    "name",
@@ -191,13 +190,13 @@ func TestRunDiff(t *testing.T) {
 				},
 			},
 			resourceChange: []plan.ResourceChange{
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					CreateReturns:  true,
 					AddressReturns: "address1",
 					NameReturns:    "name",
 					TypeReturns:    "type",
 				},
-				&planfakes.FakeResourceChange{
+				&comparefakes.FakeResourceChange{
 					DeleteReturns:  true,
 					AddressReturns: "address2",
 					NameReturns:    "name",

diff --git a/pkg/compare/compare.go b/pkg/compare/compare.go
@@ -1,10 +1,38 @@
 package compare
 
 import (
+	"fmt"
+
 	"github.com/drlau/akashi/pkg/plan"
+	"github.com/drlau/akashi/pkg/resource"
 )
 
+type ResourceChange interface {
+	IsCreate() bool
+	IsDelete() bool
+	IsNoOp() bool
+	IsUpdate() bool
+	GetBefore() map[string]interface{}
+	GetAfter() map[string]interface{}
+	GetBeforeChangedOnly() map[string]interface{}
+	GetAfterChangedOnly() map[string]interface{}
+	GetComputed() map[string]interface{}
+	GetName() string
+	GetType() string
+	GetAddress() string
+}
+
+type Resource interface {
+	CompareResult(map[string]interface{}) *resource.CompareResult
+	Compare(resource.ResourceValues) bool
+	Diff(resource.ResourceValues) string
+}
+
 type Comparer interface {
 	Compare(plan.ResourceChange) bool
 	Diff(plan.ResourceChange) (string, bool)
 }
+
+func constructNameTypeKey(r ResourceChange) string {
+	return fmt.Sprintf("%s.%s", r.GetType(), r.GetName())
+}