Release 0.8.1

DynamicEnvironment supports accepting a String

Signed-off-by: Gopal S Akshintala <[email protected]>

Author: overfullstack

.idea/kotlinc.xml

@@ -55,9 +55,11 @@ You can run/debug the existing unit tests or write your own to play with the too
 If you're a Java developer and new to Kotlin, don't worry, Kotlin is a JVM language and can be used anywhere Java is used.
 In fact, it has got the reputation of *"Better Java!"*.
 * A typical Java developer can ramp up on Kotlin in less than a week. These resources can help catalyze your ramp-up:
+** https://play.kotlinlang.org/byExample/overview[Learn Kotlin by Example]
 ** https://www.coursera.org/learn/kotlin-for-java-developers[*Kotlin for Java Developers | Coursera*], a free course
 ** https://www.kotlinprimer.com/[The Kotlin Primer], tailor-made to facilitate Kotlin adoption inside Java-centric organizations
 * If you use Intellij, Kotlin plugin comes bundled.
+* If you use VS Code based IDEs (e.g. Cursor) install this official https://github.com/Kotlin/kotlin-lsp[Kotlin Language Server plugin]
 Similar development aids should be present for other code editors too.
 
 == Code Formatting
@@ -70,6 +72,17 @@ It may be slow for the first run, but subsequent runs should be faster.
 
 == Manual publishing
 
+=== Gradle Nexus Publish Plugin
+
+We use https://github.com/gradle-nexus/publish-plugin#publishing-to-maven-central-via-sonatype-central[Gradle Nexus Publish Plugin]
+to publish to Maven Central. Follow the usage instructions to set up Sonatype credentials and add them to your `~/.gradle/gradle.properties`.
+
+[source,bash]
+----
+sonatypeUsername=<your-username>
+sonatypePassword=<your-password>
+----
+
 === Versioning Strategy
 
 ====
@@ -80,17 +93,19 @@ It may be slow for the first run, but subsequent runs should be faster.
 * B = Profit (Feature / Improvement)
 * C = Broke something by accident (Bug)
 
-Follow the Versioning Strategy to increment version link:buildSrc/{sourcedir}/Config.kt[here]
+Follow the Versioning Strategy to increment version link:buildSrc/{sourcedir}/Config.kt[here].
+For SNAPSHOT releases, add a `-SNAPSHOT` at the end of version number
+
+=== Publish
 
-* For SNAPSHOT releases, add a `-SNAPSHOT` at the end of version number
-* Run this command to publish it to Nexus:
+Run this command to publish it to Nexus:
 
 [source,bash]
 ----
 ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository -Dorg.gradle.parallel=false --no-configuration-cache
 ----
 
-* You can monitor for the new version jar to reflect in link:https://repo1.maven.org/maven2/com/salesforce/revoman/revoman/[Maven Central]. It usually takes less than 30 minutes.
+* You can monitor for the new version jar to reflect in https://repo1.maven.org/maven2/com/salesforce/revoman/revoman/[Maven Central]. It usually takes less than 30 minutes.
 
 == Code of Conduct
 Please follow our link:CODE_OF_CONDUCT.md[Code of Conduct]

CONTRIBUTING.adoc

@@ -18,7 +18,7 @@ endif::[]
 :pmtemplates: src/integrationTest/resources/pm-templates
 :imagesdir: docs/images
 :prewrap!:
