Output actual version string rather than a pointer address

Author: pgporada

checker/checker.go

@@ -113,6 +113,14 @@ type Checker struct {
 	issuers  map[string]*x509.Certificate
 }
 
+// storageKey is nearly analogous to storage.Key, except that the Version field
+// is a string
+type storageKey struct {
+	Bucket  string
+	Object  string
+	Version string
+}
+
 // crlSummary is a subset of fields from *x509.RevocationList
 // useful for logging, plus the number of entries and some metadata.
 type crlSummary struct {
@@ -121,7 +129,7 @@ type crlSummary struct {
 	ThisUpdate time.Time
 	NextUpdate time.Time
 	URL        string
-	StorageKey storage.Key
+	StorageKey storageKey
 }
 
 func summary(crl *x509.RevocationList, key storage.Key) crlSummary {
@@ -133,7 +141,11 @@ func summary(crl *x509.RevocationList, key storage.Key) crlSummary {
 		Number:     crl.Number,
 		NumEntries: len(crl.RevokedCertificateEntries),
 		URL:        idp,
-		StorageKey: key,
+		StorageKey: storageKey{
+			Bucket:  key.Bucket,
+			Object:  key.Object,
+			Version: key.VersionString(),
+		},
 	}
 }
 

storage/storage.go

@@ -26,6 +26,14 @@ type Key struct {
 	Version        *string
 }
 
+// VersionString returns the version string or "unknown" if unset.
+func (k Key) VersionString() string {
+	if k.Version == nil {
+		return "unknown"
+	}
+	return *k.Version
+}
+
 func New(ctx context.Context) *Storage {
 	cfg, err := config.LoadDefaultConfig(ctx)
 	if err != nil {
@@ -47,12 +55,12 @@ func (s *Storage) Fetch(ctx context.Context, key Key) ([]byte, string, error) {
 		VersionId: key.Version,
 	})
 	if err != nil {
-		return nil, "", fmt.Errorf("retrieving CRL %s %s version %v: %w", key.Bucket, key.Object, key.Version, err)
+		return nil, "", fmt.Errorf("retrieving CRL %s %s version %s: %w", key.Bucket, key.Object, key.VersionString(), err)
 	}
 
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return nil, "", fmt.Errorf("reading CRL %s %s version %v: %w", key.Bucket, key.Object, key.Version, err)
+		return nil, "", fmt.Errorf("reading CRL %s %s version %s: %w", key.Bucket, key.Object, key.VersionString(), err)
 	}
 
 	return body, *resp.VersionId, err
@@ -86,7 +94,7 @@ func (s *Storage) Previous(ctx context.Context, key Key) (string, error) {
 	}
 
 	if (!found || prevVersion == nil) && resp.IsTruncated != nil && *resp.IsTruncated {
-		return "", fmt.Errorf("too many versions and pagination not implemented! %+v", key)
+		return "", fmt.Errorf("too many versions and pagination not implemented! bucket:%s object:%s version:%s", key.Bucket, key.Object, key.VersionString())
 	}
 
 	if !found {

storage/storage_test.go

@@ -11,6 +11,30 @@ import (
 	"github.com/letsencrypt/crl-monitor/storage/mock"
 )
 
+func TestKeyVersionString(t *testing.T) {
+	v := "abc123"
+	for _, tt := range []struct {
+		name     string
+		key      storage.Key
+		expected string
+	}{
+		{
+			name:     "version exists",
+			key:      storage.Key{Bucket: "b", Object: "o", Version: &v},
+			expected: "abc123",
+		},
+		{
+			name:     "version is nil",
+			key:      storage.Key{Bucket: "b", Object: "o", Version: nil},
+			expected: "unknown",
+		},
+	} {
+		t.Run(tt.name, func(t *testing.T) {
+			require.Equal(t, tt.expected, tt.key.VersionString())
+		})
+	}
+}
+
 func TestStorage(t *testing.T) {
 	mockStorage := mock.New(t, "somebucket", map[string][]mock.MockObject{
 		"123/0.crl": {