hash: update hash encoding

the rand.SafeEncodeString doesn't add any value for a hash, and just
makes the encoded version longer

Author: ecordell

component/ensure_component_test.go

@@ -2,6 +2,7 @@ package component
 
 import (
 	"context"
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -78,7 +79,7 @@ func TestEnsureServiceHandler(t *testing.T) {
 						"example.com/component": "the-main-service-component",
 					},
 					Annotations: map[string]string{
-						hashKey: "n55dh7ch6bh5c4h75h68bh644hcfq",
+						hashKey: "76251aaa1ff6c84f",
 					},
 				}},
 			},
@@ -93,7 +94,7 @@ func TestEnsureServiceHandler(t *testing.T) {
 						"example.com/component": "the-main-service-component",
 					},
 					Annotations: map[string]string{
-						hashKey: "n55dh7ch6bh5c4h75h68bh644hcfq",
+						hashKey: "76251aaa1ff6c84f",
 					},
 				},
 			}, &corev1.Service{ObjectMeta: metav1.ObjectMeta{
@@ -145,8 +146,9 @@ func TestEnsureServiceHandler(t *testing.T) {
 					hash.NewObjectHash(), hashKey),
 				ctxOwner,
 				queueOps,
-				func(_ context.Context, _ *applycorev1.ServiceApplyConfiguration) (*corev1.Service, error) {
+				func(_ context.Context, sac *applycorev1.ServiceApplyConfiguration) (*corev1.Service, error) {
 					applyCalled = true
+					fmt.Print(sac.Annotations)
 					return nil, nil
 				},
 				func(_ context.Context, _ types.NamespacedName) error {

fileinformer/file_informer_test.go

@@ -46,7 +46,7 @@ func TestFileInformer(t *testing.T) {
 	require.Len(t, eventHandlers.Calls, 1)
 	eventHandlers.Unlock()
 	eventHandlers2.Lock()
-	require.Len(t, len(eventHandlers2.Calls), 1)
+	require.Len(t, eventHandlers2.Calls, 1)
 	eventHandlers2.Unlock()
 
 	// expect an OnAdd when the file is written

hash/hash.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/cespare/xxhash/v2"
 	"github.com/davecgh/go-spew/spew"
-	"k8s.io/apimachinery/pkg/util/rand"
 )
 
 type (
@@ -71,7 +70,7 @@ func SecureObject(obj interface{}) string {
 	// xxhash's hasher.Write never returns an error, so we can safely ignore
 	// the error here tpp
 	_, _ = xxhasher.Write(hasher.Sum(nil))
-	return rand.SafeEncodeString(fmt.Sprint(string(xxhasher.Sum(nil))))
+	return fmt.Sprintf("%x", xxhasher.Sum64())
 }
 
 // SecureEqual compares hashes safely
@@ -92,7 +91,7 @@ func Object(obj interface{}) string {
 	// xxhash's hasher.Write never returns an error, and Fprintf just passes up
 	// the underlying Write call's error, so we can safely ignore the error here
 	_, _ = printer.Fprintf(hasher, "%#v", obj)
-	return rand.SafeEncodeString(fmt.Sprint(string(hasher.Sum(nil))))
+	return fmt.Sprintf("%x", hasher.Sum64())
 }
 
 // Equal compares hashes safely

hash/hash_test.go

@@ -13,7 +13,7 @@ func ExampleObject() {
 		},
 	}
 	hash := Object(configmap)
-	fmt.Println(Equal(hash, "n688h54h56ch64bh677h55fh648hddq"))
+	fmt.Println(Equal(hash, "f40a7fcee977cc58"))
 	// Output: true
 }
 
@@ -24,6 +24,6 @@ func ExampleSecureObject() {
 		},
 	}
 	hash := SecureObject(secret)
-	fmt.Println(SecureEqual(hash, "n665hb8h667h68hfbhffh669h54dq"))
+	fmt.Println(SecureEqual(hash, "dd40df186063e16c"))
 	// Output: true
 }