Merge branch 'release/r9'

Author: chuwy

.travis.yml

@@ -4,7 +4,7 @@ scala:
 jdk:
 - oraclejdk8
 script:
-- cd 2-repositories/scala-repo-server
+- cd 2-repositories/iglu-server
 - ./scripts/create-test-user.bash
 - sbt test
 - cd ../..
@@ -29,6 +29,12 @@ deploy:
   on:
     condition: '"$(.travis/is_igluctl_release_tag.sh $TRAVIS_TAG)" == "" && $? == 0'
     tags: true
+- provider: script
+  skip_cleanup: true
+  script: ./.travis/deploy_iglu_server.sh $TRAVIS_TAG
+  on:
+    condition: '"$(.travis/is_iglu_server_release_tag.sh $TRAVIS_TAG)" == "" && $? == 0'
+    tags: true
 env:
   global:
   - secure: D5Egj4tqCXpL7H4x/BsPs9tOVX7Q20ooaB5e7+KDBk9PdLFFLHGMJP6+lRjmLNnX89ngWSNmPyu9L5qJ8D4Bmuy+s2bMN8iM/bryJrGvAMUjLXnVEaENn4hd7Xn6zA0JoTvyk8jEiLlTsZakpz8j8N6g9mscZXsMoXtRWFOnE0s=

