Typo fixes

Author: calind

pkg/controller/controllerutil/controllerutil.go

@@ -26,8 +26,8 @@ import (
 )
 
 // AlreadyOwnedError is an error returned if the object you are trying to assign
-// an controller reference is already owned by another controller
-// Object is the subject and Owner is the reference for the current owner
+// a controller reference is already owned by another controller Object is the
+// subject and Owner is the reference for the current owner
 type AlreadyOwnedError struct {
 	Object v1.Object
 	Owner  v1.OwnerReference
@@ -37,8 +37,7 @@ func (e *AlreadyOwnedError) Error() string {
 	return fmt.Sprintf("Object %s/%s is already owned by another %s controller %s", e.Object.GetNamespace(), e.Object.GetName(), e.Owner.Kind, e.Owner.Name)
 }
 
-// NewAlreadyOwnedError creates a new AlreadyOwnedError
-func NewAlreadyOwnedError(Object v1.Object, Owner v1.OwnerReference) *AlreadyOwnedError {
+func newAlreadyOwnedError(Object v1.Object, Owner v1.OwnerReference) *AlreadyOwnedError {
 	return &AlreadyOwnedError{
 		Object: Object,
 		Owner:  Owner,
@@ -67,10 +66,10 @@ func SetControllerReference(owner, object v1.Object, scheme *runtime.Scheme) err
 	existingRefs := object.GetOwnerReferences()
 	fi := -1
 	for i, r := range existingRefs {
-		if sameOwnerReference(ref, r) {
+		if referSameObject(ref, r) {
 			fi = i
 		} else if r.Controller != nil && *r.Controller {
-			return NewAlreadyOwnedError(object, r)
+			return newAlreadyOwnedError(object, r)
 		}
 	}
 	if fi == -1 {
@@ -85,7 +84,7 @@ func SetControllerReference(owner, object v1.Object, scheme *runtime.Scheme) err
 }
 
 // Returns true if a and b point to the same object
-func sameOwnerReference(a, b v1.OwnerReference) bool {
+func referSameObject(a, b v1.OwnerReference) bool {
 	aGV, err := schema.ParseGroupVersion(a.APIVersion)
 	if err != nil {
 		return false

pkg/controller/controllerutil/controllerutil_test.go

@@ -59,9 +59,10 @@ var _ = Describe("Controllerutil", func() {
 			rs := &appsv1.ReplicaSet{ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "default", OwnerReferences: rsOwners}}
 			dep := &extensionsv1beta1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "default", UID: "foo-uid"}}
 
-			Expect(controllerutil.SetControllerReference(dep, rs, scheme.Scheme)).To(MatchError(
-				controllerutil.NewAlreadyOwnedError(rs, rsOwners[0]),
-			))
+			err := controllerutil.SetControllerReference(dep, rs, scheme.Scheme)
+
+			Expect(err).To(HaveOccurred())
+			Expect(err).To(BeAssignableToTypeOf(&controllerutil.AlreadyOwnedError{}))
 		})
 
 		It("should not duplicate existing owner reference", func() {