Fix build time on VersionResponse

Signed-off-by: Juanjo Alvarez <[email protected]>
bblfsh · Jan 28, 2019 · e5ca340 · e5ca340
1 parent ac29b44
commit e5ca340
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 5 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/cmd/bblfshd/main.go b/cmd/bblfshd/main.go
@@ -9,6 +9,7 @@ import (
 	"os/signal"
 	"sync"
 	"syscall"
+	"time"
 
 	"github.com/bblfsh/bblfshd/daemon"
 	"github.com/bblfsh/bblfshd/runtime"
@@ -114,7 +115,12 @@ func main() {
 		os.Exit(1)
 	}
 
-	d := daemon.NewDaemon(version, r, grpcOpts...)
+	parsedBuild, err := time.Parse(time.RFC3339, build)
+	if err != nil {
+		logrus.Errorf("wrong date format for build: %s", err)
+		os.Exit(1)
+	}
+	d := daemon.NewDaemon(version, parsedBuild, r, grpcOpts...)
 	if args := cmd.Args(); len(args) == 2 && args[0] == "install" && args[1] == "recommended" {
 		err := installRecommended(d)
 		if err != nil {

diff --git a/daemon/daemon.go b/daemon/daemon.go
@@ -7,6 +7,7 @@ import (
 	"os"
 	"strings"
 	"sync"
+	"time"
 
 	"github.com/bblfsh/bblfshd/daemon/protocol"
 	"github.com/bblfsh/bblfshd/runtime"
@@ -24,6 +25,7 @@ type Daemon struct {
 	ControlServer *grpc.Server
 
 	version   string
+	build     time.Time
 	runtime   *runtime.Runtime
 	driverEnv []string
 
@@ -32,12 +34,13 @@ type Daemon struct {
 }
 
 // NewDaemon creates a new server based on the runtime with the given version.
-func NewDaemon(version string, r *runtime.Runtime, opts ...grpc.ServerOption) *Daemon {
+func NewDaemon(version string, build time.Time, r *runtime.Runtime, opts ...grpc.ServerOption) *Daemon {
 	commonOpt := protocol2.ServerOptions()
 	opts = append(opts, commonOpt...)
 
 	d := &Daemon{
 		version:       version,
+		build:         build,
 		runtime:       r,
 		pool:          make(map[string]*DriverPool),
 		UserServer:    grpc.NewServer(opts...),

diff --git a/daemon/daemon_test.go b/daemon/daemon_test.go
@@ -121,7 +121,9 @@ func buildMockedDaemon(t *testing.T, images ...runtime.DriverImage) (*Daemon, st
 		}
 	}
 
-	d := NewDaemon("foo", r)
+	bdate, err := time.Parse(time.RFC3339, "2019-01-28T16:49:06+01:00")
+	require.NoError(err)
+	d := NewDaemon("foo", bdate, r)
 
 	dp := NewDriverPool(func() (Driver, error) {
 		return newEchoDriver(), nil

diff --git a/daemon/service.go b/daemon/service.go
@@ -236,7 +236,7 @@ func (s *Service) selectPool(ctx context.Context, language, content, filename st
 }
 
 func (d *Service) Version(req *protocol1.VersionRequest) *protocol1.VersionResponse {
-	return &protocol1.VersionResponse{Version: d.daemon.version}
+	return &protocol1.VersionResponse{Version: d.daemon.version, Build: d.daemon.build}
 }
 
 func (d *Service) SupportedLanguages(req *protocol1.SupportedLanguagesRequest) *protocol1.SupportedLanguagesResponse {

diff --git a/daemon/service_test.go b/daemon/service_test.go
@@ -3,6 +3,7 @@ package daemon
 import (
 	"os"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 	"gopkg.in/bblfsh/sdk.v1/protocol"
@@ -46,6 +47,10 @@ func TestServiceVersion(t *testing.T) {
 	resp := s.Version(&protocol.VersionRequest{})
 	require.Len(resp.Errors, 0)
 	require.Equal(resp.Version, "foo")
+
+	bdate, err := time.Parse(time.RFC3339, "2019-01-28T16:49:06+01:00")
+	require.NoError(err)
+	require.Equal(resp.Build, bdate)
 }
 
 func TestControlServiceDriverPoolStates(t *testing.T) {