Fix rebase on v2.0.4 (#122)

Fix publishing (#124)

build.sbt

@@ -1,3 +1,8 @@
+import sbt.Keys.{ fork, parallelExecution }
+import scala.sys.process._
+
+import scala.util.Try
+
 lazy val scala212  = "2.12.17"
 lazy val scala213  = "2.13.10"
 lazy val scala3    = "3.2.1"
@@ -74,15 +79,14 @@ val excludeInferAny = { options: Seq[String] => options.filterNot(Set("-Xlint:in
 lazy val root = project
   .in(file("."))
   .settings(
-    name           := "zio-kafka",
-    publish / skip := true,
+    name               := "zio-kafka",
+    publish / skip     := true,
     crossScalaVersions := Nil // https://www.scala-sbt.org/1.x/docs/Cross-Build.html#Cross+building+a+project+statefully
   )
   .aggregate(
     zioKafka,
     zioKafkaTestUtils,
-    zioKafkaTest,
-    docs
+    zioKafkaTest
   )
 
 def buildInfoSettings(packageName: String) =
@@ -174,24 +178,3 @@ lazy val zioKafkaTest =
 
 addCommandAlias("fmt", "all scalafmtSbt scalafmt test:scalafmt")
 addCommandAlias("check", "all scalafmtSbtCheck scalafmtCheck test:scalafmtCheck")
-
-lazy val docs = project
-  .in(file("zio-kafka-docs"))
-  .settings(
-    moduleName := "zio-kafka-docs",
-    scalacOptions -= "-Yno-imports",
-    scalacOptions -= "-Xfatal-warnings",
-    projectName                                := "ZIO Kafka",
-    mainModuleName                             := (zioKafka / moduleName).value,
-    projectStage                               := ProjectStage.ProductionReady,
-    docsPublishBranch                          := "master",
-    ScalaUnidoc / unidoc / unidocProjectFilter := inProjects(zioKafka),
-    readmeCredits :=
-      "This library is heavily inspired and made possible by the research and implementation done in " +
-        "[Alpakka Kafka](https://github.com/akka/alpakka-kafka), a library maintained by the Akka team and originally " +
-        "written as Reactive Kafka by SoftwareMill.",
-    readmeLicense +=
-      "\n\n" + """|Copyright 2021 Itamar Ravid and the zio-kafka contributors. All rights reserved.
-                  |<!-- TODO: not all rights reserved, rather Apache 2... -->""".stripMargin
-  )
-  .enablePlugins(WebsitePlugin)

project/plugins.sbt

@@ -2,4 +2,3 @@ addSbtPlugin("org.scalameta"             % "sbt-scalafmt"    % "2.5.0")
 addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat"    % "0.4.2")
 addSbtPlugin("com.eed3si9n"              % "sbt-buildinfo"   % "0.11.0")
 addSbtPlugin("org.scalameta"             % "sbt-mdoc"        % "2.3.6")
-addSbtPlugin("dev.zio"                   % "zio-sbt-website" % "0.3.0")

zio-kafka-test-utils/src/main/scala/zio/kafka/KafkaRandom.scala

@@ -1,6 +1,6 @@
 package zio.kafka
 
-import zio.{Task, ZIO}
+import zio.{ Task, ZIO }
 
 import java.util.UUID
 

zio-kafka-test-utils/src/main/scala/zio/kafka/KafkaTestUtils.scala

@@ -158,13 +158,38 @@ object KafkaTestUtils {
   def adminSettings: ZIO[Kafka, Nothing, AdminClientSettings] =
     ZIO.serviceWith[Kafka](_.bootstrapServers).map(AdminClientSettings(_))
 
-  def withAdmin[T](f: AdminClient => RIO[Kafka, T]) =
+  def saslAdminSettings(username: String, password: String): ZIO[Kafka.Sasl, Nothing, AdminClientSettings] =
+    ZIO
+      .serviceWith[Kafka.Sasl](_.value.bootstrapServers)
+      .map(
+        AdminClientSettings(_).withProperties(
+          "sasl.mechanism"    -> "PLAIN",
+          "security.protocol" -> "SASL_PLAINTEXT",
+          "sasl.jaas.config" -> s"""org.apache.kafka.common.security.plain.PlainLoginModule required username="$username" password="$password";"""
+        )
+      )
+
+  def withAdmin[T](f: AdminClient => RIO[Kafka, T]): ZIO[Kafka, Throwable, T] =
     for {
       settings <- adminSettings
-      fRes <- ZIO.scoped {
-                AdminClient
-                  .make(settings)
-                  .flatMap(client => f(client))
-              }
+      fRes     <- withAdminClient(settings)(f)
     } yield fRes
+
+  def withSaslAdmin[T](
+    username: String = "admin",
+    password: String = "admin-secret"
+  )(
+    f: AdminClient => RIO[Kafka.Sasl, T]
+  ): ZIO[Kafka.Sasl, Throwable, T] =
+    for {
+      settings <- saslAdminSettings(username, password)
+      fRes     <- withAdminClient(settings)(f)
+    } yield fRes
+
+  private def withAdminClient[R, T](settings: AdminClientSettings)(f: AdminClient => RIO[R, T]) =
+    ZIO.scoped[R] {
+      AdminClient
+        .make(settings)
+        .flatMap(client => f(client))
+    }
 }

zio-kafka-test-utils/src/main/scala/zio/kafka/ZIOSpecWithSaslKafka.scala

@@ -2,6 +2,7 @@ package zio.kafka
 
 import zio.ZLayer
 import zio.kafka.embedded.Kafka
+import zio.test._
 
 trait ZIOSpecWithSaslKafka extends ZIOSpec[TestEnvironment with Kafka.Sasl] with KafkaRandom {
   override val bootstrap: ZLayer[Any, Any, TestEnvironment with Kafka.Sasl] =