Merge pull request #2 from uptane/publish-github

Use io.github.uptane org

Author: simao

.github/workflows/ci.yml

@@ -0,0 +1,27 @@
+name: Test & Build
+on: [push]
+env:
+  SBT_OPTS: "-Dsbt.color=true -Dscala.color=true"
+jobs:
+  run-tests:
+    name: Run tests
+    runs-on: ubuntu-latest
+    container: uptane/ci:latest
+    services:
+      db:
+        image: mariadb:10.4
+        env:
+          MYSQL_ROOT_PASSWORD: "root"
+          MYSQL_DATABASE: "ota_treehub"
+          MYSQL_USER: "treehub"
+          MYSQL_PASSWORD: "treehub"
+
+    env:
+      DB_URL: "jdbc:mariadb://db:3306/ota_treehub"
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Coursier cache
+        uses: coursier/cache-action@v6
+      - run: ./deploy/ci-db-setup.sh db
+      - run: sbt ut:test

.github/workflows/release.yml

@@ -0,0 +1,26 @@
+name: Release
+on:
+  push:
+    branches: [master]
+    tags: ["*"]
+env:
+  SBT_OPTS: "-Dsbt.color=true -Dscala.color=true"
+
+jobs:
+  build-images:
+    name: Build and Push Images
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - uses: olafurpg/setup-scala@v11
+        with:
+          java-version: [email protected]
+      - uses: coursier/cache-action@v6
+      - run: sbt docker:publishLocal
+      - run: docker tag advancedtelematic/treehub:$GITHUB_SHA uptane/treehub:$GITHUB_SHA
+      - run: docker push uptane/treehub:$GITHUB_SHA

build.sbt

@@ -4,12 +4,6 @@ scalaVersion := "2.12.8"
 
 scalacOptions := Seq("-unchecked", "-deprecation", "-encoding", "utf8")
 
-resolvers += "ATS Releases" at "https://nexus.ota.here.com/content/repositories/releases"
-
-resolvers += "ATS Snapshots" at "https://nexus.ota.here.com/content/repositories/snapshots"
-
-resolvers += "commons-logging-empty" at "https://version99.qos.ch"
-
 def itFilter(name: String): Boolean = name endsWith "IntegrationSpec"
 
 def unitFilter(name: String): Boolean = !itFilter(name)
