Upgrade deps and changes for misk environment removal (#195)

* Upgrade deps and changes for misk environment removal

* Attempt to fix mkdocs build

* mkdocs fix

* Changed to testImplementation for dep

* Latest Misk dep; added missing dep; comment changes

.github/workflows/Publish-Website.yml

@@ -32,7 +32,7 @@ jobs:
 
       - name: Build mkdocs
         run: |
-          pip3 install mkdocs-macros-plugin
+          pip3 install mkdocs mkdocs-material mkdocs-macros-plugin
           mkdocs build
 
       - name: Deploy 🚀

buildSrc/src/main/kotlin/Dependencies.kt

@@ -33,19 +33,20 @@ object Dependencies {
   val mavenPublishGradlePlugin = "com.vanniktech:gradle-maven-publish-plugin:0.12.0"
   val metricsCore = "io.dropwizard.metrics:metrics-core:4.0.2"
   val metricsParent = "io.dropwizard.metrics:metrics-parent:4.0.2"
-  val misk = "com.squareup.misk:misk:0.17.0"
-  val miskActions = "com.squareup.misk:misk-actions:0.17.0"
-  val miskAwsDynamodbTesting = "com.squareup.misk:misk-aws-dynamodb-testing:0.17.0"
-  val miskCore = "com.squareup.misk:misk-core:0.17.0"
-  val miskHibernate = "com.squareup.misk:misk-hibernate:0.17.0"
-  val miskHibernateTesting = "com.squareup.misk:misk-hibernate-testing:0.17.0"
-  val miskJdbc = "com.squareup.misk:misk-jdbc:0.17.0"
-  val miskJdbcTesting = "com.squareup.misk:misk-jdbc-testing:0.17.0"
-  val miskInject = "com.squareup.misk:misk-inject:0.17.0"
-  val miskMetrics = "com.squareup.misk:misk-metrics:0.17.0"
-  val miskService = "com.squareup.misk:misk-service:0.17.0"
-  val miskSlack = "com.squareup.misk:misk-slack:0.17.0"
-  val miskTesting = "com.squareup.misk:misk-testing:0.17.0"
+  val misk = "com.squareup.misk:misk:0.19.0"
+  val miskActions = "com.squareup.misk:misk-actions:0.19.0"
+  val miskAwsDynamodb = "com.squareup.misk:misk-aws-dynamodb:0.19.0"
+  val miskAwsDynamodbTesting = "com.squareup.misk:misk-aws-dynamodb-testing:0.19.0"
+  val miskCore = "com.squareup.misk:misk-core:0.19.0"
+  val miskHibernate = "com.squareup.misk:misk-hibernate:0.19.0"
+  val miskHibernateTesting = "com.squareup.misk:misk-hibernate-testing:0.19.0"
+  val miskJdbc = "com.squareup.misk:misk-jdbc:0.19.0"
+  val miskJdbcTesting = "com.squareup.misk:misk-jdbc-testing:0.19.0"
+  val miskInject = "com.squareup.misk:misk-inject:0.19.0"
+  val miskMetrics = "com.squareup.misk:misk-metrics:0.19.0"
+  val miskService = "com.squareup.misk:misk-service:0.19.0"
+  val miskSlack = "com.squareup.misk:misk-slack:0.19.0"
+  val miskTesting = "com.squareup.misk:misk-testing:0.19.0"
   val moshiCore = "com.squareup.moshi:moshi:1.11.0"
   val moshiKotlin = "com.squareup.moshi:moshi-kotlin:1.11.0"
   val mysql = "mysql:mysql-connector-java:8.0.22"

client-misk-dynamodb/build.gradle.kts

@@ -14,20 +14,23 @@ dependencies {
   implementation(Dependencies.okio)
   implementation(Dependencies.kotlinStdLib)
   implementation(Dependencies.wireMoshiAdapter)
-  implementation(Dependencies.awsDynamodb)
 
   api(project(":client"))
   api(project(":client-misk"))
   testApi(project(":client-misk-testing"))
 
   implementation(Dependencies.misk)
+  implementation(Dependencies.awsDynamodb)
+  implementation(Dependencies.miskAwsDynamodb)
   implementation(Dependencies.miskInject)
 
   testImplementation(Dependencies.assertj)
   testImplementation(Dependencies.miskTesting)
   testImplementation(Dependencies.junitEngine)
   testImplementation(Dependencies.miskAwsDynamodbTesting)
   testImplementation(Dependencies.kotlinTest)
+
+  testImplementation(Dependencies.awsDynamodb)
 }
 
 val jar by tasks.getting(Jar::class) {

client-misk-dynamodb/src/test/kotlin/app/cash/backfila/client/misk/dynamodb/BackfillsModule.kt

@@ -2,18 +2,22 @@ package app.cash.backfila.client.misk.dynamodb
 
 import app.cash.backfila.client.misk.BackfillModule
 import app.cash.backfila.client.misk.client.BackfilaClientConfig
+import misk.dynamodb.DynamoDbService
 import misk.inject.KAbstractModule
+import misk.inject.toKey
 
 /**
  * Simulates a Backfills module where all the relevant backfills are registered.
  */
 class BackfillsModule : KAbstractModule() {
   override fun configure() {
+    val dependsOn = listOf(DynamoDbService::class.toKey())
     install(
       BackfillModule(
         BackfilaClientConfig(
           url = "test.url", slack_channel = "#test"
-        )
+        ),
+        dependsOn = dependsOn
       )
     )
     install(DynamoDbBackfillModule.create<DynamoDbBackfillTest.MakeTracksExplicitBackfill>())

client-misk-dynamodb/src/test/kotlin/app/cash/backfila/client/misk/dynamodb/TestingModule.kt

@@ -19,7 +19,7 @@ import misk.logging.LogCollectorModule
  */
 class TestingModule : KAbstractModule() {
   override fun configure() {
-    install(DeploymentModule.forTesting())
+    install(DeploymentModule(wisp.deployment.TESTING))
     install(LogCollectorModule())
     install(MiskTestingServiceModule())
     install(BackfillsModule())

client-misk-hibernate/src/test/kotlin/app/cash/backfila/client/misk/ClientMiskTestingModule.kt

@@ -48,7 +48,7 @@ internal class ClientMiskTestingModule(
     })
     install(JdbcTestingModule(ClientMiskService::class))
 
-    install(DeploymentModule.forTesting())
+    install(DeploymentModule(wisp.deployment.TESTING))
     install(LogCollectorModule())
     install(MiskTestingServiceModule())
     install(EmbeddedBackfilaModule())

client-misk-jooq/src/test/kotlin/app/cash/backfila/client/misk/config/ClientJooqTestingModule.kt

@@ -34,7 +34,7 @@ import javax.inject.Qualifier
 class ClientJooqTestingModule : KAbstractModule() {
   override fun configure() {
     install(MiskTestingServiceModule())
-    install(DeploymentModule.forTesting())
+    install(DeploymentModule(wisp.deployment.TESTING))
     val datasourceConfig = DataSourceConfig(
       type = DataSourceType.MYSQL,
       username = "root",

client-misk-static/src/test/kotlin/app/cash/backfila/client/misk/static/TestingModule.kt

@@ -11,7 +11,7 @@ import misk.logging.LogCollectorModule
  */
 class TestingModule : KAbstractModule() {
   override fun configure() {
-    install(DeploymentModule.forTesting())
+    install(DeploymentModule(wisp.deployment.TESTING))
     install(LogCollectorModule())
     install(MiskTestingServiceModule())
     install(BackfillsModule())

client-misk/src/test/kotlin/app/cash/backfila/client/misk/TestingModule.kt

@@ -8,7 +8,7 @@ import misk.logging.LogCollectorModule
 
 class TestingModule : KAbstractModule() {
   override fun configure() {
-    install(DeploymentModule.forTesting())
+    install(DeploymentModule(wisp.deployment.TESTING))
     install(LogCollectorModule())
     install(MiskTestingServiceModule())
     install(BackfillsModule())

client-misk/src/test/kotlin/app/cash/backfila/client/misk/backend/NoBackfillsModule.kt

@@ -10,7 +10,7 @@ import misk.logging.LogCollectorModule
 
 class NoBackfillsModule : KAbstractModule() {
   override fun configure() {
-    install(DeploymentModule.forTesting())
+    install(DeploymentModule(wisp.deployment.TESTING))
     install(LogCollectorModule())
     install(MiskTestingServiceModule())
 

mkdocs.yml

@@ -3,6 +3,7 @@ repo_name: Backfila
 repo_url: https://github.com/cashapp/backfila
 site_description: "Backfila: Service that manages backfill state, calling into other services to do batched work"
 site_author: Square, Inc.
+site_url: ''
 remote_branch: gh-pages
 
 copyright: 'Copyright © 2019 Square, Inc.'

service/src/main/kotlin/app/cash/backfila/dashboard/BackfilaDashboardModule.kt

@@ -1,7 +1,7 @@
 package app.cash.backfila.dashboard
 
 import javax.inject.Qualifier
-import misk.environment.Deployment
+import wisp.deployment.Deployment
 import misk.inject.KAbstractModule
 import misk.web.dashboard.WebTabResourceModule
 

service/src/main/kotlin/app/cash/backfila/service/BackfilaDevelopmentService.kt

@@ -16,11 +16,7 @@ import app.cash.backfila.service.persistence.DbBackfillRun
 import misk.MiskApplication
 import misk.MiskCaller
 import misk.MiskRealServiceModule
-import misk.environment.Deployment
 import misk.environment.DeploymentModule
-import misk.environment.Env
-import misk.environment.Environment
-import misk.environment.EnvironmentModule
 import misk.hibernate.Session
 import misk.inject.KAbstractModule
 import misk.jdbc.DataSourceClusterConfig
@@ -34,10 +30,9 @@ import misk.web.MiskWebModule
 import misk.web.WebConfig
 import misk.web.dashboard.AdminDashboardModule
 import okio.ByteString.Companion.encodeUtf8
+import wisp.deployment.Deployment
 
 fun main(args: Array<String>) {
-  val environment = Environment.DEVELOPMENT
-  val env = Env(environment.toString())
   val deployment = Deployment(name = "backfila", isLocalDevelopment = true)
 
   MiskApplication(
@@ -60,7 +55,10 @@ fun main(args: Array<String>) {
             override fun validateExtraData(connectorExtraData: String?) {
             }
 
-            override fun clientFor(serviceName: String, connectorExtraData: String?): BackfilaClientServiceClient {
+            override fun clientFor(
+              serviceName: String,
+              connectorExtraData: String?
+            ): BackfilaClientServiceClient {
               return object : BackfilaClientServiceClient {
                 override fun prepareBackfill(request: PrepareBackfillRequest): PrepareBackfillResponse {
                   return PrepareBackfillResponse(
@@ -88,8 +86,7 @@ fun main(args: Array<String>) {
           })
       }
     },
-    EnvironmentModule(environment = environment),
-    DeploymentModule(deployment, env),
+    DeploymentModule(deployment),
     BackfilaServiceModule(
       deployment,
       BackfilaConfig(

service/src/main/kotlin/app/cash/backfila/service/BackfilaServiceModule.kt

@@ -21,7 +21,7 @@ import java.util.concurrent.Executors
 import javax.inject.Qualifier
 import javax.inject.Singleton
 import misk.config.ConfigModule
-import misk.environment.Deployment
+import wisp.deployment.Deployment
 import misk.inject.KAbstractModule
 import misk.security.authz.AccessAnnotationEntry
 import misk.slack.SlackModule

service/src/main/kotlin/app/cash/backfila/service/SlackHelper.kt

@@ -2,18 +2,18 @@ package app.cash.backfila.service
 
 import app.cash.backfila.service.persistence.BackfilaDb
 import app.cash.backfila.service.persistence.DbBackfillRun
-import misk.environment.Env
 import misk.hibernate.Id
 import misk.hibernate.Transacter
 import misk.hibernate.load
 import misk.slack.SlackClient
+import wisp.deployment.Deployment
 import javax.inject.Inject
 
 class SlackHelper @Inject constructor(
   @BackfilaDb private val transacter: Transacter,
   private val slackClient: SlackClient,
   private val backfilaConfig: BackfilaConfig,
-  private val env: Env
+  private val deployment: Deployment
 ) {
   fun runStarted(id: Id<DbBackfillRun>, user: String) {
     val (message, channel) = transacter.transaction { session ->
@@ -52,7 +52,8 @@ class SlackHelper @Inject constructor(
   }
 
   private fun nameAndId(run: DbBackfillRun) =
-    "[${env.name}] ${run.service.registry_name} `${run.registered_backfill.name}` (${idLink(run.id)})"
+    "[${deployment.name}] ${run.service.registry_name} `${run.registered_backfill.name}` " +
+      "(${idLink(run.id)})"
 
   private fun dryRunEmoji(run: DbBackfillRun) =
     if (run.dry_run) {

service/src/main/kotlin/app/cash/backfila/service/runner/statemachine/BatchAwaiter.kt

@@ -108,8 +108,10 @@ class BatchAwaiter(
             matchingRecordsPerMinute = matchingRateCounter.projectedRate()
 
             if (backfillRunner.metadata.precomputingDone && matchingRecordsPerMinute!! > 0) {
-              val remaining = (backfillRunner.metadata.computedMatchingRecordCount
-                - backfilledMatchingRecordCount)
+              val remaining = (
+                backfillRunner.metadata.computedMatchingRecordCount -
+                  backfilledMatchingRecordCount
+                )
               val etaMinutes = remaining.toDouble() / matchingRecordsPerMinute!!
               val etaMillis = etaMinutes * 60 * 1000
               backfillRunner.factory.metrics.eta

service/src/test/kotlin/app/cash/backfila/BackfilaTestingModule.kt

@@ -50,7 +50,7 @@ internal class BackfilaTestingModule : KAbstractModule() {
       slack = null
     )
     bind<BackfilaConfig>().toInstance(config)
-    install(DeploymentModule.forTesting())
+    install(DeploymentModule(wisp.deployment.TESTING))
     install(LogCollectorModule())
     install(MiskTestingServiceModule())