-:revoman-version: 0.8.0
+:revoman-version: 0.8.1
 
 '''
 

README.adoc

@@ -71,4 +71,12 @@ kover { reports { total { html { onCheck = true } } } }
 
 moshi { enableSealed = true }
 
-nexusPublishing { this.repositories { sonatype { stagingProfileId = STAGING_PROFILE_ID } } }
+nexusPublishing {
+  this.repositories {
+    sonatype {
+      stagingProfileId = STAGING_PROFILE_ID
+      nexusUrl = uri("https://ossrh-staging-api.central.sonatype.com/service/local/")
+      snapshotRepositoryUrl = uri("https://central.sonatype.com/repository/maven-snapshots/")
+    }
+  }
+}

build.gradle.kts

@@ -6,6 +6,6 @@
  * ************************************************************************************************
  */
 const val GROUP_ID = "com.salesforce.revoman"
-const val VERSION = "0.8.0"
+const val VERSION = "0.8.1"
 const val ARTIFACT_ID = "revoman"
 const val STAGING_PROFILE_ID = "1ea0a23e61ba7d"

buildSrc/src/main/kotlin/Config.kt

@@ -63,12 +63,7 @@ object ReVoman {
     kicks
       .fold(dynamicEnvironment to listOf<Rundown>()) { (accumulatedMutableEnv, rundowns), kick ->
         val rundown =
-          revUp(
-            kick.overrideDynamicEnvironments(
-              kick.dynamicEnvironmentsFlattened(),
-              accumulatedMutableEnv,
-            )
-          )
+          revUp(kick.overrideDynamicEnvironment(kick.dynamicEnvironment() + accumulatedMutableEnv))
         val accumulatedRundowns = rundowns + rundown
         postExeHook.accept(rundown, accumulatedRundowns)
         rundown.mutableEnv.mutableEnvCopyWithValuesOfType<String>() to accumulatedRundowns
@@ -107,11 +102,7 @@ object ReVoman {
         kick.globalSkipTypes(),
       )
     val environment =
-      mergeEnvs(
-        kick.environmentPaths(),
-        kick.environmentInputStreams(),
-        kick.dynamicEnvironmentsFlattened(),
-      )
+      mergeEnvs(kick.environmentPaths(), kick.environmentInputStreams(), kick.dynamicEnvironment())
     val pm =
       PostmanSDK(moshiReVoman, kick.nodeModulesPath(), regexReplacer, environment.toMutableMap())
     val stepNameToReport =

src/main/kotlin/com/salesforce/revoman/ReVoman.kt

@@ -35,15 +35,10 @@ internal interface KickDef {
 
   fun environmentInputStreams(): List<InputStream>
 
-  fun dynamicEnvironments(): List<Map<String, String>>
+  fun dynamicEnvironment(): Map<String, Any?>
 
   fun nodeModulesPath(): String?
 
-  @Value.Derived
-  fun dynamicEnvironmentsFlattened(): Map<String, String> =
-    if (dynamicEnvironments().isEmpty()) emptyMap()
-    else dynamicEnvironments().reduce { acc, map -> acc + map }
-
   fun customDynamicVariableGenerators(): Map<String, CustomDynamicVariableGenerator>
 
   @Value.Default fun haltOnAnyFailure(): Boolean = false

src/main/kotlin/com/salesforce/revoman/input/config/KickDef.kt

@@ -106,6 +106,14 @@ open class MoshiReVoman(builder: Moshi.Builder) {
   fun jsonToObjToPrettyJson(input: String?, serializeNulls: Boolean = false): String? =
     input?.let { toPrettyJson(fromJson(it), serializeNulls) }
 
+  fun anyToString(value: Any?): String =
+    when (value) {
+      is String -> value
+      // * NOTE 08 Mar 2025 gopala.akshintala: To be consistent with Postman app behavior
+      null -> "null"
+      else -> toJson(value)
+    }
+
   companion object {
     @Synchronized
     @JvmOverloads

src/main/kotlin/com/salesforce/revoman/internal/json/MoshiReVoman.kt

@@ -51,6 +51,8 @@ class PostmanSDK(
     @Suppress("unused") fun xml2Json(xml: String): Any?
   }
 
+  internal fun getAsString(key: String): String = moshiReVoman.anyToString(environment[key])
+
   inner class JSEvaluator(nodeModulesPath: String? = null) {
     private val jsContext: Context
     private var imports = ""

src/main/kotlin/com/salesforce/revoman/internal/postman/PostmanSDK.kt

@@ -44,10 +44,9 @@ class RegexReplacer(
             value ->
             pm.environment[variableKey] = value
           }
-          ?: (if (pm.environment[variableKey] is String)
-              replaceVariablesRecursively(pm.environment[variableKey] as String, pm)
-            else pm.environment[variableKey].toString())
-            ?.also { value -> pm.environment[variableKey] = value }
+          ?: replaceVariablesRecursively(pm.getAsString(variableKey), pm)?.also { value ->
+            pm.environment[variableKey] = value
+          }
           ?: matchResult.value
       }
     }