@@ -28,10 +22,10 @@ lazy val root = (project in file("."))
   .settings(testOptions in IntegrationTest := Seq(Tests.Filter(itFilter)))
   .settings(sonarSettings)
   .settings(Seq(libraryDependencies ++= {
-    val akkaV = "2.5.25"
-    val akkaHttpV = "10.1.10"
+    val akkaV = "2.6.5"
+    val akkaHttpV = "10.1.12"
     val scalaTestV = "3.0.8"
-    val libatsV = "0.3.0-109-ge12f057"
+    val libatsV = "0.4.0-21-g0e8d408"
 
     Seq(
       "com.typesafe.akka" %% "akka-actor" % akkaV,
@@ -45,17 +39,16 @@ lazy val root = (project in file("."))
       "ch.qos.logback" % "logback-classic" % "1.2.3",
       "org.slf4j" % "slf4j-api" % "1.7.25",
 
-      "com.advancedtelematic" %% "libats" % libatsV,
-      "com.advancedtelematic" %% "libats-http" % libatsV,
-      "com.advancedtelematic" %% "libats-http-tracing" % libatsV,
-      "com.advancedtelematic" %% "libats-messaging" % libatsV,
-      "com.advancedtelematic" %% "libats-messaging-datatype" % libatsV,
-      "com.advancedtelematic" %% "libats-auth" % libatsV,
-      "com.advancedtelematic" %% "libats-slick" % libatsV,
-      "com.advancedtelematic" %% "libats-metrics-akka" % libatsV,
-      "com.advancedtelematic" %% "libats-metrics-prometheus" % libatsV,
-      "com.advancedtelematic" %% "libats-logging" % libatsV,
-      "com.advancedtelematic" %% "libats-logging" % libatsV,
+      "io.github.uptane" %% "libats" % libatsV,
+      "io.github.uptane" %% "libats-http" % libatsV,
+      "io.github.uptane" %% "libats-http-tracing" % libatsV,
+      "io.github.uptane" %% "libats-messaging" % libatsV,
+      "io.github.uptane" %% "libats-messaging-datatype" % libatsV,
+      "io.github.uptane" %% "libats-slick" % libatsV,
+      "io.github.uptane" %% "libats-metrics-akka" % libatsV,
+      "io.github.uptane" %% "libats-metrics-prometheus" % libatsV,
+      "io.github.uptane" %% "libats-logging" % libatsV,
+      "io.github.uptane" %% "libats-logging" % libatsV,
 
       "org.scala-lang.modules" %% "scala-async" % "0.9.6",
       "org.mariadb.jdbc" % "mariadb-java-client" % "1.4.4",

deploy/ci-db-setup.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+set -xeuo pipefail
+
+MYSQL_COMMAND=mysql
+HOST=$1
+MYSQL=mysql
+MYSQLADMIN=mysqladmin
+
+until $MYSQLADMIN ping --silent --protocol=TCP -h $HOST -P 3306 -u root -proot; do
+    echo waiting for mysql; sleep 1
+done
+
+$MYSQL -v -h $HOST -u root -proot <<EOF
+CREATE DATABASE IF NOT EXISTS ota_treehub;
+
+CREATE USER IF NOT EXISTS 'treehub' IDENTIFIED BY 'treehub';
+
+GRANT ALL PRIVILEGES ON \`ota\_treehub%\`.* TO 'treehub'@'%';
+FLUSH PRIVILEGES;
+EOF

src/main/scala/com/advancedtelematic/treehub/Boot.scala

@@ -2,8 +2,7 @@ package com.advancedtelematic.treehub
 
 import akka.http.scaladsl.Http
 import akka.http.scaladsl.server.{Directives, Route}
-import com.advancedtelematic.libats.data.DataType.Namespace
-import com.advancedtelematic.libats.http.BootApp
+import com.advancedtelematic.libats.http.{BootApp, NamespaceDirectives}
 import com.advancedtelematic.libats.http.LogDirectives._
 import com.advancedtelematic.libats.http.VersionDirectives._
 import com.advancedtelematic.libats.http.tracing.Tracing
@@ -15,11 +14,10 @@ import com.advancedtelematic.metrics.{AkkaHttpRequestMetrics, MetricsSupport}
 import com.advancedtelematic.treehub.client._
 import com.advancedtelematic.treehub.daemon.StaleObjectArchiveActor
 import com.advancedtelematic.treehub.delta_store.{LocalDeltaStorage, S3DeltaStorage}
-import com.advancedtelematic.treehub.http.{TreeHubRoutes, Http => TreeHubHttp}
+import com.advancedtelematic.treehub.http.TreeHubRoutes
 import com.advancedtelematic.treehub.object_store.{LocalFsBlobStore, ObjectStore, S3BlobStore}
 import com.advancedtelematic.treehub.repo_metrics.UsageMetricsRouter
 
-
 object Boot extends BootApp with Directives with Settings with VersionInfo
   with BootMigrations
   with DatabaseConfig
@@ -35,8 +33,7 @@ object Boot extends BootApp with Directives with Settings with VersionInfo
 
   val deviceRegistry = new DeviceRegistryHttpClient(deviceRegistryUri, deviceRegistryMyApi)
 
-  val namespaceExtractor = TreeHubHttp.extractNamespace.map(_.namespace.get).map(Namespace.apply)
-  val deviceNamespace = TreeHubHttp.deviceNamespace(deviceRegistry)
+  val namespaceExtractor = NamespaceDirectives.defaultNamespaceExtractor
 
   lazy val objectStorage = {
     if(useS3) {
@@ -74,7 +71,6 @@ object Boot extends BootApp with Directives with Settings with VersionInfo
         tracing.traceRequests { _ =>
           new TreeHubRoutes(
             namespaceExtractor,
-            deviceNamespace,
             msgPublisher,
             objectStore,
             deltaStorage,

src/main/scala/com/advancedtelematic/treehub/http/DeviceIdDirectives.scala

@@ -20,7 +20,6 @@ import slick.jdbc.MySQLProfile.api._
 import scala.concurrent.ExecutionContext
 
 class TreeHubRoutes(namespaceExtractor: Directive1[Namespace],
-                    deviceNamespace: Directive1[Namespace],
                     messageBus: MessageBusPublisher,
                     objectStore: ObjectStore,
                     deltaStorage: StaticDeltaStorage,
@@ -47,10 +46,7 @@ class TreeHubRoutes(namespaceExtractor: Directive1[Namespace],
       ErrorHandler.handleErrors {
         treehubExceptionHandler {
           pathPrefix("api" / "v2") {
-            allRoutes(namespaceExtractor) ~
-              pathPrefix("mydevice") {
-                allRoutes(deviceNamespace)
-              }
+            allRoutes(namespaceExtractor)
           } ~
             pathPrefix("api" / "v3") {
               allRoutes(namespaceExtractor)

src/main/scala/com/advancedtelematic/treehub/http/Http.scala

@@ -33,7 +33,7 @@ class TreehubRoutesSpec extends TreeHubSpec with ResourceSpec {
   val errorObjectStore = new ObjectStore(errorBlobStore)
 
   override lazy val routes = new TreeHubRoutes(
-    namespaceExtractor, namespaceExtractor, messageBus, errorObjectStore, deltaStore, fakeUsageUpdate).routes
+    namespaceExtractor, messageBus, errorObjectStore, deltaStore, fakeUsageUpdate).routes
 
   test("returns 408 when an aws.SdkClientException is thrown") {
     val obj = new ClientTObject()

src/main/scala/com/advancedtelematic/treehub/http/TreeHubRoutes.scala

@@ -14,16 +14,16 @@ import com.advancedtelematic.treehub.object_store.{LocalFsBlobStore, ObjectStore
 import com.advancedtelematic.treehub.repo_metrics.UsageMetricsRouter.{UpdateBandwidth, UpdateStorage}
 import com.advancedtelematic.util.FakeUsageUpdate.{CurrentBandwith, CurrentStorage}
 import eu.timepit.refined.api.Refined
-import java.nio.file.Files
 
+import java.nio.file.Files
 import akka.stream.scaladsl.Source
 import akka.util.ByteString
 import org.scalatest.Suite
 
 import scala.util.Random
 import cats.syntax.either._
-import com.advancedtelematic.libats.auth.NamespaceDirectives
 import com.advancedtelematic.libats.data.DataType.Namespace
+import com.advancedtelematic.libats.http.NamespaceDirectives
 import com.advancedtelematic.libats.messaging.test.MockMessageBus
 import com.advancedtelematic.libats.messaging_datatype.DataType.Commit
 import com.advancedtelematic.libats.test.DatabaseSpec
@@ -87,7 +87,7 @@ trait ResourceSpec extends ScalatestRouteTest with DatabaseSpec with Settings {
   def apiUri(path: String): String = "/api/v2/" + path
   def apiUri(version: Int, path: String): String = s"/api/v$version/" + path
 
-  lazy val namespaceExtractor = NamespaceDirectives.defaultNamespaceExtractor.map(_.namespace)
+  lazy val namespaceExtractor = NamespaceDirectives.defaultNamespaceExtractor
 
   val objectStore = new ObjectStore(new LocalFsBlobStore(Files.createTempDirectory("treehub-obj")))
 
@@ -98,7 +98,6 @@ trait ResourceSpec extends ScalatestRouteTest with DatabaseSpec with Settings {
   lazy val messageBus = new MockMessageBus()
 
   lazy val routes = new TreeHubRoutes(
-    namespaceExtractor,
     namespaceExtractor,
     messageBus,
     objectStore,