Merge branch 'main' into FDN-4416-add-openapi-importer

Author: jackl

.github/workflows/ci.yml

@@ -14,14 +14,16 @@ jobs:
     strategy:
       matrix:
         java: [ '17' ]
-        scala: [ '3.4.2' ]
+        scala: [ '3.7.3' ]
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK
       uses: actions/setup-java@v2
       with:
         java-version: ${{ matrix.java }}
         distribution: 'zulu'
+    - name: Install sbt
+      uses: sbt/setup-sbt@v1
     - name: Build
       run: |
         docker run -d -p 127.0.0.1:5432:5432 flowcommerce/apibuilder-postgresql:latest-pg15

api/Dockerfile

@@ -4,6 +4,7 @@ WORKDIR /opt/play
 RUN sbt 'project api' clean stage
 
 FROM flowcommerce/play_java17:latest
+RUN wget -q https://cdn.flow.io/util/environment-provider/environment-provider.jar -O /root/environment-provider.jar && test -s /root/environment-provider.jar
 COPY --from=builder /opt/play /opt/play
 WORKDIR /opt/play/api/target/universal/stage
 ENTRYPOINT ["java", "-jar", "/root/environment-provider.jar", "--service", "play", "apibuilder-api", "bin/apibuilder-api"]

api/app/processor/ScheduleMigrateVersionsProcessor.scala

@@ -28,14 +28,20 @@ class ScheduleMigrateVersionsProcessor @Inject()(
     s"""
       |select v.guid
       |  from versions v
-      |  join applications apps on apps.guid = v.application_guid and apps.deleted_at is null
+      |  join applications apps on apps.guid = v.application_guid
+      |    and apps.deleted_at is null
       |  left join cache.services on services.deleted_at is null
-      |                          and services.version_guid = v.guid
-      |                          and services.version = {service_version}
+      |    and services.version_guid = v.guid
+      |    and services.version = {service_version}
       | where v.deleted_at is null
       |   and services.guid is null
-      |   and v.guid not in (select type_id::uuid from tasks where type = {task_type})
-      |limit $Limit
+      |   and not exists (
+      |     select 1
+      |       from tasks
+      |      where type = {task_type}
+      |        and type_id = v.guid::text
+      |   )
+      | limit $Limit
       |""".stripMargin
   ).bind("service_version", MigrateVersion.ServiceVersionNumber)
     .bind("task_type", TaskType.MigrateVersion.toString)

app/Dockerfile

@@ -4,6 +4,7 @@ WORKDIR /opt/play
 RUN sbt 'project app' clean stage
 
 FROM flowcommerce/play_java17:latest
+RUN wget -q https://cdn.flow.io/util/environment-provider/environment-provider.jar -O /root/environment-provider.jar && test -s /root/environment-provider.jar
 COPY --from=builder /opt/play /opt/play
 WORKDIR /opt/play/app/target/universal/stage
 ENTRYPOINT ["java", "-jar", "/root/environment-provider.jar", "--service", "play", "apibuilder-app", "bin/apibuilder-app"]

app/app/lib/MemberDownload.scala

@@ -1,7 +1,6 @@
 package lib
 
-import com.github.tototoshi.csv.{CSVFormat, CSVWriter}
-import com.github.tototoshi.csv.defaultCSVFormat
+import com.github.tototoshi.csv.{CSVFormat, CSVWriter, DefaultCSVFormat}
 
 import java.io.File
 import io.apibuilder.api.v0.models.Membership
@@ -17,7 +16,8 @@ case class MemberDownload(
   def csv()(implicit ec: ExecutionContext): Future[File] = Future {
     val file = File.createTempFile(s"member-download-$orgKey", "csv")
 
-    val writer = CSVWriter.open(file)(using defaultCSVFormat)
+    given CSVFormat = new DefaultCSVFormat {}
+    val writer = CSVWriter.open(file)
     writer.writeRow(Seq("guid", "role", "user_guid", "user_email", "user_nickname", "user_name"))
 
     Pager.eachPage[Membership] { offset =>

build.sbt

@@ -106,8 +106,8 @@ lazy val generated = project
     libraryDependencies ++= Seq(
       ws,
       jdbc,
-      "com.github.mbryzek" % "lib-query" % "0.0.5",
-      "com.github.mbryzek" % "lib-util" % "0.0.16",
+      "com.github.mbryzek" % "lib-query" % "0.0.14",
+      "com.github.mbryzek" % "lib-util" % "0.0.24",
       "joda-time" % "joda-time" % "2.14.0",
       "org.playframework.anorm" %% "anorm-postgres" % "2.7.0",
       "org.postgresql" % "postgresql" % "42.7.7",
@@ -140,10 +140,10 @@ lazy val api = project
       "com.google.inject" % "guice" % "5.1.0",
       "com.google.inject.extensions" % "guice-assistedinject" % "5.1.0",
       "org.projectlombok" % "lombok" % "1.18.42" % "provided",
-      ("com.github.mbryzek" % "lib-cipher" % "0.0.8").cross(CrossVersion.for3Use2_13),
-      "com.github.mbryzek" % "lib-util" % "0.0.16",
+      "com.github.mbryzek" % "lib-cipher" % "0.0.13",
+      "com.github.mbryzek" % "lib-util" % "0.0.24",
       "com.sendgrid"      %  "sendgrid-java"  % "4.10.3",
-      "com.github.mbryzek" % "lib-query" % "0.0.5",
+      "com.github.mbryzek" % "lib-query" % "0.0.14",
       "com.rollbar" % "rollbar-java" % "2.0.0",
       "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test,
       "com.github.tomakehurst" % "wiremock-standalone" % "3.0.1" % Test

generated/app/db/GeneratorInvocationsDao.scala

@@ -196,8 +196,8 @@ class GeneratorInvocationsDao @javax.inject.Inject() (override val db: play.api.
 
   import anorm.postgresql.*
 
-  private val pkeyGenerator: com.mbryzek.util.IdGenerator = {
-    com.mbryzek.util.IdGenerator("gni")
+  private val pkeyGenerator: com.bryzek.util.IdGenerator = {
+    com.bryzek.util.IdGenerator("gni")
   }
 
   def randomPkey: String = {