From f511248ede8d13b89514049b17fc39ea15cb39ff Mon Sep 17 00:00:00 2001 From: AJ ONeal Date: Wed, 17 Mar 2021 11:26:55 -0600 Subject: [PATCH] truncate Rev ID to 7 characters consistently --- internal/webhooks/webhooks.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/internal/webhooks/webhooks.go b/internal/webhooks/webhooks.go index 415aa5e..664ef4c 100644 --- a/internal/webhooks/webhooks.go +++ b/internal/webhooks/webhooks.go @@ -1,3 +1,4 @@ +// Package webhooks provides the data structures and utilities related to the hooks package webhooks import ( @@ -61,7 +62,11 @@ func New(r Ref) *Ref { // String prints object as git.example.com#branch@rev func (h *Ref) String() string { - return string(h.GetRefID()) + "@" + h.Rev[:7] + rev := h.Rev + if len(rev) > 7 { + rev = rev[:7] + } + return string(h.GetRefID()) + "@" + rev } // GetRefID returns a unique reference like "github.com/org/project#branch" @@ -80,7 +85,11 @@ func (h *Ref) GetURLSafeRefID() URLSafeRefID { // GetRevID returns a unique reference like "github.com/org/project#abcd7890" func (h *Ref) GetRevID() RevID { - return RevID(h.RepoID + "#" + h.Rev) + rev := h.Rev + if len(rev) > 7 { + rev = rev[:7] + } + return RevID(h.RepoID + "#" + rev) } // GetURLSafeRevID returns the URL-safe Base64 encoding of the RevID