WIP Upgrading to Nim 0.19. Getting docker pieces compiling.

* Addressing breaking changes in migration from Nim 0.18 to 0.19.
* Finishing the initial pass at the refactor required to include
  docker-based builds.
* Regaining confidence in the existing functionality by getting all
  tests passing again after docker introduction (still need new tests to
  cover new docker functionality).

src/main/nim/strawboss.nim

@@ -7,9 +7,9 @@ import strawbosspkg/server
 let SB_VER = "0.4.0"
 
 proc logProcOutput*(outMsg, errMsg: TaintedString, cmd: string) =
-  let prefix = if cmd != nil: cmd & ": " else: ""
+  let prefix = if cmd.len > 0: cmd & ": " else: ""
-  if outMsg != nil: stdout.writeLine prefix & outMsg
+  if outMsg.len > 0: stdout.writeLine prefix & outMsg
-  if errMsg != nil: stderr.writeLine prefix & errMsg
+  if errMsg.len > 0: stderr.writeLine prefix & errMsg
 
 when isMainModule:
 
@@ -50,7 +50,7 @@ Options
 
     try:
 
-      if req.workspaceDir.isNilOrEmpty: req.workspaceDir = mkdtemp()
+      if req.workspaceDir.len == 0: req.workspaceDir = mkdtemp()
 
       let status = core.run(cfg, req, logProcOutput)
       if status.state == BuildState.failed: raiseEx status.details

src/main/nim/strawbosspkg/configuration.nim

@@ -1,4 +1,5 @@
-import cliutils, logging, json, os, sequtils, strtabs, strutils, tables, times, uuids
+import cliutils, logging, json, os, sequtils, strtabs, strutils, tables, times,
+  unicode, uuids
 
 from langutils import sameContents
 from typeinfo import toAny
@@ -17,7 +18,7 @@ type
     state*: BuildState
 
   Step* = object
-    containerImage, name*, stepCmd*, workingDir*: string
+    containerImage*, name*, stepCmd*, workingDir*: string
     artifacts*, cmdInput*, depends*, expectedEnv*: seq[string]
     dontSkip*: bool
 
@@ -32,7 +33,7 @@ type
   RunRequest* = object
     runId*: UUID
     projectName*, stepName*, buildRef*, workspaceDir*: string
-    timestamp*: TimeInfo
+    timestamp*: DateTime
     forceRebuild*: bool
 
   Run* = object
@@ -117,7 +118,7 @@ proc getOrFail(n: JsonNode, key: string, objName: string = ""): JsonNode =
 # Configuration parsing code
 
 proc parseLogLevel*(level: string): Level =
-  let lvlStr = "lvl" & toUpper(level[0]) & level[1..^1]
+  let lvlStr = "lvl" & toUpperAscii(level[0]) & level[1..^1]
   result = parseEnum[Level](lvlStr)
 
 proc parseProjectDef*(pJson: JsonNode): ProjectDef =
@@ -142,10 +143,10 @@ proc parseStrawBossConfig*(jsonCfg: JsonNode): StrawBossConfig =
   result = StrawBossConfig(
     buildDataDir: jsonCfg.getIfExists("buildDataDir").getStr("build-data"),
     authSecret: jsonCfg.getOrFail("authSecret", "strawboss config").getStr,
-    debug: jsonCfg.getIfExists("debug").getBVal(false),
+    debug: jsonCfg.getIfExists("debug").getBool(false),
-    pwdCost: int8(jsonCfg.getOrFail("pwdCost", "strawboss config").getNum),
+    pwdCost: int8(jsonCfg.getOrFail("pwdCost", "strawboss config").getInt),
     projects: jsonCfg.getIfExists("projects").getElems.mapIt(parseProjectDef(it)),
-    maintenancePeriod: int(jsonCfg.getIfExists("maintenancePeriod").getNum(10000)),
+    maintenancePeriod: int(jsonCfg.getIfExists("maintenancePeriod").getInt(10000)),
     logLevel: parseLogLevel(jsonCfg.getIfExists("logLevel").getStr("info")),
     users: users)
 
@@ -177,7 +178,7 @@ proc loadProjectConfig*(cfgFile: string): ProjectConfig =
       cmdInput:       pJson.getIfExists("cmdInput").getElems.mapIt(it.getStr),
       expectedEnv:    pJson.getIfExists("expectedEnv").getElems.mapIt(it.getStr),
       containerImage: pJson.getIfExists("containerImage").getStr(""),
