Merge pull request #41 from toolsplus/feature/implement-host-deletion

Update Atlassian Connect Play version

Author: tbinna

.github/workflows/ci.yml

@@ -5,12 +5,13 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '21'
           cache: 'sbt'
+      - uses: sbt/setup-sbt@v1
       - name: Compile, test
         run: sbt clean coverage test integration/test coverageReport
       - name: Upload coverage to Codecov

.scalafmt.conf

@@ -1,3 +1,3 @@
-style = default
-maxColumn = 80
+version = 3.9.9
+runner.dialect = scala213
 project.git = true

build.sbt

@@ -1,8 +1,9 @@
-import ReleaseTransformations._
+import ReleaseTransformations.*
+import xerial.sbt.Sonatype.sonatypeCentralHost
 
 val commonSettings = Seq(
   organization := "io.toolsplus",
-  scalaVersion := "2.13.14",
+  scalaVersion := "2.13.16",
 )
 
 val integrationTestSettings = Seq(
@@ -23,13 +24,8 @@ lazy val publishSettings = Seq(
   pomIncludeRepository := { _ =>
     false
   },
-  publishTo := {
-    val nexus = "https://oss.sonatype.org/"
-    if (isSnapshot.value)
-      Some("snapshots" at nexus + "content/repositories/snapshots")
-    else
-      Some("releases" at nexus + "service/local/staging/deploy/maven2")
-  },
+  ThisBuild / publishTo := sonatypePublishToBundle.value,
+  ThisBuild / sonatypeCredentialHost := sonatypeCentralHost,
   autoAPIMappings := true,
   scmInfo := Some(
     ScmInfo(
@@ -46,6 +42,7 @@ lazy val publishSettings = Seq(
 )
 
 lazy val noPublishSettings = Seq(
+  publish / skip := true,
   publish := {},
   publishLocal := {},
   publishArtifact := false,
@@ -62,9 +59,9 @@ releaseProcess := Seq[ReleaseStep](
   commitReleaseVersion,
   tagRelease,
   releaseStepCommand("publishSigned"),
+  releaseStepCommand("sonatypeBundleRelease"),
   setNextVersion,
   commitNextVersion,
-  releaseStepCommand("sonatypeReleaseAll"),
   pushChanges
 )
 
@@ -78,15 +75,15 @@ def moduleSettings(project: Project) = {
 lazy val `atlassian-connect-play-slick` = project
   .in(file("."))
   .settings(libraryDependencies ++= Dependencies.root)
-  .settings(commonSettings: _*)
+  .settings(commonSettings)
   .settings(publishSettings)
   .settings(moduleSettings(project))
 
 lazy val `integration` = project
   .in(file("integration"))
   .settings(libraryDependencies ++= Dependencies.integration)
-  .settings(commonSettings: _*)
-  .settings(integrationTestSettings: _*)
+  .settings(commonSettings)
+  .settings(integrationTestSettings)
   .settings(
     publish / skip := true,
   )

integration/src/test/resources/evolutions/default/1.sql

@@ -0,0 +1,39 @@
+# --- !Ups
+CREATE TABLE atlassian_host
+(
+    client_key                          VARCHAR PRIMARY KEY NOT NULL,
+    "key"                               VARCHAR             NOT NULL,
+    oauth_client_id                     VARCHAR,
+    installation_id                     VARCHAR,
+    shared_secret                       VARCHAR             NOT NULL,
+    base_url                            VARCHAR             NOT NULL,
+    display_url                         VARCHAR             NOT NULL,
+    display_url_servicedesk_help_center VARCHAR             NOT NULL,
+    product_type                        VARCHAR             NOT NULL,
+    description                         VARCHAR             NOT NULL,
+    service_entitlement_number          VARCHAR,
+    entitlement_id                      VARCHAR,
+    entitlement_number                  VARCHAR,
+    installed                           BOOLEAN             NOT NULL,
+    ttl                                 TIMESTAMP
+);
+CREATE UNIQUE INDEX uq_ac_host_client_key
+    ON atlassian_host (client_key);
+CREATE INDEX uq_ac_host_base_url
+    ON atlassian_host (base_url);
+CREATE INDEX uq_ac_host_installation_id
+    ON atlassian_host (installation_id);
+
+CREATE TABLE forge_installation
+(
+    installation_id VARCHAR PRIMARY KEY,
+    client_key      VARCHAR NOT NULL
+);
+CREATE UNIQUE INDEX uq_forge_installation_installation_id
+    ON forge_installation (installation_id);
+ALTER TABLE forge_installation
+    ADD CONSTRAINT fk_forge_installation_atlassian_host FOREIGN KEY (client_key) REFERENCES atlassian_host (client_key) ON UPDATE CASCADE ON DELETE CASCADE;
+
+# --- !Downs
+DROP TABLE forge_installation;
+DROP TABLE atlassian_host;

integration/src/test/scala/io/toolsplus/atlassian/connect/play/slick/PostgresContainerTest.scala

@@ -14,14 +14,14 @@ trait PostgresContainerTest
     extends GuiceOneAppPerTest
     with TestContainerForAll { self: TestSuite =>
 
-  val postgresVersion = "15.5"
+  val postgresVersion = "15.12"
 
   override val containerDef: PostgreSQLContainer.Def =
     PostgreSQLContainer.Def(
       DockerImageName.parse(s"postgres:$postgresVersion"),
       databaseName = "intercom",
       username = "test",
-      password = "test",
+      password = "test"
     )
 
   override def newAppForTest(td: TestData): Application = withContainers {
@@ -37,7 +37,8 @@ trait PostgresContainerTest
   def withEvolutions[T](block: => T): T =
     Evolutions.withEvolutions(
       dbApi.database("default"),
-      ClassLoaderEvolutionsReader.forPrefix("evolutions/")) {
+      ClassLoaderEvolutionsReader.forPrefix("evolutions/")
+    ) {
       block
     }
 

integration/src/test/scala/io/toolsplus/atlassian/connect/play/slick/SlickAtlassianHostRepositoryIt.scala

@@ -1,6 +1,5 @@
 package io.toolsplus.atlassian.connect.play.slick
 
-import io.toolsplus.atlassian.connect.play.api.models.DefaultAtlassianHost
 import io.toolsplus.atlassian.connect.play.slick.fixtures.AtlassianHostFixture
 import org.scalatest.DoNotDiscover
 import org.scalatest.concurrent.Eventually
@@ -47,7 +46,7 @@ class SlickAtlassianHostRepositoryIt
 
           await {
             hostRepo.all()
-          } mustEqual Seq(host)
+          } must contain theSameElementsAs Seq(host)
         }
       }
 
@@ -78,7 +77,7 @@ class SlickAtlassianHostRepositoryIt
 
           await {
             hostRepo.all()
-          } mustBe Seq(host)
+          } must contain theSameElementsAs Seq(host)
         }
       }
 
@@ -99,7 +98,7 @@ class SlickAtlassianHostRepositoryIt
 
           await {
             hostRepo.all()
-          } mustBe Seq(updated)
+          } must contain theSameElementsAs Seq(updated)
         }
       }
 
