Deprecated hoplite-aws module (#463)

Author: sksamuel

hoplite-aws/src/main/kotlin/com/sksamuel/hoplite/aws/AbstractAwsSecretsManagerContextResolver.kt

@@ -20,6 +20,7 @@ abstract class AbstractAwsSecretsManagerContextResolver(
 
   override fun lookup(path: String, node: StringNode, root: Node, context: DecoderContext): ConfigResult<String?> {
     val (key, index) = ops.extractIndex(path)
+    context.reportPrintFn("[WARN] Use of the hoplite-aws module is deprecated. Please use the hoplite-aws2 module instead.")
     return ops.fetchSecret(key)
       .onSuccess { if (report) ops.report(context, it) }
       .flatMap { ops.parseSecret(it, index) }

hoplite-aws/src/main/kotlin/com/sksamuel/hoplite/aws/AwsSecretsManagerPreprocessor.kt

@@ -55,6 +55,7 @@ class AwsSecretsManagerPreprocessor(
           val keyMatch = keyRegex.matchEntire(value)
           val (key, index) = if (keyMatch == null) Pair(value, null) else
             Pair(keyMatch.groupValues[1], keyMatch.groupValues[2])
+          context.reportPrintFn("[WARN] Use of the hoplite-aws module is deprecated. Please use the hoplite-aws2 module instead.")
           fetchSecret(key, index, node, context)
         }
       }

hoplite-aws/src/main/kotlin/com/sksamuel/hoplite/aws/ParameterStorePathPreprocessor.kt

@@ -41,6 +41,7 @@ class ParameterStorePathPreprocessor(
         null -> node.valid()
         else -> {
           val key = match.groupValues[1]
+          context.reportPrintFn("[WARN] Use of the hoplite-aws module is deprecated. Please use the hoplite-aws2 module instead.")
           fetchParameterStoreValues().fold(
             { values ->
               when (val value = values.firstOrNull { it.name == key }) {

hoplite-aws/src/main/kotlin/com/sksamuel/hoplite/aws/ParameterStorePreprocessor.kt

@@ -29,6 +29,7 @@ object ParameterStorePreprocessor : TraversingPrimitivePreprocessor() {
         null -> node.valid()
         else -> {
           val key = match.groupValues[1]
+          context.reportPrintFn("[WARN] Use of the hoplite-aws module is deprecated. Please use the hoplite-aws2 module instead.")
           fetchParameterStoreValue(key).fold(
             { node.copy(value = it).valid() },
             { ConfigFailure.PreprocessorFailure("Could not load '$key' from parameter store", it).invalid() }

hoplite-aws/src/main/kotlin/com/sksamuel/hoplite/aws/RegionDecoder.kt

@@ -19,9 +19,12 @@ class RegionDecoder : NullHandlingDecoder<Region> {
   override fun safeDecode(node: Node,
                           type: KType,
                           context: DecoderContext): ConfigResult<Region> {
-    fun regionFromName(name: String): ConfigResult<Region> =
-      runCatching { Region.getRegion(Regions.fromName(name)) }
-          .toValidated { ConfigFailure.Generic("Cannot create region from $name") }
+
+    fun regionFromName(name: String): ConfigResult<Region> {
+      context.reportPrintFn("[WARN] Use of the hoplite-aws module is deprecated. Please use the hoplite-aws2 module instead.")
+      return runCatching { Region.getRegion(Regions.fromName(name)) }
+        .toValidated { ConfigFailure.Generic("Cannot create region from $name") }
+    }
 
     return when (node) {
       is StringNode -> regionFromName(node.value)

hoplite-core/src/main/kotlin/com/sksamuel/hoplite/DecoderContext.kt

@@ -5,6 +5,7 @@ import com.sksamuel.hoplite.decoder.DecoderRegistry
 import com.sksamuel.hoplite.decoder.DotPath
 import com.sksamuel.hoplite.env.Environment
 import com.sksamuel.hoplite.fp.Validated
+import com.sksamuel.hoplite.report.Print
 import com.sksamuel.hoplite.resolver.Resolving
 import com.sksamuel.hoplite.resolver.context.ContextResolverMode
 import com.sksamuel.hoplite.transformer.NodeTransformer
@@ -35,6 +36,7 @@ data class DecoderContext(
   // determines if we should error when a context resolver cannot find a substitution
   val contextResolverMode: ContextResolverMode = ContextResolverMode.ErrorOnUnresolved,
   val sealedTypeDiscriminatorField: String? = null,
+  val reportPrintFn: Print = { println(it) }, // provides access to print warnings etc
 ) {
 
   /**

hoplite-core/src/test/kotlin/com/sksamuel/hoplite/Github350.kt

@@ -17,8 +17,6 @@ class Github350 : FunSpec() {
         .build()
         .loadConfigOrThrow()
 
-      println("actual: $config")
-
       val expected = Config(
         GoogleCredentials(".env.properties", ".env.properties"),
         Database("a1.properties", "a1.properties")

hoplite-core/src/test/kotlin/com/sksamuel/hoplite/decoder/DataClassDecoderTest.kt

@@ -97,9 +97,10 @@ class DataClassDecoderTest : StringSpec() {
         Pos.NoPos,
         DotPath.root
       )
-      DataClassDecoder().decode(node,
-        Foo::class.createType(),
-        DecoderContext(defaultDecoderRegistry(), defaultParamMappers(), defaultNodeTransformers())
+      DataClassDecoder().decode(
+        node = node,
+        type = Foo::class.createType(),
+        context = DecoderContext(defaultDecoderRegistry(), defaultParamMappers(), defaultNodeTransformers())
       ) shouldBe Foo(Year.of(1991), expectedDate, YearMonth.parse("2007-12"), expectedSqlTimestamp).valid()
     }
 

hoplite-micrometer-prometheus/src/main/kotlin/com/sksamuel/hoplite/micrometer/prometheus/PrometheusConfigDecoder.kt

@@ -5,8 +5,7 @@ import com.sksamuel.hoplite.DecoderContext
 import com.sksamuel.hoplite.Node
 import com.sksamuel.hoplite.decoder.Decoder
 import com.sksamuel.hoplite.fp.flatMap
-import io.micrometer.prometheus.HistogramFlavor
-import io.micrometer.prometheus.PrometheusConfig
+import io.micrometer.prometheusmetrics.PrometheusConfig
 import java.time.Duration
 import kotlin.reflect.KType
 import kotlin.reflect.typeOf
@@ -31,7 +30,6 @@ class PrometheusConfigDecoder : Decoder<PrometheusConfig> {
     return object : PrometheusConfig {
       override fun step(): Duration = config.step ?: super.step()
       override fun descriptions(): Boolean = config.descriptions ?: super.descriptions()
-      override fun histogramFlavor(): HistogramFlavor = config.histogramFlavor ?: super.histogramFlavor()
       override fun get(key: String): String? = null
     }
   }
@@ -40,5 +38,4 @@ class PrometheusConfigDecoder : Decoder<PrometheusConfig> {
 data class InternalConfig(
   val descriptions: Boolean?,
   val step: Duration?,
-  val histogramFlavor: HistogramFlavor?
 )