-      dontSkip:       pJson.getIfExists("dontSkip").getBVal(false))
+      dontSkip:       pJson.getIfExists("dontSkip").getBool(false))
 
     # cmdInput and stepCmd are related, so we have a conditional defaulting.
     # Four possibilities:
@@ -218,7 +219,7 @@ proc parseRunRequest*(reqJson: JsonNode): RunRequest =
     buildRef: reqJson.getOrFail("buildRef", "RunRequest").getStr,
     workspaceDir: reqJson.getOrFail("workspaceDir", "RunRequest").getStr,
     timestamp: times.parse(reqJson.getOrFail("timestamp", "RunRequest").getStr, ISO_TIME_FORMAT),
-    forceRebuild: reqJson.getOrFail("forceRebuild", "RunRequest").getBVal)
+    forceRebuild: reqJson.getOrFail("forceRebuild", "RunRequest").getBool)
 
 proc loadRunRequest*(reqFilePath: string): RunRequest =
   if not existsFile(reqFilePath):
@@ -260,7 +261,7 @@ proc `%`*(s: Step): JsonNode =
     "expectedEnv": s.expectedEnv,
     "dontSkip": s.dontSkip }
 
-  if not s.containerImage.isNullOrEmpty:
+  if s.containerImage.len > 0:
     result["containerImage"] = %s.containerImage
 
 proc `%`*(p: ProjectConfig): JsonNode =
@@ -272,7 +273,7 @@ proc `%`*(p: ProjectConfig): JsonNode =
   for name, step in p.steps:
     result["steps"][name] = %step
 
-  if not p.containerImage.isNilOrEmpty:
+  if p.containerImage.len > 0:
     result["containerImage"] = %p.containerImage
 
 proc `%`*(req: RunRequest): JsonNode =
@@ -298,7 +299,7 @@ proc `%`*(cfg: StrawBossConfig): JsonNode =
     "projects": %cfg.projects,
     "pwdCost": cfg.pwdCost,
     "maintenancePeriod": cfg.maintenancePeriod,
-    "logLevel": toLower(($cfg.logLevel)[3]) & ($cfg.logLevel)[4..^1],
+    "logLevel": toLowerAscii(($cfg.logLevel)[3]) & ($cfg.logLevel)[4..^1],
     "users": %cfg.users }
 
 proc `%`*(run: Run): JsonNode =

src/main/nim/strawbosspkg/core.nim

@@ -52,7 +52,7 @@ proc newCopy(w: Workspace): Workspace =
 const WKSP_ROOT = "/strawboss/wksp"
 const ARTIFACTS_ROOT = "/strawboss/artifacts"
 