@@ -128,7 +127,7 @@ class SlickAtlassianHostRepositoryIt
 
           await {
             hostRepo.all()
-          } mustBe Seq(host, updated)
+          } must contain theSameElementsAs Seq(host, updated)
         }
       }
 

integration/src/test/scala/io/toolsplus/atlassian/connect/play/slick/fixtures/AtlassianHostFixture.scala

@@ -8,7 +8,9 @@ trait AtlassianHostFixture extends AtlassianHostGen {
     "a890cfe7-3518-3920-b0b5-6fa412a7f3d4",
     "io.toolsplus.atlassian.connect.play.scala.seed",
     None,
-    Some("ari:cloud:ecosystem::installation/e786c5a3-819e-43cd-9cc9-d38a470a5df6"),
+    Some(
+      "ari:cloud:ecosystem::installation/e786c5a3-819e-43cd-9cc9-d38a470a5df6"
+    ),
     "LkbauUXN71J8jxRi9Nbf+8dwGtXxqta+Fu6k86aF+0IIzxkZ/GlggElYVoCqQg",
     "https://example.atlassian.net",
     "https://example.atlassian.net",
@@ -18,7 +20,9 @@ trait AtlassianHostFixture extends AtlassianHostGen {
     None,
     None,
     None,
-    installed = true
+    installed = true,
+    None
   )
-  val host: DefaultAtlassianHost = atlassianHostGen.sample.getOrElse(defaultHost)
+  val host: DefaultAtlassianHost =
+    atlassianHostGen.sample.getOrElse(defaultHost)
 }

integration/src/test/scala/io/toolsplus/atlassian/connect/play/slick/generators/AtlassianHostGen.scala

@@ -1,10 +1,15 @@
 package io.toolsplus.atlassian.connect.play.slick.generators
 
-import io.toolsplus.atlassian.connect.play.api.models.Predefined.ClientKey
+import com.fortysevendeg.scalacheck.datetime.GenDateTime.genDateTimeWithinRange
+import com.fortysevendeg.scalacheck.datetime.instances.jdk8._
 import io.toolsplus.atlassian.connect.play.api.models.DefaultAtlassianHost
+import io.toolsplus.atlassian.connect.play.api.models.Predefined.ClientKey
 import org.scalacheck.Gen
 import org.scalacheck.Gen.{alphaStr, numStr, option, _}
 
