From 8cb2cebaf150962dfbc2fb63b749c2ad7fa8ede9 Mon Sep 17 00:00:00 2001
From: dlorenc <lorenc.d@gmail.com>
Date: Tue, 8 Mar 2022 13:51:43 -0600
Subject: [PATCH] Switch to using the swag library for pointer manipulation.
(#719)
And also handle the roothash.
Signed-off-by: Dan Lorenc <lorenc.d@gmail.com>
---
cmd/rekor-cli/app/log_info.go | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/cmd/rekor-cli/app/log_info.go b/cmd/rekor-cli/app/log_info.go
index f5c5372..945cf57 100644
--- a/cmd/rekor-cli/app/log_info.go
+++ b/cmd/rekor-cli/app/log_info.go
@@ -25,6 +25,7 @@ import (
"fmt"
"time"
+ "github.com/go-openapi/swag"
"github.com/google/trillian/merkle/logverifier"
"github.com/google/trillian/merkle/rfc6962"
"github.com/spf13/cobra"
@@ -113,18 +114,11 @@ var logInfoCmd = &cobra.Command{
return nil, errors.New("signature on tree head did not verify")
}
- pToInt := func(p *int64) int64 {
- if p == nil {
- return 0
- }
- return *p
- }
-
cmdOutput := &logInfoCmdOutput{
- TreeSize: pToInt(logInfo.TreeSize),
- RootHash: *logInfo.RootHash,
+ TreeSize: swag.Int64Value(logInfo.TreeSize),
+ RootHash: swag.StringValue(logInfo.RootHash),
TimestampNanos: sth.GetTimestamp(),
- TreeID: pToInt(logInfo.TreeID),
+ TreeID: swag.Int64Value(logInfo.TreeID),
}
oldState := state.Load(serverURL)
--
GitLab