-proc execWithOutput(w: Workspace, cmd, workingDir: string,
+proc execWithOutput(wksp: Workspace, cmd, workingDir: string,
     args: openarray[string], env: StringTableRef,
     options: set[ProcessOption] = {poUsePath},
     msgCB: HandleProcMsgCB = nil):
@@ -61,35 +61,35 @@ proc execWithOutput(w: Workspace, cmd, workingDir: string,
 
   # Look for a container image to use
   let containerImage =
-    if not isNilOrEmpty(w.step.containerImage): w.step.containerImage
+    if wksp.step.containerImage.len > 0: wksp.step.containerImage
-    else: w.project.containerImage
+    else: wksp.project.containerImage
 
-  if containerImage.isNilOrEmpty:
+  if containerImage.len == 0:
-    return exec(cmd, workingDir, args, env, options, msgCB
+    return execWithOutput(cmd, workingDir, args, env, options, msgCB)
 
   var fullEnv = newStringTable(modeCaseSensitive)
   for k,v in env: fullEnv[k] = v
 
   var fullArgs = @["run", "-w", WKSP_ROOT, "-v", wksp.dir & ":" & WKSP_ROOT  ]
 
-  if w.step.name.isNilOrEmpty:
+  if wksp.step.name.len == 0:
-    for depStep in step.depends:
+    for depStep in wksp.step.depends:
-      fullArgs.add("-v", ARTIFACTS_ROOT / depStep)
+      fullArgs.add(["-v", ARTIFACTS_ROOT / depStep])
-      fullEnv[depStep & "_DIR"] = ARTIFACTS_DIR / depStep)
+      fullEnv[depStep & "_DIR"] = ARTIFACTS_ROOT / depStep
 
-  let envFile = mkstemp()[0]
+  let envFile = mkstemp().name
   writeFile(envFile, toSeq(fullEnv.pairs()).mapIt(it[0] & "=" & it[1]).join("\n"))
   
-  fullArgs.add("--env-file", envFile)
+  fullArgs.add(["--env-file", envFile])
   fullArgs.add(containerImage)
   fullArgs.add(cmd)
 
-  echo "Executing docker command: \n\t" & "docker " & $(fullArgs & args)
+  echo "Executing docker command: \n\t" & "docker " & $(fullArgs & @args)
-  return execWithOutput("docker", wksp.dir, fullArgs & args, fullEnv, options, msgCB)
+  return execWithOutput("docker", wksp.dir, fullArgs & @args, fullEnv, options, msgCB)
 
 proc exec(w: Workspace, cmd, workingDir: string, args: openarray[string],
-    env: StringTableRef, options: set[ProcessingOption] = {poUsePath},
+    env: StringTableRef, options: set[ProcessOption] = {poUsePath},
-    msgCB: HandleProcMsgCG = nil): int
+    msgCB: HandleProcMsgCB = nil): int
     {.tags: [ExecIOEffect, ReadIOEffect, RootEffect] .} =
 
   return execWithOutput(w, cmd, workingDir, args, env, options, msgCB)[2]
@@ -97,16 +97,16 @@ proc exec(w: Workspace, cmd, workingDir: string, args: openarray[string],
 # Utility methods for Workspace activities
 proc sendStatusMsg(oh: HandleProcMsgCB, status: BuildStatus): void =
   if not oh.isNil:
-    oh.sendMsg($status.state & ": " & status.details, nil, "strawboss")
+    oh.sendMsg($status.state & ": " & status.details, "", "strawboss")
 
 proc sendMsg(w: Workspace, msg: TaintedString): void =
-  w.outputHandler.sendMsg(msg, nil, "strawboss")
+  w.outputHandler.sendMsg(msg, "", "strawboss")
 
 proc sendMsg(w: Workspace, l: Level, msg: TaintedString): void =
   if l >= w.logLevel: w.sendMsg(msg)
 
 proc sendErrMsg(w: Workspace, msg: TaintedString): void =
-  w.outputHandler.sendMsg(nil, msg, "strawboss")
+  w.outputHandler.sendMsg("", msg, "strawboss")
 
 proc sendErrMsg(w: Workspace, l: Level, msg: TaintedString): void =
   if l >= w.logLevel: w.sendErrMsg(msg)
@@ -133,7 +133,7 @@ proc publishStatus(wksp: Workspace, state: BuildState, details: string): void =
     $wksp.runRequest.runId & ".status.json", $wksp.status)
 
   # If we have our step we can save status to the step status
-  if not wksp.step.name.isNilOrEmpty:
+  if wksp.step.name.len > 0:
     let stepStatusDir = wksp.buildDataDir / "status" / wksp.step.name
     if not existsDir(stepStatusDir): createDir(stepStatusDir)
     writeFile(stepStatusDir / wksp.version & ".json", $wksp.status)
@@ -280,7 +280,7 @@ proc getProjectConfig*(cfg: StrawBossConfig,
   # If they didn't give us a version, let try to figure out what is the latest one.
   var confFilePath: string
 
-  if version.isNilOrEmpty:
+  if version.len == 0:
 
     let candidatePaths = filesMatching(
       cfg.buildDataDir / project.name / "configurations/*.json")
@@ -507,7 +507,7 @@ proc run*(cfg: StrawBossConfig, req: RunRequest,
     wksp = Workspace(
       buildDataDir: cfg.buildDataDir / projectDef.name,
       buildRef:
-        if req.buildRef != nil and req.buildRef.len > 0: req.buildRef
+        if req.buildRef.len > 0: req.buildRef
         else: projectDef.defaultBranch,
       dir: req.workspaceDir,
       env: env,
@@ -519,7 +519,7 @@ proc run*(cfg: StrawBossConfig, req: RunRequest,
       runRequest: req,
       status: result,
       step: Step(),
-      version: nil)
+      version: "")
 
   except:
     when not defined(release): echo getCurrentException().getStackTrace()

src/main/nim/strawbosspkg/server.nim

@@ -1,10 +1,11 @@
 import asyncdispatch, bcrypt, cliutils, jester, json, jwt, logging, md5,
-  os, osproc, sequtils, strutils, tempfile, times, unittest, uuids
+  options, os, osproc, sequtils, strutils, tempfile, times, unittest, uuids
 
 from mimetypes import getMimeType
 from asyncfile import openAsync, readToStream, close
 from asyncnet import send
 from re import re, find
+from timeutils import trimNanoSec
 
 import ./configuration, ./core
 
@@ -19,24 +20,38 @@ const JSON = "application/json"
 proc newSession*(user: UserRef): Session =
   result = Session(
     user: user,
-    issuedAt: getTime(),
+    issuedAt: getTime().local.trimNanoSec.toTime,
-    expires: daysForward(7).toTime())
+    expires: daysForward(7).trimNanoSec.toTime)
 
-proc buildJson(resp: Response, code: HttpCode, details: string = ""): void =
+template halt(code: HttpCode,
-  resp.data[0] = CallbackAction.TCActionSend
+              headers: RawHeaders,
-  resp.data[1] = code
+              content: string): typed =
-  resp.data[2]["Content-Type"] = JSON
+  ## Immediately replies with the specified request. This means any further
-  resp.data[3] = $(%* {
+  ## code will not be executed after calling this template in the current
-    "statusCode": code.int,
+  ## route.
-    "status": $code,
+  bind TCActionSend, newHttpHeaders
-    "details": details
+  result[0] = CallbackAction.TCActionSend
-  })
+  result[1] = code
+  result[2] = some(headers)
+  result[3] = content
+  result.matched = true
+  break allRoutes
 
-# Work-around for weirdness trying to use resp(Http500... in exception blocks
+template jsonResp(code: HttpCode, details: string = "", headers: RawHeaders = @{:} ) =
-proc build500Json(resp: Response, ex: ref Exception, msg: string): void =
+  halt(
+    code,
+    headers & @{"Content-Type": JSON},
+    $(%* {
+      "statusCode": code.int,
+      "status": $code,
+      "details": details
+    })
+  )
+
+template json500Resp(ex: ref Exception, details: string = ""): void =
   when not defined(release): debug ex.getStackTrace()
-  error msg & ":\n" & ex.msg
+  error details & ":\n" & ex.msg
-  resp.buildJson(Http500)
+  jsonResp(Http500)
 
 proc toJWT*(cfg: StrawBossConfig, session: Session): string =
   ## Make a JST token for this session.
@@ -44,8 +59,8 @@ proc toJWT*(cfg: StrawBossConfig, session: Session): string =
     header: JOSEHeader(alg: HS256, typ: "jwt"),
     claims: toClaims(%*{
       "sub": session.user.name,
-      "iat": session.issuedAt.toSeconds().int,
+      "iat": session.issuedAt.toUnix.int,
-      "exp": session.expires.toSeconds().int }))
+      "exp": session.expires.toUnix.int }))
 
   jwt.sign(cfg.authSecret)
   result = $jwt
