Merge pull request #252 from openshift-cherrypick-robot/cherry-pick-2…

…51-to-release-4.18 DFBUGS-961: [release-4.18] Fix the length of generated OBC bucket name
red-hat-storage · Dec 19, 2024 · 6c85be5 · 6c85be5
2 parents f93c6bd + ca5730a
commit 6c85be5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/controllers/utils/hash.go b/controllers/utils/hash.go
@@ -77,7 +77,7 @@ func GenerateUniqueIdForMirrorPeer(mirrorPeer multiclusterv1alpha1.MirrorPeer, h
 		checksum = sha1.Sum([]byte(peerAccumulator))
 	}
 	// truncate to bucketGenerateName + "-" + first 12 (out of 20) byte representations of sha1 checksum
-	return hex.EncodeToString(checksum[:])[0 : len(BucketGenerateName)+1+12]
+	return hex.EncodeToString(checksum[:])
 }
 
 func GetKey(clusterName, clientName string) string {

diff --git a/controllers/utils/s3.go b/controllers/utils/s3.go
@@ -53,7 +53,7 @@ func GetEnv(key, defaultValue string) string {
 func GenerateBucketName(mirrorPeer multiclusterv1alpha1.MirrorPeer, hasStorageClientRef bool) string {
 	mirrorPeerId := GenerateUniqueIdForMirrorPeer(mirrorPeer, hasStorageClientRef)
 	bucketGenerateName := BucketGenerateName
-	return fmt.Sprintf("%s-%s", bucketGenerateName, mirrorPeerId)
+	return fmt.Sprintf("%s-%s", bucketGenerateName, mirrorPeerId)[0 : len(BucketGenerateName)+1+12]
 }
 
 func CreateOrUpdateObjectBucketClaim(ctx context.Context, c client.Client, bucketName, bucketNamespace string, annotations map[string]string) (controllerutil.OperationResult, error) {