Fixup timestamp usage

hashicorp · Jan 3, 2022 · 2f0aa02 · 2f0aa02
1 parent 5a2764a
commit 2f0aa02
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/internal/cli/trigger_inspect.go b/internal/cli/trigger_inspect.go
@@ -6,7 +6,6 @@ import (
 
  "github.com/dustin/go-humanize"
  "github.com/golang/protobuf/jsonpb"
- "github.com/golang/protobuf/ptypes"
  "github.com/posener/complete"
  "google.golang.org/grpc/codes"
  "google.golang.org/grpc/status"
@@ -117,9 +116,9 @@ func (c *TriggerInspectCommand) Run(args []string) int {
  tags = strings.Join(trigger.Tags[:], ", ")
  }
 
- var lastActiveTime string
- if time, err := ptypes.Timestamp(trigger.ActiveTime); err == nil {
- lastActiveTime = humanize.Time(time)
+ lastActiveTime := "unknown"
+ if trigger.ActiveTime.IsValid() {
+ lastActiveTime = humanize.Time(trigger.ActiveTime.AsTime())
  }
 
  c.ui.Output("Trigger URL config:", terminal.WithHeaderStyle())

diff --git a/internal/server/singleprocess/service_trigger.go b/internal/server/singleprocess/service_trigger.go
@@ -2,7 +2,6 @@ package singleprocess
 
 import (
  "context"
- "time"
 
  "github.com/golang/protobuf/ptypes/empty"
  "github.com/hashicorp/go-hclog"
@@ -178,7 +177,7 @@ func (s *service) RunTrigger(
  log.Debug("run trigger job(s) have been queued")
 
  // Trigger has been requested to queue jobs, update active time
- runTrigger.ActiveTime = timestamppb.New(time.Now())
+ runTrigger.ActiveTime = timestamppb.Now()
  err = s.state.TriggerPut(runTrigger)
  if err != nil {
  return nil, err