@@ -64,8 +79,8 @@ proc fromJWT*(cfg: StrawBossConfig, strTok: string): Session =
 
   result = Session(
     user: users[0],
-    issuedAt: fromSeconds(jwt.claims["iat"].node.num),
+    issuedAt: fromUnix(jwt.claims["iat"].node.num),
-    expires: fromSeconds(jwt.claims["exp"].node.num))
+    expires: fromUnix(jwt.claims["exp"].node.num))
 
 proc extractSession(cfg: StrawBossConfig, request: Request): Session =
   ## Helper to extract a session from a reqest.
@@ -93,7 +108,7 @@ proc makeAuthToken*(cfg: StrawBossConfig, uname, pwd: string): string =
   ## Given a username and pwd, validate the combination and generate a JWT
   ## token string.
 
-  if uname == nil or pwd == nil:
+  if uname.len == 0 or pwd.len == 0:
     raiseEx "fields 'username' and 'password' required"
 
   # find the user record
@@ -115,7 +130,7 @@ proc makeApiKey*(cfg: StrawBossConfig, uname: string): string =
   ## function for an administrator to setup a unsupervised account (git access
   ## for example).
 
-  if uname == nil: raiseEx "no username given"
+  if uname.len == 0: raiseEx "no username given"
 
   # find the user record
   let users = cfg.users.filterIt(it.name == uname)
@@ -130,21 +145,15 @@ proc makeApiKey*(cfg: StrawBossConfig, uname: string): string =
 
 template checkAuth() =
   ## Check this request for authentication and authorization information.
-  ## Injects two variables into the running context: the session and authed:
+  ## Injects the session into the running context. If the request is not
-  ## true if the request is authorized, false otherwise. If the request is not
+  ## authorized, this template returns an appropriate 401 response.
-  ## authorized, this template sets up the 401 response correctly. The calling
-  ## context needs only to return from the route.
 
   var session {.inject.}: Session
-  var authed {.inject.} = false
 
