Reformat, change org

keirlawson · Dec 21, 2023 · 91016d2 · 91016d2
1 parent 31d6e49
commit 91016d2
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 23 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,5 +1,7 @@
+ThisBuild / sonatypeCredentialHost := "s01.oss.sonatype.org"
+
 name := "ciris-aws-secretsmanager"
-organization := "com.ovoenergy"
+organization := "io.github.keirlawson"
 licenses += ("MIT", url("http://opensource.org/licenses/MIT"))
 
 scalaVersion := "3.2.2"
@@ -18,14 +20,14 @@ publishTo := sonatypePublishToBundle.value
 
 testFrameworks += new TestFramework("munit.Framework")
 
-sonatypeProfileName := "com.ovoenergy"
+sonatypeProfileName := "io.github.keirlawson"
 publishMavenStyle := true
 
-homepage := Some(url("https://github.com/ovotech/ciris-aws-secretsmanager"))
+homepage := Some(url("https://github.com/keirlawson/ciris-aws-secretsmanager"))
 scmInfo := Some(
   ScmInfo(
-    url("https://github.com/ovotech/ciris-aws-secretsmanager"),
-    "scm:git@github.com:ovotech/ciris-aws-secretsmanager.git"
+    url("https://github.com/keirlawson/ciris-aws-secretsmanager"),
+    "scm:git@github.com:keirlawson/ciris-aws-secretsmanager.git"
   )
 )
 developers := List(

diff --git a/readme.md b/readme.md
@@ -10,12 +10,12 @@ To get started with [sbt](https://www.scala-sbt.org), simply add the following l
 
 For Cats Effect 3:
 ```scala
-libraryDependencies += "com.ovoenergy" %% "ciris-aws-secretsmanager" % "5.0.1"
+libraryDependencies += "io.github.keirlawson" %% "ciris-aws-secretsmanager" % "5.0.1"
 ```
 
 For Cats Effect 2:
 ```scala
-libraryDependencies += "com.ovoenergy" %% "ciris-aws-secretsmanager" % "4.0.0"
+libraryDependencies += "io.github.keirlawson" %% "ciris-aws-secretsmanager" % "4.0.0"
 ```
 
 The library is published for Scala 2.12, 2.13 and 3.1.

diff --git a/src/main/scala/ciris/aws/secretsmanager/SecretString.scala b/src/main/scala/ciris/aws/secretsmanager/SecretString.scala
@@ -19,21 +19,27 @@ private[secretsmanager] object SecretString {
       def apply(key: String, version: String): ConfigValue[F, Secret[String]] =
         fetch(key, GetSecretValueRequest.builder().secretId(key).versionId(version).build())
 
-
-      private def fetch(key: String, request: GetSecretValueRequest): ConfigValue[F, Secret[String]] =
-      ConfigValue.async { cb =>
-        val configKey =
-              ConfigKey(s"secret string $key from AWS secrets manager")
-        client.getSecretValue(request).whenComplete { (resp, error) =>
-          cb {
-            if (error != null) {
-              Left(error)
-            } else {
-              val str = Option(resp.secretString())
-              Right(str.fold(ConfigValue.missing[Secret[String]](configKey))( value => ConfigValue.loaded(configKey, value).secret))
+      private def fetch(
+        key: String,
+        request: GetSecretValueRequest
+      ): ConfigValue[F, Secret[String]] =
+        ConfigValue.async { cb =>
+          val configKey =
+            ConfigKey(s"secret string $key from AWS secrets manager")
+          client.getSecretValue(request).whenComplete { (resp, error) =>
+            cb {
+              if (error != null) {
+                Left(error)
+              } else {
+                val str = Option(resp.secretString())
+                Right(
+                  str.fold(ConfigValue.missing[Secret[String]](configKey))(
+                    value => ConfigValue.loaded(configKey, value).secret
+                  )
+                )
+              }
             }
           }
         }
-      }
     }
 }
diff --git a/src/main/scala/ciris/aws/secretsmanager/package.scala b/src/main/scala/ciris/aws/secretsmanager/package.scala
@@ -10,7 +10,12 @@ package object secretsmanager {
   def secrets[F[_]: Sync](
     region: Region
   ): ConfigValue[F, SecretString[F]] =
-    secrets(SecretsManagerAsyncClient.builder().region(region.asJava).credentialsProvider(DefaultCredentialsProvider.create()))
+    secrets(
+      SecretsManagerAsyncClient
+        .builder()
+        .region(region.asJava)
+        .credentialsProvider(DefaultCredentialsProvider.create())
+    )
 
   def secrets[F[_]: Sync](
     clientBuilder: SecretsManagerAsyncClientBuilder

diff --git a/src/test/scala/ciris/aws/secretsmanager/RegionSpec.scala b/src/test/scala/ciris/aws/secretsmanager/RegionSpec.scala
@@ -4,12 +4,12 @@ import cats.effect.IO
 import ciris.ConfigValue
 import munit.CatsEffectSuite
 
-
 class RegionSpec extends CatsEffectSuite {
 
   test("should convert a region string to a Region") {
 
-    val region = ConfigValue.default("eu-west-1")
+    val region = ConfigValue
+      .default("eu-west-1")
       .as[Region]
       .load[IO]