From fbc6cd3b6032db624baf8df8da9a571f55b64ec8 Mon Sep 17 00:00:00 2001 From: Izaak Lauer <8404559+izaaklauer@users.noreply.github.com> Date: Fri, 4 Jun 2021 08:23:36 -0400 Subject: [PATCH] Change TimeGenerated to GeneratedTime to match convention Regenerated protobufs --- internal/cli/deployment_list.go | 2 +- internal/server/gen/server.pb.go | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/cli/deployment_list.go b/internal/cli/deployment_list.go index a3bc8f08c91..e2a57b428da 100644 --- a/internal/cli/deployment_list.go +++ b/internal/cli/deployment_list.go @@ -183,7 +183,7 @@ func (c *DeploymentListCommand) Run(args []string) int { statusReportComplete = "?" } - if t, err := ptypes.Timestamp(statusReport.TimeGenerated); err == nil { + if t, err := ptypes.Timestamp(statusReport.GeneratedTime); err == nil { statusReportComplete = fmt.Sprintf("%s - %s", statusReportComplete, humanize.Time(t)) } } diff --git a/internal/server/gen/server.pb.go b/internal/server/gen/server.pb.go index 67f9231bcee..60267a1a0f3 100644 --- a/internal/server/gen/server.pb.go +++ b/internal/server/gen/server.pb.go @@ -7414,7 +7414,7 @@ type StatusReport struct { // A health report of all of the resources that make up the report. ResourcesHealth []*StatusReport_Health `protobuf:"bytes,9,rep,name=resources_health,json=resourcesHealth,proto3" json:"resources_health,omitempty"` // the time when this report was generated - TimeGenerated *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=time_generated,json=timeGenerated,proto3" json:"time_generated,omitempty"` + GeneratedTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=generated_time,json=generatedTime,proto3" json:"generated_time,omitempty"` } func (x *StatusReport) Reset() { @@ -7519,9 +7519,9 @@ func (x *StatusReport) GetResourcesHealth() []*StatusReport_Health { return nil } -func (x *StatusReport) GetTimeGenerated() *timestamppb.Timestamp { +func (x *StatusReport) GetGeneratedTime() *timestamppb.Timestamp { if x != nil { - return x.TimeGenerated + return x.GeneratedTime } return nil } @@ -18506,11 +18506,11 @@ var file_internal_server_proto_server_proto_rawDesc = []byte{ 0x70, 0x2e, 0x77, 0x61, 0x79, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x52, 0x0f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x12, - 0x41, 0x0a, 0x0e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, - 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, + 0x41, 0x0a, 0x0e, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x6d, + 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, - 0x61, 0x6d, 0x70, 0x52, 0x0d, 0x74, 0x69, 0x6d, 0x65, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, - 0x65, 0x64, 0x1a, 0x78, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x12, 0x23, 0x0a, 0x0d, + 0x61, 0x6d, 0x70, 0x52, 0x0d, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x54, 0x69, + 0x6d, 0x65, 0x1a, 0x78, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x12, 0x23, 0x0a, 0x0d, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x5f, 0x6d, 0x65, 0x73, 0x73, @@ -19824,7 +19824,7 @@ var file_internal_server_proto_server_proto_depIdxs = []int32{ 270, // 199: hashicorp.waypoint.StatusReport.status_report:type_name -> google.protobuf.Any 238, // 200: hashicorp.waypoint.StatusReport.health:type_name -> hashicorp.waypoint.StatusReport.Health 238, // 201: hashicorp.waypoint.StatusReport.resources_health:type_name -> hashicorp.waypoint.StatusReport.Health - 268, // 202: hashicorp.waypoint.StatusReport.time_generated:type_name -> google.protobuf.Timestamp + 268, // 202: hashicorp.waypoint.StatusReport.generated_time:type_name -> google.protobuf.Timestamp 239, // 203: hashicorp.waypoint.GetLogStreamRequest.application:type_name -> hashicorp.waypoint.GetLogStreamRequest.Application 240, // 204: hashicorp.waypoint.LogBatch.lines:type_name -> hashicorp.waypoint.LogBatch.Entry 147, // 205: hashicorp.waypoint.ConfigVar.application:type_name -> hashicorp.waypoint.Ref.Application