-  try:
+  try: session = extractSession(cfg, request)
-    session = extractSession(cfg, request)
-    authed = true
   except:
     debug "Auth failed: " & getCurrentExceptionMsg()
-    response.data[2]["WWW-Authenticate"] = "Bearer"
+    jsonResp(Http401, "Unauthorized", @{"WWW-Authenticate": "Bearer"})
-    response.buildJson(Http401)
 
 proc start*(cfg: StrawBossConfig): void =
 
@@ -166,37 +175,37 @@ proc start*(cfg: StrawBossConfig): void =
         let jsonBody = parseJson(request.body)
         uname = jsonBody["username"].getStr
         pwd = jsonBody["password"].getStr
-      except: response.buildJson(Http400); return true
+      except: jsonResp(Http400)
 
       try:
         let authToken = makeAuthToken(cfg, uname, pwd)
         resp($(%authToken), JSON)
-      except: response.buildJson(Http401, getCurrentExceptionMsg()); return true
+      except: jsonResp(Http401, getCurrentExceptionMsg())
 
     get "/verify-auth":
-      checkAuth(); if not authed: return true
+      checkAuth()
 
       resp(Http200, $(%*{ "username": session.user.name }), JSON)
 
     get "/projects":
       ## List project summaries (ProjectDefs only)
 
-      checkAuth(); if not authed: return true
+      checkAuth()
 
       resp($(%cfg.projects), JSON)
 
     post "/projects":
       ## Create a new project definition
 
-      checkAuth(); if not authed: return true
+      checkAuth()
 
       # TODO
-      response.buildJson(Http501); return true
+      jsonResp(Http501)
 
     get "/project/@projectName":
       ## Return a project's configuration, as well as it's versions.
 
-      checkAuth(); if not authed: return true
+      checkAuth()
 
       # Make sure we know about that project
       var projDef: ProjectDef
@@ -204,11 +213,10 @@ proc start*(cfg: StrawBossConfig): void =
       except:
         try: raise getCurrentException()
         except NotFoundException:
-          response.buildJson(Http404, getCurrentExceptionMsg())
+          jsonResp(Http404, getCurrentExceptionMsg())
         except:
-          response.build500Json(getCurrentException(),
+          let msg = "unable to load project definition for project " & @"projectName"
-            "unable to load project definition for project " & @"projectName")
+          json500Resp(getCurrentException(), msg)
-        return true
 
       var projConf: ProjectConfig
       try: projConf = getProjectConfig(cfg, @"projectName", "")
@@ -217,7 +225,7 @@ proc start*(cfg: StrawBossConfig): void =
       let respJson = newJObject()
       respJson["definition"] = %projDef
       respJson["versions"] = %listVersions(cfg, @"projectName")
-      if not projConf.name.isNil:
+      if projConf.name.len > 0:
         respJson["latestConfig"] = %projConf
 
       resp(pretty(respJson), JSON)
@@ -225,39 +233,38 @@ proc start*(cfg: StrawBossConfig): void =
     get "/project/@projectName/versions":
       ## Get a list of all versions that we have built
 
-      checkAuth(); if not authed: return true
+      checkAuth()
 
       try: resp($(%listVersions(cfg, @"projectName")), JSON)
       except:
         try: raise getCurrentException()
         except NotFoundException:
-          response.buildJson(Http404, getCurrentExceptionMsg())
+          jsonResp(Http404, getCurrentExceptionMsg())
         except:
-          response.build500Json(getCurrentException(),
+          let msg = "unable to list versions for project " & @"projectName"
-            "unable to list versions for project " & @"projectName")
+          json500Resp(getCurrentException(), msg)
-        return true
 
     get "/project/@projectName/version/@version?":
       ## Get a detailed project record including step definitions (ProjectConfig).
 
-      checkAuth(); if not authed: return true
+      checkAuth()
 
       # Make sure we know about that project
       try: resp($(%getProjectConfig(cfg, @"projectName", @"version")), JSON)
-      except: response.buildJson(Http404, getCurrentExceptionMsg()); return true
+      except: jsonResp(Http404, getCurrentExceptionMsg())
 
     get "/project/@projectName/runs":
       ## List all runs
 
-      checkAuth(); if not authed: return true
+      checkAuth()
 
       try: resp($(%listRuns(cfg, @"projectName")), JSON)
-      except: response.buildJson(Http404, getCurrentExceptionMsg()); return true
+      except: jsonResp(Http404, getCurrentExceptionMsg())
 
     get "/project/@projectName/runs/active":
       ## List all currently active runs
 
