chore: prepare 2.22.3 (#1196)

* chore: CLI upgraded to 1.9.3 * feat: GitLabUrl to remove suffix slash on instantiation
SwissDataScienceCenter · Nov 17, 2022 · 5326ebd · 5326ebd
1 parent 90f6880
commit 5326ebd
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 12 deletions.
diff --git a/commit-event-service/Dockerfile b/commit-event-service/Dockerfile
@@ -10,7 +10,7 @@ COPY . .
 RUN export PATH="/usr/local/sbt/bin:$PATH" && \
     apk update && apk add --no-cache --virtual .build-dependencies bash wget tar git && \
     mkdir -p "/usr/local/sbt" && \
-    wget -qO  - "https://github.com/sbt/sbt/releases/download/v1.7.2/sbt-1.7.2.tgz" | tar xz -C /usr/local/sbt --strip-components=1 && \
+    wget -qO  - "https://github.com/sbt/sbt/releases/download/v1.8.0/sbt-1.8.0.tgz" | tar xz -C /usr/local/sbt --strip-components=1 && \
     sbt writeVersionToVersionSbt && \
     sbt writeVersionToVersionConf && \
     sbt "project commit-event-service" stage  && \

diff --git a/event-log/Dockerfile b/event-log/Dockerfile
@@ -10,7 +10,7 @@ COPY . .
 RUN export PATH="/usr/local/sbt/bin:$PATH" && \
     apk update && apk add --no-cache --virtual .build-dependencies bash wget tar git && \
     mkdir -p "/usr/local/sbt" && \
-    wget -qO - "https://github.com/sbt/sbt/releases/download/v1.7.2/sbt-1.7.2.tgz" | tar xz -C /usr/local/sbt --strip-components=1 && \
+    wget -qO - "https://github.com/sbt/sbt/releases/download/v1.8.0/sbt-1.8.0.tgz" | tar xz -C /usr/local/sbt --strip-components=1 && \
     sbt writeVersionToVersionSbt && \
     sbt writeVersionToVersionConf && \
     sbt "project event-log" stage && \

diff --git a/graph-commons/build.sbt b/graph-commons/build.sbt
@@ -25,7 +25,7 @@ libraryDependencies += "com.github.pureconfig" %% "pureconfig"      % pureConfig
 libraryDependencies += "com.github.pureconfig" %% "pureconfig-cats" % pureConfigVersion
 
 libraryDependencies += "eu.timepit"   %% "refined-pureconfig" % "0.10.1"
-libraryDependencies += "io.sentry"     % "sentry-logback"     % "6.7.0"
+libraryDependencies += "io.sentry"     % "sentry-logback"     % "6.7.1"
 libraryDependencies += "org.tpolecat" %% "skunk-core"         % "0.3.2"
 
 val http4sVersion           = "0.23.16"

diff --git a/knowledge-graph/Dockerfile b/knowledge-graph/Dockerfile
@@ -10,7 +10,7 @@ COPY . .
 RUN export PATH="/usr/local/sbt/bin:$PATH" && \
     apk update && apk add --no-cache --virtual .build-dependencies bash wget tar git && \
     mkdir -p "/usr/local/sbt" && \
-    wget -qO - "https://github.com/sbt/sbt/releases/download/v1.7.2/sbt-1.7.2.tgz" | tar xz -C /usr/local/sbt --strip-components=1 && \
+    wget -qO - "https://github.com/sbt/sbt/releases/download/v1.8.0/sbt-1.8.0.tgz" | tar xz -C /usr/local/sbt --strip-components=1 && \
     sbt writeVersionToVersionSbt && \
     sbt writeVersionToVersionConf && \
     sbt "project knowledge-graph" stage && \

diff --git a/knowledge-graph/build.sbt b/knowledge-graph/build.sbt
@@ -26,7 +26,7 @@ libraryDependencies += "org.apache.logging.log4j" % "log4j-core"      % "2.19.0"
 
 libraryDependencies += "com.github.dgarijo" % "widoco" % "1.4.17"
 
-libraryDependencies += "io.swagger.parser.v3" % "swagger-parser" % "2.1.8"
+libraryDependencies += "io.swagger.parser.v3" % "swagger-parser" % "2.1.9"
 
 libraryDependencies += "org.sangria-graphql" %% "sangria"       % "3.4.1"
 libraryDependencies += "org.sangria-graphql" %% "sangria-circe" % "1.3.2"

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -20,6 +20,6 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
 
 addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.11")
 
-addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.8.0")
+addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.9.0")
 
 addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
diff --git a/renku-model/src/main/scala/io/renku/graph/model/infra.scala b/renku-model/src/main/scala/io/renku/graph/model/infra.scala
@@ -37,7 +37,12 @@ object RenkuUrl
 final class GitLabUrl private (val value: String) extends AnyVal with UrlTinyType {
   def apiV4: GitLabApiUrl = GitLabApiUrl(this)
 }
-object GitLabUrl extends TinyTypeFactory[GitLabUrl](new GitLabUrl(_)) with Url[GitLabUrl] with UrlOps[GitLabUrl]
+object GitLabUrl extends TinyTypeFactory[GitLabUrl](new GitLabUrl(_)) with Url[GitLabUrl] with UrlOps[GitLabUrl] {
+  override val transform: String => Either[Throwable, String] = {
+    case v if v.endsWith("/") => v.substring(0, v.length - 1).asRight
+    case v                    => v.asRight
+  }
+}
 
 final class GitLabApiUrl private (val value: String) extends AnyVal with UrlTinyType
 object GitLabApiUrl

diff --git a/renku-model/src/test/scala/io/renku/graph/model/infraSpec.scala b/renku-model/src/test/scala/io/renku/graph/model/infraSpec.scala
@@ -27,6 +27,32 @@ import org.scalatest.matchers.should
 import org.scalatest.wordspec.AnyWordSpec
 import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
 
+class GitLabUrlSpec extends AnyWordSpec with ScalaCheckPropertyChecks with should.Matchers {
+
+  "from" should {
+
+    "instantiate GitLabUrl when valid url is given" in {
+      forAll(httpUrls()) { path =>
+        GitLabUrl.from(path).map(_.value) shouldBe path.asRight
+      }
+    }
+
+    "instantiate GitLabUrl when valid url is given with a slash at the end" in {
+      val path = httpUrls().generateOne
+      GitLabUrl.from(s"$path/").map(_.value) shouldBe path.asRight
+    }
+
+    "fail instantiation for invalid url" in {
+      val value = nonEmptyStrings().generateOne
+
+      val Left(ex) = GitLabUrl.from(value).map(_.value)
+
+      ex          shouldBe an[IllegalArgumentException]
+      ex.getMessage should include(s"Cannot instantiate ${GitLabUrl.typeName} with '$value'")
+    }
+  }
+}
+
 class CliVersionSpec extends AnyWordSpec with ScalaCheckPropertyChecks with should.Matchers {
 
   "from" should {

diff --git a/token-repository/Dockerfile b/token-repository/Dockerfile
@@ -10,7 +10,7 @@ COPY . .
 RUN export PATH="/usr/local/sbt/bin:$PATH" && \
     apk update && apk add --no-cache --virtual .build-dependencies bash wget tar git && \
     mkdir -p "/usr/local/sbt" && \
-    wget -qO - "https://github.com/sbt/sbt/releases/download/v1.7.2/sbt-1.7.2.tgz" | tar xz -C /usr/local/sbt --strip-components=1 && \
+    wget -qO - "https://github.com/sbt/sbt/releases/download/v1.8.0/sbt-1.8.0.tgz" | tar xz -C /usr/local/sbt --strip-components=1 && \
     sbt writeVersionToVersionSbt && \
     sbt writeVersionToVersionConf && \
     sbt "project token-repository" stage && \

diff --git a/triples-generator/Dockerfile b/triples-generator/Dockerfile
@@ -10,7 +10,7 @@ COPY . .
 RUN export PATH="/usr/local/sbt/bin:$PATH" && \
     apk update && apk add --no-cache --virtual .build-dependencies bash wget tar git && \
     mkdir -p "/usr/local/sbt" && \
-    wget -qO - "https://github.com/sbt/sbt/releases/download/v1.7.2/sbt-1.7.2.tgz" | tar xz -C /usr/local/sbt --strip-components=1 && \
+    wget -qO - "https://github.com/sbt/sbt/releases/download/v1.8.0/sbt-1.8.0.tgz" | tar xz -C /usr/local/sbt --strip-components=1 && \
     sbt writeVersionToVersionSbt && \
     sbt writeVersionToVersionConf && \
     sbt "project triples-generator" stage && \
@@ -31,7 +31,7 @@ RUN apk update && apk add --no-cache tzdata git git-lfs curl bash python3-dev py
     python3 -m pip install --ignore-installed packaging && \
     python3 -m pip install --upgrade 'pip==22.2.2' && \
     python3 -m pip install jinja2 && \
-    python3 -m pip install 'renku==1.9.2' 'sentry-sdk==1.5.11'  && \
+    python3 -m pip install 'renku==1.9.3' 'sentry-sdk==1.5.11'  && \
     chown -R daemon:daemon .
 
 COPY triples-generator/entrypoint.sh /entrypoint.sh

diff --git a/triples-generator/src/main/resources/application.conf b/triples-generator/src/main/resources/application.conf
@@ -23,7 +23,7 @@ triples-generation = "renku-log"
 # *  ["0.16.1 -> 9", ...] as above
 # *  ["0.16.1 -> 9", "0.16.0 -> 9", ...] then the decision about re-provisioning is taken using the 9 schema version and 0.16.1 CLI version
 compatibility-matrix = [
-  "1.9.2  -> 9",
+  "1.9.3  -> 9",
   "0.16.2 -> 8"
 ]
 

diff --git a/webhook-service/Dockerfile b/webhook-service/Dockerfile
@@ -10,7 +10,7 @@ COPY . .
 RUN export PATH="/usr/local/sbt/bin:$PATH" && \
     apk update && apk add --no-cache --virtual .build-dependencies bash wget tar git && \
     mkdir -p "/usr/local/sbt" && \
-    wget -qO - "https://github.com/sbt/sbt/releases/download/v1.7.2/sbt-1.7.2.tgz" | tar xz -C /usr/local/sbt --strip-components=1 && \
+    wget -qO - "https://github.com/sbt/sbt/releases/download/v1.8.0/sbt-1.8.0.tgz" | tar xz -C /usr/local/sbt --strip-components=1 && \
     sbt writeVersionToVersionSbt && \
     sbt writeVersionToVersionConf && \
     sbt "project webhook-service" stage  && \