+import java.time.temporal.ChronoUnit
+import java.time.{Duration, Instant}
+
 trait AtlassianHostGen {
 
   def clientKeyGen: Gen[ClientKey] = alphaNumStr
@@ -25,22 +30,28 @@ trait AtlassianHostGen {
       entitlementId <- option(numStr)
       entitlementNumber <- option(numStr)
       installed <- oneOf(true, false)
-    } yield
-      DefaultAtlassianHost(
-        clientKey,
-        key,
-        oauthClientId,
-        installationId,
-        sharedSecret,
-        baseUrl,
-        baseUrl,
-        baseUrl,
-        productType,
-        description,
-        serviceEntitlementNumber,
-        entitlementId,
-        entitlementNumber,
-        installed
-      )
+      ttl <-
+        if (installed) const(None)
+        else
+          genDateTimeWithinRange(Instant.now(), Duration.ofDays(30))
+            .map(_.truncatedTo(ChronoUnit.MICROS))
+            .map(Some(_))
+    } yield DefaultAtlassianHost(
+      clientKey,
+      key,
+      oauthClientId,
+      installationId,
+      sharedSecret,
+      baseUrl,
+      baseUrl,
+      baseUrl,
+      productType,
+      description,
+      serviceEntitlementNumber,
+      entitlementId,
+      entitlementNumber,
+      installed,
+      ttl
+    )
 
 }

project/Dependencies.scala

@@ -1,4 +1,4 @@
-import sbt._
+import sbt.*
 
 object Dependencies {
   val root = Seq(
@@ -8,7 +8,8 @@ object Dependencies {
     Library.scalaTest % "test",
     Library.scalaCheck % "test",
     Library.scalaTestPlusScalaCheck % "test",
-    Library.h2 % "test",
+    Library.scalaCheckDateTime % "test",
+    Library.h2 % "test"
   )
 
   val integration = Seq(
@@ -19,29 +20,39 @@ object Dependencies {
     Library.testcontainersScala % "test",
     Library.testcontainersScalaPostgresql % "test",
     Library.scalaTestPlusScalaCheck % "test",
+    Library.scalaCheckDateTime % "test"
   )
 }
 
 object Version {
-  val atlassianConnectPlay = "0.8.0"
-  val playSlick = "6.1.0"
-  val scalaTestPlusPlay = "7.0.1"
-  val scalaCheck = "1.18.0"
+  val atlassianConnectPlay = "0.9.0"
+  val playSlick = "6.2.0"
+  val scalaTestPlusPlay = "7.0.2"
+  val scalaCheck = "1.18.1"
   val scalaTestPlusScalaCheck = "3.2.18.0"
-  val h2 = "1.4.197"
-  val postgres = "42.6.0"
-  val testcontainersScala = "0.41.3"
+  val scalaCheckDateTime = "0.7.0"
+  val h2 = "2.3.232"
+  val postgres = "42.7.7"
+  val testcontainersScala = "0.43.0"
 }
 
 object Library {
-  val atlassianConnectApi = "io.toolsplus" %% "atlassian-connect-play-api" % Version.atlassianConnectPlay
+  val atlassianConnectApi =
+    "io.toolsplus" %% "atlassian-connect-play-api" % Version.atlassianConnectPlay
   val playSlick = "org.playframework" %% "play-slick" % Version.playSlick
-  val playSlickEvolutions = "org.playframework" %% "play-slick-evolutions" % Version.playSlick
-  val scalaTest = "org.scalatestplus.play" %% "scalatestplus-play" % Version.scalaTestPlusPlay
+  val playSlickEvolutions =
+    "org.playframework" %% "play-slick-evolutions" % Version.playSlick
+  val scalaTest =
+    "org.scalatestplus.play" %% "scalatestplus-play" % Version.scalaTestPlusPlay
   val scalaCheck = "org.scalacheck" %% "scalacheck" % Version.scalaCheck
-  val scalaTestPlusScalaCheck = "org.scalatestplus" %% "scalacheck-1-17" % Version.scalaTestPlusScalaCheck
+  val scalaTestPlusScalaCheck =
+    "org.scalatestplus" %% "scalacheck-1-17" % Version.scalaTestPlusScalaCheck
+  val scalaCheckDateTime =
+    "com.47deg" %% "scalacheck-toolbox-datetime" % Version.scalaCheckDateTime
   val h2 = "com.h2database" % "h2" % Version.h2
   val postgres = "org.postgresql" % "postgresql" % Version.postgres
-  val testcontainersScala = "com.dimafeng" %% "testcontainers-scala-scalatest" % Version.testcontainersScala
-  val testcontainersScalaPostgresql = "com.dimafeng" %% "testcontainers-scala-postgresql" % Version.testcontainersScala
+  val testcontainersScala =
+    "com.dimafeng" %% "testcontainers-scala-scalatest" % Version.testcontainersScala
+  val testcontainersScalaPostgresql =
+    "com.dimafeng" %% "testcontainers-scala-postgresql" % Version.testcontainersScala
 }

project/plugins.sbt

@@ -1,5 +1,5 @@
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.12")
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0")
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.2")
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.1")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5")
+addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2")
+addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")