-      checkAuth(); if not authed: return true
+      checkAuth()
 
       try:
         let activeRuns = workers
@@ -267,55 +274,49 @@ proc start*(cfg: StrawBossConfig): void =
       except:
         try: raise getCurrentException()
         except NotFoundException:
-          response.buildJson(Http404, getCurrentExceptionMsg())
+          jsonResp(Http404, getCurrentExceptionMsg())
         except:
-          response.build500Json(getCurrentException(),
+          json500Resp(getCurrentException(), "problem loading active runs")
-                                "problem loading active runs")
-        return true
 
     get "/project/@projectName/run/@runId":
       ## Details for a specific run
 
-      checkAuth(); if not authed: return true
+      checkAuth()
 
       # Make sure we know about that project
       try: discard cfg.getProject(@"projectName")
-      except: response.buildJson(Http404, getCurrentExceptionMsg()); return true
+      except: jsonResp(Http404, getCurrentExceptionMsg())
 
       if not existsRun(cfg, @"projectName", @"runId"):
-        response.buildJson(Http404, "no such run for project"); return true
+        jsonResp(Http404, "no such run for project")
 
       try: resp($getRun(cfg, @"projectName", @"runId"), JSON)
       except:
-        response.build500Json(getCurrentException(),
+        json500Resp(getCurrentException(),
           "unable to load run details for project " & @"projectName" &
           " run " & @"runId")
-        return true
 
     get "/project/@projectName/run/@runId/logs":
       ## Get logs from a specific run
 
-      checkAuth(); if not authed: return true
+      checkAuth()
 
       try: discard cfg.getProject(@"projectName")
       except:
-        response.buildJson(Http404, getCurrentExceptionMsg())
+        jsonResp(Http404, getCurrentExceptionMsg())
-        return true
 
       if not existsRun(cfg, @"projectName", @"runId"):
-        response.buildJson(Http404, "no such run for project")
+        jsonResp(Http404, "no such run for project")
-        return true
 
       try: resp($getLogs(cfg, @"projectName", @"runId"))
       except:
-        response.build500Json(getCurrentException(),
+        json500Resp(getCurrentException(),
           "unable to load run logs for " & @"projectName" & " run " & @"runId")
-        return true
 
     get "/project/@projectName/step/@stepName/artifacts/@version":
       ## Get the list of artifacts that were built for
 
-      checkAuth(); if not authed: return true
+      checkAuth()
 
       debug "Matched artifacts list request: " & $(%*{
         "project": @"projectName",
@@ -327,16 +328,15 @@ proc start*(cfg: StrawBossConfig): void =
       except:
         try: raise getCurrentException()
         except NotFoundException:
-          response.buildJson(Http404, getCurrentExceptionMsg())
+          jsonResp(Http404, getCurrentExceptionMsg())
         except:
-          response.build500Json(getCurrentException(), "unable to list artifacts for " &
+          json500Resp(getCurrentException(), "unable to list artifacts for " &
             @"projectName" & ":" & @"stepName" & "@" & @"buildRef")
-        return true
 
     get "/project/@projectName/step/@stepName/artifact/@version/@artifactName":
       ## Get a specific artifact that was built.
 
-      checkAuth(); if not authed: return true
+      checkAuth()
 
       var artifactPath: string
       try: artifactPath = getArtifactPath(cfg,
@@ -344,11 +344,12 @@ proc start*(cfg: StrawBossConfig): void =
       except:
         try: raise getCurrentException()
         except NotFoundException:
-          response.buildJson(Http404, getCurrentExceptionMsg())
+          jsonResp(Http404, getCurrentExceptionMsg())
         except:
-          response.build500Json(getCurrentException(), "unable to check artifact path for " &
+          json500Resp(getCurrentException(), "unable to check artifact path for " &
             @"projectName" & ":" & @"stepName" & "@" & @"version")
-        return true
+
+      enableRawMode
 
       debug "Preparing: " & artifactPath
       let fileSize = getFileSize(artifactPath)
@@ -361,19 +362,19 @@ proc start*(cfg: StrawBossConfig): void =
         # If the user has a cached version of this file and it matches our
         # version, let them use it
         if request.headers.hasKey("If-None-Match") and request.headers["If-None-Match"] == hashed:
-          resp(Http304, [], "")
+          resp(Http304)
         else:
           resp(Http200, [
             ("Content-Disposition", "; filename=\"" & @"artifactName" & "\""),
             ("Content-Type", mimetype),
             ("ETag", hashed )], file)
       else:
-        let headers = {
+        let headers = @{
           "Content-Disposition": "; filename=\"" & @"artifactName" & "\"",
           "Content-Type": mimetype,
           "Content-Length": $fileSize
-        }.newStringTable
+        }
-        await response.sendHeaders(Http200, headers)
+        request.sendHeaders(Http200, headers)
 
         var fileStream = newFutureStream[string]("sendStaticIfExists")
         var file = openAsync(artifactPath, fmRead)
@@ -384,25 +385,22 @@ proc start*(cfg: StrawBossConfig): void =
         # `bodyStream` has been written to the file.
         while true:
           let (hasValue, value) = await fileStream.read()
-          if hasValue:
+          if hasValue: request.send(value)
-            await response.client.send(value)
+          else: break
-          else:
-            break
         file.close()
 
     get "/project/@projectName/step/@stepName/status/@buildRef":
       ## Get detailed information about the status of a step (assuming it has been built)
 
-      checkAuth(); if not authed: return true
+      checkAuth()
 
       try: resp($cfg.getBuildStatus(@"projectName", @"stepName", @"buildRef"), JSON)
       except:
         try: raise getCurrentException()
-        except NotFoundException: response.buildJson(Http404, getCurrentExceptionMsg())
+        except NotFoundException: jsonResp(Http404, getCurrentExceptionMsg())
         except:
-          response.build500Json(getCurrentException(), "unable to load the build state for " &
+          json500Resp(getCurrentException(), "unable to load the build state for " &
             @"projectName" & ":" & @"stepName" & "@" & @"buildRef")
-        return true
 
     #get "/project/@projectName/step/@stepName/status/@buildRef.svg":
       ## Get an image representing the status of a build
@@ -413,14 +411,14 @@ proc start*(cfg: StrawBossConfig): void =
     post "/project/@projectName/step/@stepName/run/@buildRef?":
       # Kick off a run
 
-      checkAuth(); if not authed: return true
+      checkAuth()
 
       let runRequest = RunRequest(
         runId: genUUID(),
         projectName: @"projectName",
         stepName: @"stepName",
-        buildRef: if @"buildRef" != "": @"buildRef" else: nil,
+        buildRef: if @"buildRef" != "": @"buildRef" else: "",
-        timestamp: getLocalTime(getTime()),
+        timestamp: getTime().local,
         forceRebuild: false) # TODO support this with optional query params
 
       # TODO: instead of immediately spawning a worker, add the request to a
@@ -436,13 +434,11 @@ proc start*(cfg: StrawBossConfig): void =
           status: status), JSON)
       except:
         try: raise getCurrentException()
-        except NotFoundException:
+        except NotFoundException: jsonResp(Http404, getCurrentExceptionMsg())
-          response.buildJson(Http404, getCurrentExceptionMsg())
+        except: jsonResp(Http400, getCurrentExceptionMsg())
-        except: response.buildJson(Http400, getCurrentExceptionMsg())
-        return true
 
     post "/service/debug/stop":
-      if not cfg.debug: response.buildJson(Http404); return true
+      if not cfg.debug: jsonResp(Http404)
       else:
         let shutdownFut = sleepAsync(100)
         shutdownFut.callback = proc(): void = complete(stopFuture)
@@ -450,10 +446,10 @@ proc start*(cfg: StrawBossConfig): void =
 
 
     get re".*":
-      response.buildJson(Http404); return true
+      jsonResp(Http404)
 
     post re".*":
-      response.buildJson(Http404); return true
+      jsonResp(Http404)
 
   proc performMaintenance(cfg: StrawBossConfig): void =
     # Prune workers

src/test/nim/functional/tserver.nim

@@ -50,7 +50,7 @@ suite "strawboss server":
       @["serve", "-c", tempCfgPath], loadEnv(), {poUsePath})
 
     # give the server time to spin up
-    sleep(100)
+    sleep(200)
 
   teardown:
     discard newAsyncHttpClient().post(apiBase & "/service/debug/stop")
@@ -60,7 +60,7 @@ suite "strawboss server":
       removeFile(tempCfgPath)
 
     # give the server time to spin down but kill it after that
-    sleep(100)
+    sleep(200)
     if serverProcess.running: kill(serverProcess)
 
   test "handle missing project configuration":

src/test/nim/testutil.nim

@@ -26,7 +26,7 @@ proc waitForBuild*(client: HttpClient, apiBase, projectName, runId: string,
     #echo "Checking (" & $curElapsed & " has passed)."
 
     if curElapsed > toFloat(timeout):
-      raise newException(SystemError, "Timeout exceeded waiting for build.")
+      raise newException(Exception, "Timeout exceeded waiting for build.")
 
     let resp = client.get(apiBase & "/project/" & projectName & "/run/" & runId)
 

src/test/nim/unit/tconfiguration.nim

@@ -1,6 +1,7 @@
 import json, strtabs, times, tables, unittest, uuids
 
 from langutils import sameContents
+from timeutils import trimNanoSec
 import ../../../main/nim/strawbosspkg/configuration
 
 suite "load and save configuration objects":
@@ -26,7 +27,7 @@ suite "load and save configuration objects":
       stepName: "build",
       buildRef: "master",
       workspaceDir: "/no-real/dir",
-      timestamp: getLocalTime(getTime()),
+      timestamp: getTime().local.trimNanoSec,
       forceRebuild: true)
 
     let rrStr = $rr1
@@ -107,7 +108,7 @@ suite "load and save configuration objects":
       pc.steps["build"].dontSkip == true
       pc.steps["build"].stepCmd == "cust-build"
       pc.steps["build"].workingDir == "dir1"
-      pc.steps["containerImage"] == "alpine"
+      pc.steps["build"].containerImage == "alpine"
       sameContents(pc.steps["build"].artifacts, @["bin1", "doc1"])
       sameContents(pc.steps["build"].depends, @["test"])
       sameContents(pc.steps["build"].expectedEnv, @["VAR1"])
@@ -117,8 +118,8 @@ suite "load and save configuration objects":
       pc.steps["test"].name == "test"
       pc.steps["test"].dontSkip == false
       pc.steps["test"].stepCmd == "true"
-      pc.steps["test"].workingDir == ".:
+      pc.steps["test"].workingDir == "."
-      pc.steps["test"].containerImage.isNilOrEmpty
+      pc.steps["test"].containerImage.len == 0
       sameContents(pc.steps["test"].artifacts, @[])
       sameContents(pc.steps["test"].depends, @[])
       sameContents(pc.steps["test"].expectedEnv, @[])

strawboss.nimble

@@ -9,8 +9,8 @@ srcDir        = "src/main/nim"
 
 # Dependencies
 
-requires @["nim >= 0.16.1", "docopt >= 0.6.5", "isaac >= 0.1.2", "tempfile", "jester", "bcrypt",
+requires @["nim >= 0.19.0", "docopt >= 0.6.8", "isaac >= 0.1.3", "tempfile", "jester >= 0.4.1", "bcrypt",
-           "untar", "uuids"]
+           "untar", "uuids >= 0.1.10", "jwt"]
 
 # Hacky to point to a specific hash. But there is some bug building in the
 # docker image we use to build the project with the next version. It adds an
@@ -18,10 +18,11 @@ requires @["nim >= 0.16.1", "docopt >= 0.6.5", "isaac >= 0.1.2", "tempfile", "je
 # wrong and it tries to build against the 1.1 API even though the image only
 # has the 1.0 API. I'm crossing my fingers and hoping that our base image
 # supports libssl 1.1 before I need to update this library.
-requires "https://github.com/yglukhov/nim-jwt#549aa1eb13b8ddc0c6861d15cc2cc5b52bcbef01"
+#requires "https://github.com/yglukhov/nim-jwt#549aa1eb13b8ddc0c6861d15cc2cc5b52bcbef01"
 
-requires "https://git.jdb-labs.com/jdb/nim-lang-utils.git >= 0.3.0"
+requires "https://git.jdb-labs.com/jdb/nim-lang-utils.git >= 0.4.0"
-requires "https://git.jdb-labs.com/jdb/nim-cli-utils.git >= 0.3.1"
+requires "https://git.jdb-labs.com/jdb/nim-cli-utils.git >= 0.6.0"
+requires "https://git.jdb-labs.com/jdb/nim-time-utils.git >= 0.4.0"
 
 # Tasks
 task functest, "Runs the functional test suite.":

strawboss.projectdef.json

@@ -3,7 +3,7 @@
   "steps": {
     "compile": {
       "artifacts": ["strawboss"],
-      "stepCmd": "docker run -v `pwd`:/usr/src/strawboss -w /usr/src/strawboss jdbernard/nim:0.17.2 nimble build"
+      "stepCmd": "docker run -v `pwd`:/usr/src/strawboss -w /usr/src/strawboss jdbernard/nim:0.17.2 nimble install"
     },
     "unittest": {
       "depends": ["compile"],