.travis/deploy_iglu_server.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+tag=$1
+
+project="iglu-server/"
+project_len=${#project}
+
+cicd=${tag:0:${project_len}}
+release=${tag:${project_len}}
+
+if [ "${cicd}" == "${project}" ]; then
+    if [ "${release}" == "" ]; then
+        echo "WARNING! No release specified! Ignoring."
+        exit 2
+    fi
+else
+    echo "This can't be deployed - there's no ${project} tag! (Is the travis condition set?)"
+    exit 1
+fi
+
+cd "${TRAVIS_BUILD_DIR}"
+
+export TRAVIS_BUILD_RELEASE_TAG="${release}"
+release-manager \
+    --config "./.travis/release_iglu_server.yml" \
+    --check-version \
+    --make-version \
+    --make-artifact \
+    --upload-artifact

.travis/is_iglu_server_release_tag.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+tag=$1
+cicd=${tag:0:12}
+release=${tag:12}
+
+if [ "${cicd}" == "iglu-server/" ]; then
+  if [ "${release}" == "" ]; then
+    echo "Warning! No release specified! Ignoring."
+    exit 2
+  fi
+  exit 0
+else
+  exit 1
+fi

.travis/release_iglu_server.yml

@@ -0,0 +1,32 @@
+# Required: local settings
+local:
+  root_dir : <%= ENV['TRAVIS_BUILD_DIR'] %>
+
+# Required: deployment targets
+targets:
+  - type     : "bintray"
+    user     : <%= ENV['BINTRAY_SNOWPLOW_GENERIC_USER'] %>
+    password : <%= ENV['BINTRAY_SNOWPLOW_GENERIC_API_KEY'] %>
+
+# Required: packages to be deployed
+packages:
+  - repo     : "snowplow-generic"
+    name     : "iglu-server"
+    user_org : "snowplow"
+    publish  : true
+    override : false
+    continue_on_conflict : false
+    version  : <%= FUNC['sbt_version(2-repositories/iglu-server/)'] %>
+    build_version : <%= ENV['TRAVIS_BUILD_RELEASE_TAG'] %>
+    build_commands:
+      - cd 2-repositories/iglu-server && sbt assembly && cd ../..
+
+    # Required: Artifact
+    artifacts:
+      - prefix : "iglu_server_"
+        suffix : ""
+        type   : "zip"
+
+        # The binaries to put in the zip
+        binary_paths:
+          - 2-repositories/iglu-server/target/scala-2.11/iglu-server-{{ packages.0.build_version }}.jar

0-common/igluctl/project/BuildSettings.scala

@@ -28,7 +28,7 @@ object BuildSettings {
   lazy val basicSettings = Seq[Setting[_]](
     name                  :=  "igluctl",
     organization          :=  "com.snowplowanalytics",
-    version               :=  "0.4.0",
+    version               :=  "0.4.1",
     description           :=  "Iglu Command Line Interface",
     scalaVersion          :=  "2.12.4",
     scalacOptions         :=  Seq(

0-common/igluctl/project/Dependencies.scala

@@ -18,6 +18,12 @@ object Dependencies {
     // Java
     val jsonValidator    = "2.2.6"
     val awsJava          = "1.11.250"
+    // JAXB APIs aren't resolved by default as of Java 9
+    // https://docs.oracle.com/javase/9/migrate/#GUID-F640FA9D-FB66-4D85-AD2B-D931174C09A3
+    val javaxXmlBind     = "2.3.0"
+    val jaxbCore         = "2.3.0"
+    val jaxbImpl         = "2.3.0"
+    val activation       = "1.1.1"
     // Scala
     val schemaddl        = "0.7.0"
     val scopt            = "3.5.0"
@@ -33,6 +39,11 @@ object Dependencies {
     // Java
     val jsonValidator    = "com.github.fge"             %  "json-schema-validator"     % V.jsonValidator
     val awsJava          = "com.amazonaws"              %  "aws-java-sdk-s3"           % V.awsJava
+    // JAXB APIs
+    val javaxXmlBind     = "javax.xml.bind"             %  "jaxb-api"                  % V.javaxXmlBind
+    val jaxbCore         = "com.sun.xml.bind"           %  "jaxb-core"                 % V.jaxbCore
+    val jaxbImpl         = "com.sun.xml.bind"           %  "jaxb-impl"                 % V.jaxbImpl
+    val activation       = "javax.activation"           %  "activation"                % V.activation
     // Scala
     val schemaddl        = "com.snowplowanalytics"      %% "schema-ddl"                % V.schemaddl
     val scopt            = "com.github.scopt"           %% "scopt"                     % V.scopt

0-common/igluctl/project/IgluctlBuild.scala

@@ -34,6 +34,11 @@ object IgluctlBuild extends Build {
         // Java
         Libraries.jsonValidator,
         Libraries.awsJava,
+        // JAXB APIs
+        Libraries.javaxXmlBind,
+        Libraries.jaxbCore,
+        Libraries.jaxbImpl,
+        Libraries.activation,
         // Scala
         Libraries.schemaddl,
         Libraries.scopt,

0-common/igluctl/src/main/scala/com.snowplowanalytics.iglu/ctl/GenerateCommand.scala

@@ -171,7 +171,8 @@ case class GenerateCommand(
       if (input.isFile) {
         val schemaVerWarning = schemas.head.self.version match {
           case SchemaVer.Full(1, 0, 0) => List.empty[String]
-          case _                       => List(s"Warning: File [${input.getAbsolutePath}] contains a schema whose version is NOT 1-0-0")
+          case _                       => List(s"Warning: File [${input.getAbsolutePath}] contains a schema " +
+                                                s"whose version is NOT 1-0-0. Migrations can be inconsistent.")
         }
         Warnings(schemaVerWarning)
       } else {
@@ -185,14 +186,14 @@ case class GenerateCommand(
                 (name, schemaMaps) <- schemaMapsGroupByName.toList
                 if !schemaMaps.exists(sm => sm.version == SchemaVer.Full(1, 0, 0)) && !force
               } yield s"Error: Directory [${input.getAbsolutePath}] contains schemas of [$vendor/$name] without version 1-0-0." +
-                      " Use --force to switch off schema version check."
+                      " Migrations can be inconsistent." + " Use --force to switch off schema version check."
             val schemaVerGapErrors: List[String] =
               for {
                 (name, schemaMaps) <- schemaMapsGroupByName.toList
                 sortedSchemaMaps = schemaMaps.sortWith(_.version.asString < _.version.asString)
                 if sortedSchemaMaps.head.version == SchemaVer.Full(1, 0, 0) && existMissingSchemaVersion(sortedSchemaMaps) && !force
               } yield s"Error: Directory [${input.getAbsolutePath}] contains schemas of [$vendor/$name] which has gaps between schema versions." +
-                      " Use --force to switch off schema version check."
+                      " Migrations can be inconsistent." + " Use --force to switch off schema version check."
 
             firstVersionNotFoundErrors ::: schemaVerGapErrors
           }
@@ -356,6 +357,8 @@ case class GenerateCommand(
       println(missingSchemaVerErrors.mkString("\n"))
       sys.exit(1)
     } else {
+      result.warnings.foreach(printMessage)
+
       result.ddls
         .map(_.setBasePath("sql"))
         .map(_.setBasePath(output.getAbsolutePath))
@@ -370,12 +373,7 @@ case class GenerateCommand(
         .map(_.setBasePath("sql"))
         .map(_.setBasePath(output.getAbsolutePath))
         .map(_.write(force)).foreach(printMessage)
-
-      result.warnings.foreach(printMessage)
-
-      if (result.warnings.exists(_.contains("Error"))) sys.exit(1)
     }
-
   }
 }
 

0-common/igluctl/src/main/scala/com.snowplowanalytics.iglu/ctl/LintCommand.scala

@@ -60,19 +60,24 @@ case class LintCommand(inputDir: File, skipWarnings: Boolean, linters: List[Lint
     val stubCommand = GenerateCommand(stubFile, stubFile)
     val (_, schemas) = splitValidations(validatedJsons.map(_.extractSelfDescribingSchema))
     val schemaVerValidation: Result = stubCommand.validateSchemaVersions(schemas)
-    // strip GenerateCommand related parts off & prepare LintCommand failure messages
-    val lintSchemaVerMessages: List[String] = schemaVerValidation match {
-      case Warnings(lst) => lst.map(w => "FAILURE" + w.stripPrefix("Warning"))
-      case Errors(lst) => lst.map(e => "FAILURE" + e.stripPrefix("Error").stripSuffix(" Use --force to switch off schema version check."))
-      case VersionSuccess(_) => List.empty[String]
-    }
-    lintSchemaVerMessages.foreach(println)
 
     val reports = jsons.map { file =>
       val report = file.map(check)
       flattenReport(report)
     }
-    reports.foldLeft(Total(0, 0, lintSchemaVerMessages.size))((acc, cur) => acc.add(cur)).exit()
+
+    // strip GenerateCommand related parts off & prepare LintCommand messages & create a Total per schema version check
+    schemaVerValidation match {
+      case Warnings(lst) =>
+        lst.map(w => "WARNING" + w.stripPrefix("Warning")).foreach(println)
+        reports.foldLeft(Total(0, 0, 0, lst.size))((acc, cur) => acc.add(cur)).exit()
+      case Errors(lst) =>
+        lst.map(e => "FAILURE" +
+              e.stripPrefix("Error").stripSuffix(" Use --force to switch off schema version check.")).foreach(println)
+        reports.foldLeft(Total(0, 0, lst.size, 0))((acc, cur) => acc.add(cur)).exit()
+      case VersionSuccess(_) =>
+        reports.foldLeft(Total(0, 0, 0, 0))((acc, cur) => acc.add(cur)).exit()
+    }
   }
 
   /**
@@ -111,14 +116,15 @@ object LintCommand {
    * @param successes number of successfully validated schemas
    * @param failedSchemas number of schemas with errors
    */
-  case class Total(successes: Int, failedSchemas: Int, totalFailures: Int) {
+  case class Total(successes: Int, failedSchemas: Int, totalFailures: Int, totalWarnings: Int) {
     /**
      * Exit from app with error status if invalid schemas were found
      */
     def exit(): Unit = {
       println(s"TOTAL: $successes Schemas were successfully validated")
       println(s"TOTAL: $failedSchemas invalid Schemas were encountered")
       println(s"TOTAL: $totalFailures errors were encountered")
+      println(s"TOTAL: $totalWarnings warnings were encountered")
 
       if (failedSchemas + totalFailures > 0) sys.exit(1)
       else sys.exit(0)

0-common/igluctl/src/test/scala/com/snowplowanalytics/iglu/ctl/GenerateCommandSpec.scala

@@ -681,7 +681,7 @@ class GenerateCommandSpec extends Specification { def is = s2"""
 
     schemaVerMessages must beEqualTo(List(
       s"Error: Directory [${stubFile.getAbsolutePath}] contains schemas of [com.example-agency/cast] which has gaps between schema versions." +
-        " Use --force to switch off schema version check."
+        " Migrations can be inconsistent." + " Use --force to switch off schema version check."
     ))
   }
 
@@ -752,7 +752,7 @@ class GenerateCommandSpec extends Specification { def is = s2"""
 
     schemaVerMessages must beEqualTo(List(
       s"Error: Directory [${stubFile.getAbsolutePath}] contains schemas of [com.example-agency/cast] without version 1-0-0." +
-        s" Use --force to switch off schema version check."
+        " Migrations can be inconsistent." + " Use --force to switch off schema version check."
     ))
   }
 

2-repositories/README.md

@@ -10,7 +10,7 @@ We currently have two Iglu "repo" technologies available for deploying your Iglu
 |:-------------------------|:-------------|:-----------------------------------------------------------|:-----------------|
 | [JVM-embedded repo][r1] | Embedded     | An Iglu repository embedded in a Java or Scala application | Production-ready |
 | [Static repo][r2]       | Remote       | An Iglu repository server structured as a static website   | Production-ready |
-| [Scala repo server][r3] | Remote       | A RESTful Iglu repository server written in Scala          | Beta             |
+| [Iglu Server][r3]       | Remote       | A RESTful Iglu repository server written in Scala          | Production-ready  |
 
 <a name="iglu-central" />
 
@@ -30,7 +30,7 @@ We do not git-submodule Iglu Central into the main Iglu repository because it is
 
 [r1]: ./jvm-embedded-repo
 [r2]: ./static-repo
-[r3]: ./scala-repo-server
+[r3]: ./iglu-server
 
 [iglucentral-website]: http://iglucentral.com/
 [iglucentral-repo]: https://github.com/snowplow/iglu-central

2-repositories/scala-repo-server/.gitignore renamed to 2-repositories/iglu-server/.gitignore

@@ -1,6 +1,6 @@
-# Scala repo server
+# Iglu Server
 
-A Scala-based repository server for Iglu, allowing users to publish, test and serve schemas via an easy-to-use RESTful interface.
+Iglu Server is a RESTful schema registry, allowing users to publish, test and serve schemas via an easy-to-use RESTful interface.
 
 ## Find out more
 
@@ -10,7 +10,7 @@ A Scala-based repository server for Iglu, allowing users to publish, test and se
 
 ## Copyright and license
 
-Scala Repo Server is copyright 2014-2017 Snowplow Analytics Ltd.
+Iglu Server is copyright 2014-2018 Snowplow Analytics Ltd.
 
 Licensed under the **[Apache License, Version 2.0][license]** (the "License");
 you may not use this software except in compliance with the License.

2-repositories/scala-repo-server/LICENSE-2.0.txt renamed to 2-repositories/iglu-server/LICENSE-2.0.txt

@@ -0,0 +1,47 @@
+/* 
+* Copyright (c) 2014 Snowplow Analytics Ltd. All rights reserved.
+*
+* This program is licensed to you under the Apache License Version 2.0, and
+* you may not use this file except in compliance with the Apache License
+* Version 2.0.  You may obtain a copy of the Apache License Version 2.0 at
+* http://www.apache.org/licenses/LICENSE-2.0.
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the Apache License Version 2.0 is distributed on an "AS
+* IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+* implied.  See the Apache License Version 2.0 for the specific language
+* governing permissions and limitations there under.
+*/
+
+import Dependencies._
+import BuildSettings._
+
+//Configure prompt to show current project
+shellPrompt := { s => Project.extract(s).currentProject.id + " > " }
+
+// Define our project with basic information and library dependencies
+lazy val project = Project("iglu-server", file("."))
+  .settings(buildSettings: _*)
+  .settings(
+    libraryDependencies ++= Seq(
+      // Scala
+      Libraries.scopt,
+      Libraries.akkaActor,
+      Libraries.akkaSlf4j,
+      Libraries.joda,
+      Libraries.jodaTime,
+      Libraries.json4s,
+      Libraries.json4sScalaz,
+      Libraries.jsonValidator,
+      Libraries.slf4j,
+      Libraries.slick,
+      Libraries.slickpg,
+      Libraries.slickpgJoda,
+      Libraries.akkaHttp,
+      Libraries.swaggerAkkaHttp,
+      // Scala (test only)
+      Libraries.akkaTestKit,
+      Libraries.specs2,
+      Libraries.akkaHttpTestKit
+    )
+  )