Merge pull request #26 from PlaceOS/service-version

feat: conform to PlaceOS::Model::Version

Author: tassja

Dockerfile

@@ -1,4 +1,6 @@
 FROM crystallang/crystal:1.0.0-alpine as builder
+ARG PLACE_COMMIT="DEV"
+ARG PLACE_VERSION="DEV"
 
 WORKDIR /build
 
@@ -10,7 +12,9 @@ RUN CRFLAGS="--static" shards install --production --ignore-crystal-version
 
 COPY src /build/src
 
-RUN crystal build --error-trace --static --release --no-debug -o bin/frontends src/app.cr
+RUN PLACE_COMMIT=$PLACE_COMMIT \
+  PLACE_VERSION=$PLACE_VERSION \
+  crystal build --release --no-debug --error-trace -o bin/frontends src/app.cr
 
 FROM alpine:3.11
 WORKDIR /app

shard.lock

@@ -7,7 +7,7 @@ shards:
 
   action-controller:
     git: https://github.com/spider-gazelle/action-controller.git
-    version: 4.4.1
+    version: 4.5.0
 
   active-model:
     git: https://github.com/spider-gazelle/active-model.git
@@ -21,13 +21,9 @@ shards:
     git: https://github.com/spider-gazelle/bindata.git
     version: 1.9.0
 
-  bisect:
-    git: https://github.com/spider-gazelle/bisect.git
-    version: 1.2.1
-
   connect-proxy:
     git: https://github.com/spider-gazelle/connect-proxy.git
-    version: 1.2.1
+    version: 1.4.0
 
   crc16:
     git: https://github.com/maiha/crc16.cr.git
@@ -45,6 +41,10 @@ shards:
     git: https://github.com/sija/debug.cr.git
     version: 2.0.1
 
+  dtls:
+    git: https://github.com/spider-gazelle/crystal-dtls.git
+    version: 0.9.0
+
   etcd:
     git: https://github.com/place-labs/crystal-etcd.git
     version: 1.2.4
@@ -111,15 +111,15 @@ shards:
 
   placeos-driver:
     git: https://github.com/placeos/driver.git
-    version: 5.1.1
+    version: 5.3.13
 
   placeos-log-backend:
     git: https://github.com/place-labs/log-backend.git
     version: 0.4.0
 
   placeos-models:
     git: https://github.com/placeos/models.git
-    version: 4.18.2
+    version: 5.5.0
 
   placeos-resource:
     git: https://github.com/place-labs/resource.git
@@ -129,10 +129,6 @@ shards:
     git: https://github.com/ysbaddaden/pool.git
     version: 0.2.4
 
-  priority-queue:
-    git: https://github.com/spider-gazelle/priority-queue.git
-    version: 1.0.1
-
   promise:
     git: https://github.com/spider-gazelle/promise.git
     version: 2.2.2
@@ -179,7 +175,7 @@ shards:
 
   tasker:
     git: https://github.com/spider-gazelle/tasker.git
-    version: 2.0.3
+    version: 2.0.5
 
   tokenizer:
     git: https://github.com/spider-gazelle/tokenizer.git

shard.yml

@@ -20,7 +20,7 @@ dependencies:
 
   placeos-models:
     github: placeos/models
-    version: ~> 4.13
+    version: ~> 5.3
 
   placeos-log-backend:
     github: place-labs/log-backend

spec/helper.cr

@@ -1,8 +1,9 @@
 require "file_utils"
 require "placeos-log-backend"
 require "placeos-models/spec/generator"
-
 require "../src/placeos-frontends"
+require "../lib/action-controller/spec/curl_context"
+require "action-controller/server"
 
 require "spec"
 

spec/root_spec.cr

@@ -0,0 +1,18 @@
+require "./helper"
+
+module PlaceOS::Frontends::Api
+  describe Root do
+    with_server do
+      it "health checks" do
+        result = curl("GET", "/api/frontends/v1/")
+        result.success?.should be_true
+      end
+
+      it "should check version" do
+        result = curl("GET", "/api/frontends/v1/version")
+        result.status_code.should eq 200
+        PlaceOS::Model::Version.from_json(result.body).service.should eq "frontends"
+      end
+    end
+  end
+end

src/constants.cr

@@ -1,8 +1,10 @@
 require "secrets-env"
 
 module PlaceOS::Frontends
-  APP_NAME = "frontends"
-  VERSION  = {{ `shards version "#{__DIR__}"`.chomp.stringify.downcase }}
+  APP_NAME     = "frontends"
+  VERSION      = {{ `shards version "#{__DIR__}"`.chomp.stringify.downcase }}
+  BUILD_TIME   = {{ system("date -u").stringify }}
+  BUILD_COMMIT = {{ env("PLACE_COMMIT") || "DEV" }}
 
   PROD = (ENV["SG_ENV"]? || ENV["ENV"]?) == "production"
 

src/placeos-frontends/client.cr

@@ -60,6 +60,10 @@ module PlaceOS::Frontends
       Array(String).from_json(response.body)
     end
 
+    def version : PlaceOS::Model::Version
+      Model::Version.from_json(get("/version").body)
+    end
+
     ###########################################################################
 
     def initialize(

src/placeos-frontends/controllers/root.cr

@@ -1,5 +1,7 @@
 require "./base"
 
+require "placeos-models/version"
+
 module PlaceOS::Frontends::Api
   class Root < Base
     base "/api/frontends/v1"
@@ -9,9 +11,12 @@ module PlaceOS::Frontends::Api
     end
 
     get "/version", :version do
-      render :ok, json: {
-        version: VERSION.to_s,
-      }
+      render :ok, json: PlaceOS::Model::Version.new(
+        version: VERSION,
+        build_time: BUILD_TIME,
+        commit: BUILD_COMMIT,
+        service: APP_NAME
+      )
     end
   end
 end