Release: 0.42.5

Fix request level auth

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

Author: overfullstack

README.adoc

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

buildSrc/src/main/kotlin/Config.kt

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

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

@@ -43,12 +43,15 @@ import org.http4k.core.Request
 import org.http4k.format.ConfigurableMoshi
 
 object ReVoman {
+
   @JvmStatic
-  @OptIn(ExperimentalStdlibApi::class)
-  fun revUp(vararg kicks: Kick): List<Rundown> =
+  @JvmOverloads
+  fun revUp(
+    dynamicEnvironment: Map<String, String> = mapOf<String, String>(),
+    vararg kicks: Kick
+  ): List<Rundown> =
     kicks
-      .fold(mapOf<String, String>() to listOf<Rundown>()) { (accumulatedMutableEnv, rundowns), kick
-        ->
+      .fold(dynamicEnvironment to listOf<Rundown>()) { (accumulatedMutableEnv, rundowns), kick ->
         val rundown =
           revUp(
             kick.overrideDynamicEnvironments(
@@ -67,10 +70,16 @@ object ReVoman {
     val pmStepsDeepFlattened =
       kick
         .templatePaths()
+        .asSequence()
         .mapNotNull { pmTemplateAdapter.fromJson(bufferFileInResources(it)) }
         .flatMap { (pmSteps, authFromRoot) ->
-          deepFlattenItems(pmSteps.map { it.copy(auth = it.auth ?: authFromRoot) })
+          deepFlattenItems(
+            pmSteps.map { item ->
+              item.copy(request = item.request.copy(auth = item.request.auth ?: authFromRoot))
+            }
+          )
         }
+        .toList()
     logger.info {
       val templateCount = kick.templatePaths().size
       "Total Steps from ${if (templateCount > 1) "$templateCount Collections" else "the Collection"} provided: ${pmStepsDeepFlattened.size}"
@@ -140,7 +149,7 @@ object ReVoman {
               pm.rundown = pm.rundown.copy(stepReports = pm.rundown.stepReports + sr)
               val item = regexReplacer.replaceVariablesInPmItem(itemWithRegex, pm)
               val httpRequest = item.request.toHttpRequest()
-              fireHttpRequest(step, item.auth, httpRequest, kick.insecureHttp())
+              fireHttpRequest(step, item.request.auth, httpRequest, kick.insecureHttp())
                 .mapLeft { sr.copy(requestInfo = Left(it).toVavr()) }
                 .map {
                   sr.copy(

src/main/kotlin/com/salesforce/revoman/internal/exe/ExeUtils.kt

@@ -43,12 +43,16 @@ internal fun deepFlattenItems(
         if (stepIndexFromParent.isBlank()) "${itemIndex + 1}"
         else "$stepIndexFromParent.${itemIndex + 1}"
       item.item
-        ?.map { childItem -> childItem.copy(auth = childItem.auth ?: item.auth) }
+        ?.map { childItem ->
+          childItem.copy(
+            request = childItem.request.copy(auth = childItem.request.auth ?: item.request.auth)
+          )
+        }
         ?.let {
           val currentFolder = Folder(item.name, parentFolder)
           parentFolder?.subFolders?.add(currentFolder)
           deepFlattenItems(it, currentFolder, stepIndex)
-        } ?: listOf(Step(stepIndex, item.name, item.copy(auth = item.auth), parentFolder))
+        } ?: listOf(Step(stepIndex, item, parentFolder))
     }
     .toList()
 
@@ -121,7 +125,7 @@ internal fun shouldHaltExecution(
             }
           }
         }
-        ?.not() ?: true
+        ?.not() != false
     }
   }
 

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

@@ -57,19 +57,17 @@ class RegexReplacer(
     }
 
   internal fun replaceVariablesInPmItem(item: Item, pm: PostmanSDK): Item =
-    item.copy(
-      request = replaceVariablesInRequestRecursively(item.request, pm),
-      auth =
-        item.auth?.copy(
-          bearer = listOfNotNull(replaceVariablesInBearer(item.auth.bearer.firstOrNull(), pm))
-        )
-    )
+    item.copy(request = replaceVariablesInRequestRecursively(item.request, pm))
 
   private fun replaceVariablesInBearer(bearer: Bearer?, pm: PostmanSDK): Bearer? =
     bearer?.copy(value = replaceVariablesRecursively(bearer.value, pm)!!)
 
   internal fun replaceVariablesInRequestRecursively(request: Request, pm: PostmanSDK): Request =
     request.copy(
+      auth =
+        request.auth?.copy(
+          bearer = listOfNotNull(replaceVariablesInBearer(request.auth.bearer.firstOrNull(), pm))
+        ),
       header =
         request.header.map { header ->
           header.copy(

src/main/kotlin/com/salesforce/revoman/internal/postman/template/Template.kt

@@ -25,7 +25,6 @@ data class Item(
   val name: String = "",
   val item: List<Item>? = null,
   val request: Request = Request(),
-  val auth: Auth? = null,
   val event: List<Event>? = null
 ) {
   @JvmField val httpMethod = request.method
@@ -44,6 +43,7 @@ data class Event(val listen: String, val script: Script) {
 
 @JsonClass(generateAdapter = true)
 data class Request(
+  @JvmField val auth: Auth? = null,
   @JvmField val method: String = "",
   @JvmField val header: List<Header> = emptyList(),
   @JvmField val url: Url = Url(),

src/main/kotlin/com/salesforce/revoman/output/report/Step.kt

@@ -14,10 +14,10 @@ import java.util.Collections.indexOfSubList
 
 data class Step(
   @JvmField val index: String,
-  @JvmField val name: String,
   @JvmField val rawPMStep: Item,
   @JvmField val parentFolder: Folder? = null,
 ) {
+  @JvmField val name: String = rawPMStep.name
   @JvmField var preHookCount: Int = 0
   @JvmField var postHookCount: Int = 0
   @JvmField

src/test/kotlin/com/salesforce/revoman/output/report/StepReportTest.kt

@@ -29,10 +29,7 @@ class StepReportTest {
       Request(method = POST.toString(), url = Url("https://overfullstack.github.io/"))
     val requestInfo = TxnInfo(String::class.java, "fakeRequest", rawRequest.toHttpRequest())
     val stepReportSuccess =
-      StepReport(
-        Step("1.3.7", "HttpStatusSuccessful", Item(request = rawRequest)),
-        Right(requestInfo)
-      )
+      StepReport(Step("1.3.7", Item(request = rawRequest)), Right(requestInfo))
     println(stepReportSuccess)
     stepReportSuccess.isHttpStatusSuccessful shouldBe true
   }
@@ -44,7 +41,7 @@ class StepReportTest {
     val requestInfo = TxnInfo(String::class.java, "fakeRequest", rawRequest.toHttpRequest())
     val stepReportHttpFailure =
       StepReport(
-        Step("1.3.7", "HttpRequestFailure", Item(request = rawRequest)),
+        Step("1.3.7", Item(request = rawRequest)),
         Left(HttpRequestFailure(RuntimeException("fakeRTE"), requestInfo))
       )
     println(stepReportHttpFailure)
@@ -60,7 +57,7 @@ class StepReportTest {
       TxnInfo(String::class.java, "fakeBadResponse", Response(BAD_REQUEST).body("fakeBadResponse"))
     val stepReportBadRequest =
       StepReport(
-        Step("", "BadResponse", Item(request = rawRequest)),
+        Step("", Item(request = rawRequest)),
         Right(requestInfo),
         null,
         Right(badResponseInfo)
@@ -77,7 +74,7 @@ class StepReportTest {
     val responseInfo: TxnInfo<Response> = TxnInfo(String::class.java, "fakeResponse", Response(OK))
     val stepReportPostHookFailure =
       StepReport(
-        Step("", "PostHookFailure", Item(request = rawRequest)),
+        Step("", Item(request = rawRequest)),
         Right(requestInfo),
         null,
         Right(responseInfo),