From b4bedf8c9cfd89e471cded2635e0687f5616169b Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Wed, 5 Jun 2019 01:33:59 -0700 Subject: [PATCH] add some fields to track the build information Signed-off-by: Jeff Carr --- config.pb.go | 112 +++++++++++++++++++++++++++++++++++---------------- config.proto | 7 ++++ 2 files changed, 85 insertions(+), 34 deletions(-) diff --git a/config.pb.go b/config.pb.go index 00b12f7..3fdac38 100644 --- a/config.pb.go +++ b/config.pb.go @@ -21,22 +21,28 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type Config struct { - USER string `protobuf:"bytes,1,opt,name=USER,proto3" json:"USER,omitempty"` - Width int32 `protobuf:"varint,2,opt,name=width,proto3" json:"width,omitempty"` - Height int32 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"` - Hostname string `protobuf:"bytes,4,opt,name=hostname,proto3" json:"hostname,omitempty"` - Debug bool `protobuf:"varint,5,opt,name=debug,proto3" json:"debug,omitempty"` - Debugtable bool `protobuf:"varint,6,opt,name=debugtable,proto3" json:"debugtable,omitempty"` - Filename string `protobuf:"bytes,7,opt,name=filename,proto3" json:"filename,omitempty"` - Accounts []*Account `protobuf:"bytes,8,rep,name=accounts,proto3" json:"accounts,omitempty"` - Counter int32 `protobuf:"varint,9,opt,name=counter,proto3" json:"counter,omitempty"` - Errors int32 `protobuf:"varint,10,opt,name=errors,proto3" json:"errors,omitempty"` - Crashes int32 `protobuf:"varint,11,opt,name=crashes,proto3" json:"crashes,omitempty"` - Crash string `protobuf:"bytes,12,opt,name=crash,proto3" json:"crash,omitempty"` - IPv6 string `protobuf:"bytes,13,opt,name=IPv6,proto3" json:"IPv6,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + USER string `protobuf:"bytes,1,opt,name=USER,proto3" json:"USER,omitempty"` + Width int32 `protobuf:"varint,2,opt,name=width,proto3" json:"width,omitempty"` + Height int32 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"` + Hostname string `protobuf:"bytes,4,opt,name=hostname,proto3" json:"hostname,omitempty"` + Debug bool `protobuf:"varint,5,opt,name=debug,proto3" json:"debug,omitempty"` + Debugtable bool `protobuf:"varint,6,opt,name=debugtable,proto3" json:"debugtable,omitempty"` + Filename string `protobuf:"bytes,7,opt,name=filename,proto3" json:"filename,omitempty"` + Accounts []*Account `protobuf:"bytes,8,rep,name=accounts,proto3" json:"accounts,omitempty"` + Counter int32 `protobuf:"varint,9,opt,name=counter,proto3" json:"counter,omitempty"` + Errors int32 `protobuf:"varint,10,opt,name=errors,proto3" json:"errors,omitempty"` + Crashes int32 `protobuf:"varint,11,opt,name=crashes,proto3" json:"crashes,omitempty"` + Crash string `protobuf:"bytes,12,opt,name=crash,proto3" json:"crash,omitempty"` + IPv6 string `protobuf:"bytes,13,opt,name=IPv6,proto3" json:"IPv6,omitempty"` + // variables relating to the build + Dirty bool `protobuf:"varint,14,opt,name=dirty,proto3" json:"dirty,omitempty"` + Gitref string `protobuf:"bytes,15,opt,name=gitref,proto3" json:"gitref,omitempty"` + Version string `protobuf:"bytes,16,opt,name=version,proto3" json:"version,omitempty"` + Buildtime string `protobuf:"bytes,17,opt,name=buildtime,proto3" json:"buildtime,omitempty"` + Goversion string `protobuf:"bytes,18,opt,name=goversion,proto3" json:"goversion,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Config) Reset() { *m = Config{} } @@ -155,6 +161,41 @@ func (m *Config) GetIPv6() string { return "" } +func (m *Config) GetDirty() bool { + if m != nil { + return m.Dirty + } + return false +} + +func (m *Config) GetGitref() string { + if m != nil { + return m.Gitref + } + return "" +} + +func (m *Config) GetVersion() string { + if m != nil { + return m.Version + } + return "" +} + +func (m *Config) GetBuildtime() string { + if m != nil { + return m.Buildtime + } + return "" +} + +func (m *Config) GetGoversion() string { + if m != nil { + return m.Goversion + } + return "" +} + func init() { proto.RegisterType((*Config)(nil), "witProtobuf.Config") } @@ -162,22 +203,25 @@ func init() { func init() { proto.RegisterFile("config.proto", fileDescriptor_3eaf2c85e69e9ea4) } var fileDescriptor_3eaf2c85e69e9ea4 = []byte{ - // 261 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x90, 0x4d, 0x6a, 0xc3, 0x30, - 0x10, 0x85, 0x71, 0x7e, 0x1c, 0x67, 0x9c, 0x6c, 0x44, 0x28, 0x43, 0x16, 0xc5, 0x74, 0xe5, 0x95, - 0x29, 0x2d, 0x74, 0x5f, 0x4a, 0x17, 0xdd, 0x05, 0x95, 0x1e, 0xc0, 0x76, 0x64, 0x4b, 0x90, 0x5a, - 0x45, 0x92, 0x9b, 0xeb, 0xf6, 0x28, 0x45, 0x33, 0x4e, 0xc8, 0xee, 0x7d, 0xf3, 0xf3, 0x98, 0x37, - 0xb0, 0x69, 0xed, 0xd0, 0x99, 0xbe, 0xfa, 0x71, 0x36, 0x58, 0x91, 0x9f, 0x4d, 0x38, 0x44, 0xd5, - 0x8c, 0xdd, 0x7e, 0x5b, 0xb7, 0xad, 0x1d, 0x87, 0xc0, 0xbd, 0x87, 0xbf, 0x19, 0xa4, 0x6f, 0x34, - 0x2c, 0x04, 0x2c, 0xbe, 0x3e, 0xdf, 0x25, 0x26, 0x45, 0x52, 0xae, 0x25, 0x69, 0xb1, 0x83, 0xe5, - 0xd9, 0x1c, 0x83, 0xc6, 0x59, 0x91, 0x94, 0x4b, 0xc9, 0x20, 0xee, 0x20, 0xd5, 0xca, 0xf4, 0x3a, - 0xe0, 0x9c, 0xca, 0x13, 0x89, 0x3d, 0x64, 0xda, 0xfa, 0x30, 0xd4, 0xdf, 0x0a, 0x17, 0xe4, 0x72, - 0xe5, 0xe8, 0x74, 0x54, 0xcd, 0xd8, 0xe3, 0xb2, 0x48, 0xca, 0x4c, 0x32, 0x88, 0x7b, 0x00, 0x12, - 0xa1, 0x6e, 0x4e, 0x0a, 0x53, 0x6a, 0xdd, 0x54, 0xa2, 0x63, 0x67, 0x4e, 0x8a, 0x1c, 0x57, 0xec, - 0x78, 0x61, 0xf1, 0x08, 0xd9, 0x94, 0xc5, 0x63, 0x56, 0xcc, 0xcb, 0xfc, 0x69, 0x57, 0xdd, 0x24, - 0xad, 0x5e, 0xb9, 0x29, 0xaf, 0x53, 0x02, 0x61, 0x45, 0x4a, 0x39, 0x5c, 0xd3, 0xe1, 0x17, 0x8c, - 0x89, 0x94, 0x73, 0xd6, 0x79, 0x04, 0x4e, 0xc4, 0x44, 0x1b, 0xae, 0xf6, 0x5a, 0x79, 0xcc, 0xa7, - 0x0d, 0xc6, 0x98, 0x87, 0x24, 0x6e, 0xe8, 0x2c, 0x86, 0xf8, 0xc3, 0x8f, 0xc3, 0xef, 0x0b, 0x6e, - 0xf9, 0x87, 0x51, 0x37, 0x29, 0x7d, 0xfa, 0xf9, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x8b, 0xaf, 0xa5, - 0x04, 0x95, 0x01, 0x00, 0x00, + // 317 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x91, 0x4d, 0x6a, 0xc3, 0x30, + 0x10, 0x85, 0x71, 0x93, 0x38, 0xce, 0x38, 0xe9, 0x8f, 0x08, 0x65, 0x08, 0xa5, 0x98, 0xae, 0xbc, + 0x32, 0xa5, 0x85, 0xee, 0x4b, 0xe9, 0xa2, 0xbb, 0xe0, 0xd2, 0x03, 0xf8, 0x47, 0xb6, 0x05, 0x8e, + 0x55, 0x24, 0x39, 0xa1, 0xf7, 0xed, 0x41, 0x8a, 0x46, 0xb6, 0x9b, 0xdd, 0xfb, 0xe6, 0xcd, 0x8c, + 0xf4, 0x24, 0x58, 0x17, 0xb2, 0xab, 0x44, 0x9d, 0x7c, 0x2b, 0x69, 0x24, 0x0b, 0x4f, 0xc2, 0xec, + 0xad, 0xca, 0xfb, 0x6a, 0xb7, 0xc9, 0x8a, 0x42, 0xf6, 0x9d, 0x71, 0xde, 0xc3, 0xef, 0x0c, 0xfc, + 0x37, 0x6a, 0x66, 0x0c, 0xe6, 0x5f, 0x9f, 0xef, 0x29, 0x7a, 0x91, 0x17, 0xaf, 0x52, 0xd2, 0x6c, + 0x0b, 0x8b, 0x93, 0x28, 0x4d, 0x83, 0x17, 0x91, 0x17, 0x2f, 0x52, 0x07, 0xec, 0x16, 0xfc, 0x86, + 0x8b, 0xba, 0x31, 0x38, 0xa3, 0xf2, 0x40, 0x6c, 0x07, 0x41, 0x23, 0xb5, 0xe9, 0xb2, 0x03, 0xc7, + 0x39, 0x6d, 0x99, 0xd8, 0x6e, 0x2a, 0x79, 0xde, 0xd7, 0xb8, 0x88, 0xbc, 0x38, 0x48, 0x1d, 0xb0, + 0x7b, 0x00, 0x12, 0x26, 0xcb, 0x5b, 0x8e, 0x3e, 0x59, 0x67, 0x15, 0xbb, 0xb1, 0x12, 0x2d, 0xa7, + 0x8d, 0x4b, 0xb7, 0x71, 0x64, 0xf6, 0x08, 0xc1, 0x90, 0x45, 0x63, 0x10, 0xcd, 0xe2, 0xf0, 0x69, + 0x9b, 0x9c, 0x25, 0x4d, 0x5e, 0x9d, 0x99, 0x4e, 0x5d, 0x0c, 0x61, 0x49, 0x8a, 0x2b, 0x5c, 0xd1, + 0xc5, 0x47, 0xb4, 0x89, 0xb8, 0x52, 0x52, 0x69, 0x04, 0x97, 0xc8, 0x11, 0x4d, 0xa8, 0x4c, 0x37, + 0x5c, 0x63, 0x38, 0x4c, 0x38, 0xb4, 0x79, 0x48, 0xe2, 0x9a, 0xae, 0xe5, 0xc0, 0xbe, 0xe1, 0xc7, + 0xfe, 0xf8, 0x82, 0x1b, 0xf7, 0x86, 0x56, 0x53, 0x72, 0xa1, 0xcc, 0x0f, 0x5e, 0x0e, 0xc9, 0x2d, + 0xd8, 0x13, 0x6b, 0x61, 0x14, 0xaf, 0xf0, 0x8a, 0x7a, 0x07, 0xb2, 0x27, 0x1e, 0xb9, 0xd2, 0x42, + 0x76, 0x78, 0x4d, 0xc6, 0x88, 0xec, 0x0e, 0x56, 0x79, 0x2f, 0xda, 0xd2, 0x88, 0x03, 0xc7, 0x1b, + 0xf2, 0xfe, 0x0b, 0xd6, 0xad, 0xe5, 0x38, 0xc9, 0x9c, 0x3b, 0x15, 0x72, 0x9f, 0x7e, 0xfb, 0xf9, + 0x2f, 0x00, 0x00, 0xff, 0xff, 0x94, 0x45, 0x71, 0x71, 0x19, 0x02, 0x00, 0x00, } diff --git a/config.proto b/config.proto index e22b05e..dee292b 100644 --- a/config.proto +++ b/config.proto @@ -17,4 +17,11 @@ message Config { int32 crashes = 11; string crash = 12; string IPv6 = 13; + + // variables relating to the build + bool dirty = 14; // if the build was 'dirty' + string gitref = 15; // git rev-list -1 HEAD + string version = 16; // the VERSION file + string buildtime = 17; // the build time + string goversion = 18; // the version of go used to build }