aws-controllers-k8s
diff --git a/‎Makefile‎
Lines changed: 5 additions & 1 deletion b/‎Makefile‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎mocks/controller-runtime/pkg/client/client.go‎
Lines changed: 176 additions & 0 deletions b/‎mocks/controller-runtime/pkg/client/client.go‎
Lines changed: 176 additions & 0 deletions
diff --git a/‎mocks/controller-runtime/pkg/client/status_client.go‎
Lines changed: 29 additions & 0 deletions b/‎mocks/controller-runtime/pkg/client/status_client.go‎
Lines changed: 29 additions & 0 deletions
diff --git a/‎mocks/controller-runtime/pkg/client/status_writer.go‎
Lines changed: 60 additions & 0 deletions b/‎mocks/controller-runtime/pkg/client/status_writer.go‎
Lines changed: 60 additions & 0 deletions
diff --git a/‎pkg/compare/map.go‎
Lines changed: 13 additions & 0 deletions b/‎pkg/compare/map.go‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎pkg/compare/map_test.go‎
Lines changed: 38 additions & 0 deletions b/‎pkg/compare/map_test.go‎
Lines changed: 38 additions & 0 deletions
diff --git a/‎pkg/compare/meta.go‎
Lines changed: 47 additions & 0 deletions b/‎pkg/compare/meta.go‎
Lines changed: 47 additions & 0 deletions
@@ -4,7 +4,8 @@ GOPATH ?= "$(HOME)/go"
 GO111MODULE=on
 K8S_APIMACHINERY_VERSION = $(shell go list -m -f '{{ .Version }}' k8s.io/apimachinery)
 K8S_APIMACHINERY_DIR = "$(GOPATH)/pkg/mod/k8s.io/apimachinery@$(K8S_APIMACHINERY_VERSION)"
-
+CONTROLLER_RUNTIME_VERSION = $(shell go list -m -f '{{ .Version }}' sigs.k8s.io/controller-runtime)
+CONTROLLER_RUNTIME_DIR = "$(GOPATH)/pkg/mod/sigs.k8s.io/controller-runtime@$(CONTROLLER_RUNTIME_VERSION)"
 .PHONY: all test clean-mocks mocks
 
 all: test
@@ -31,6 +32,9 @@ mocks: install-mockery ## Build mocks
 	@echo -n "building mocks for k8s.io/apimachinery/runtime/schema ... "
 	@bin/mockery --quiet --name=ObjectKind --case=underscore --output=mocks/apimachinery/pkg/runtime/schema --dir="$(K8S_APIMACHINERY_DIR)/pkg/runtime/schema"
 	@echo "ok."
+	@echo -n "building mocks for sigs.k8s.io/controller-runtime/pkg/client ... "
+	@bin/mockery --quiet --name="(Client|Status)" --case=underscore --output=mocks/controller-runtime/pkg/client --dir="$(CONTROLLER_RUNTIME_DIR)/pkg/client"
+	@echo "ok."
 
 help:           ## Show this help.
 	@grep -F -h "##" $(MAKEFILE_LIST) | grep -F -v grep | sed -e 's/\\$$//' \
 
@@ -25,3 +25,16 @@ func MapStringStringPEqual(a, b map[string]*string) bool {
 	}
 	return true
 }
+
+// MapStringStringEqual returns true if the supplied maps are equal
+func MapStringStringEqual(a, b map[string]string) bool {
+	if len(a) != len(b) {
+		return false
+	}
+	for aKey, aVal := range a {
+		if bVal, ok := b[aKey]; !ok || bVal != aVal {
+			return false
+		}
+	}
+	return true
+}
@@ -55,3 +55,41 @@ func TestMapStringStringPEqual(t *testing.T) {
 	require.True(compare.MapStringStringPEqual(ab, ba))
 	require.True(compare.MapStringStringPEqual(ab, abc))
 }
+
+func TestMapStringStringEqual(t *testing.T) {
+	require := require.New(t)
+
+	aStr := "a"
+	bStr := "b"
+
+	empty := map[string]string{}
+	a := map[string]string{
+		"a": aStr,
+	}
+	ac := map[string]string{
+		"a": aStr,
+	}
+	b := map[string]string{
+		"b": bStr,
+	}
+	ab := map[string]string{
+		"a": aStr, "b": bStr,
+	}
+	abc := map[string]string{
+		"a": aStr, "b": bStr,
+	}
+	ba := map[string]string{
+		"b": bStr, "a": aStr,
+	}
+
+	require.False(compare.MapStringStringEqual(a, empty))
+	require.False(compare.MapStringStringEqual(empty, a))
+	require.False(compare.MapStringStringEqual(a, nil))
+	require.False(compare.MapStringStringEqual(nil, a))
+	require.True(compare.MapStringStringEqual(nil, nil))
+	require.False(compare.MapStringStringEqual(a, b))
+	require.False(compare.MapStringStringEqual(b, a))
+	require.True(compare.MapStringStringEqual(a, ac))
+	require.True(compare.MapStringStringEqual(ab, ba))
+	require.True(compare.MapStringStringEqual(ab, abc))
+}
@@ -0,0 +1,47 @@
+// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"). You may
+// not use this file except in compliance with the License. A copy of the
+// License is located at
+//
+//     http://aws.amazon.com/apache2.0/
+//
+// or in the "license" file accompanying this file. This file is distributed
+// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+// express or implied. See the License for the specific language governing
+// permissions and limitations under the License.
+
+package compare
+
+import (
+	"encoding/json"
+
+	k8smetav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// MetaV1ObjectEqual returns true if the supplied k8s.io/apimachinery/pkg/apis/meta/v1.Object
+// have equal values.
+func MetaV1ObjectEqual(a, b k8smetav1.Object) (bool, error) {
+	// If both parameters are nil, return true
+	if IsNil(a) && IsNil(b) {
+		return true, nil
+	}
+
+	// If only one parameter is nil, return false
+	if HasNilDifference(a, b) {
+		return false, nil
+	}
+
+	// Marshall both objects and compare for equality
+	aBytes, err := json.Marshal(a)
+	if err != nil {
+		return false, err
+	}
+
+	bBytes, err := json.Marshal(b)
+	if err != nil {
+		return false, err
+	}
+
+	return string(aBytes) == string(bBytes), nil
+}