shuffle

pkg/annotations.go

@@ -1,8 +1,6 @@
 package pkg
 
 import (
-	"crypto/sha1"
-	"encoding/hex"
 	"fmt"
 	"os"
 	"strconv"
@@ -256,10 +254,3 @@ func (cronitorParser CronitorConfigParser) GetGraceSeconds() int {
 	}
 	return -1
 }
-
-func generateHashFromName(name string) string {
-	h := sha1.New()
-	h.Write([]byte(name))
-	bs := h.Sum(nil)
-	return hex.EncodeToString(bs)
-}

pkg/annotations_test.go

@@ -70,7 +70,7 @@ func TestGetCronitorID(t *testing.T) {
 			name:                  "hashed name as ID",
 			annotationIDInference: "name",
 			annotationCronitorID:  "",
-			expectedID:            "7bec37031fa63007a383ade88997bea5bba68d99",
+			expectedID:            "3278d16696a89a92d297b7c46bfd286b20dc3896",
 		},
 		{
 			name:                  "specific cronitor id",
@@ -111,19 +111,19 @@ func TestGetCronitorName(t *testing.T) {
 			name:                   "default behavior",
 			annotationNamePrefix:   "",
 			annotationCronitorName: "",
-			expectedName:           "default/name-test-cronjob",
+			expectedName:           "default/test-cronjob",
 		},
 		{
 			name:                   "no prefix for name",
 			annotationNamePrefix:   "none",
 			annotationCronitorName: "",
-			expectedName:           "name-test-cronjob",
+			expectedName:           "test-cronjob",
 		},
 		{
 			name:                   "explicit prefix of namespace",
 			annotationNamePrefix:   "namespace",
 			annotationCronitorName: "",
-			expectedName:           "default/name-test-cronjob",
+			expectedName:           "default/test-cronjob",
 		},
 		{
 			name:                   "specific cronitor name",

pkg/util.go

@@ -1,6 +1,8 @@
 package pkg
 
 import (
+	"crypto/sha1"
+	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"strings"
@@ -24,7 +26,7 @@ func CronJobFromAnnotations(annotations []Annotation) (v1.CronJob, error) {
 		"apiVersion": "batch/v1beta1",
 		"kind": "CronJob",
 		"metadata": {
-			"name": "name-test-cronjob",
+			"name": "test-cronjob",
 			"namespace": "default",
 			"annotations": {%s}
 		},
@@ -60,3 +62,10 @@ func CronJobFromAnnotations(annotations []Annotation) (v1.CronJob, error) {
 
 	return cronJob, err
 }
+
+func generateHashFromName(name string) string {
+	h := sha1.New()
+	h.Write([]byte(name))
+	bs := h.Sum(nil)
+	return hex.EncodeToString(bs)
+}