evaluate env variables in git repo URI only when the value is available

znsio · May 12, 2024 · 0af1429 · 0af1429
1 parent 756497b
commit 0af1429
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/core/src/main/kotlin/in/specmatic/core/git/GitOperations.kt b/core/src/main/kotlin/in/specmatic/core/git/GitOperations.kt
@@ -119,9 +119,13 @@ fun evaluateEnvVariablesInGitRepoURI(gitRepositoryURI: String, environmentVariab
     val envVariableMatches = envVariableRegex.findAll(gitRepositoryURI)
     envVariableMatches.forEach { matchResult ->
         val envVariable = matchResult.groupValues[1]
-        val envVariableValue = environmentVariables.getValue(envVariable)
-        logger.log("Evaluating $envVariable in $gitRepositoryURI")
-        evaluatedGitRepoUrl = evaluatedGitRepoUrl.replace("\${$envVariable}", envVariableValue)
+        if (environmentVariables.containsKey(envVariable)) {
+            val envVariableValue = environmentVariables.getValue(envVariable)
+            logger.log("Evaluating $envVariable in $gitRepositoryURI")
+            evaluatedGitRepoUrl = evaluatedGitRepoUrl.replace("\${$envVariable}", envVariableValue)
+        } else {
+            logger.log("$envVariable in $gitRepositoryURI resembles an environment variable, but it is not available in the environment variables. Skipping evaluation.")
+        }
     }
     return evaluatedGitRepoUrl
 }

diff --git a/core/src/test/kotlin/in/specmatic/core/git/GitOperationsTest.kt b/core/src/test/kotlin/in/specmatic/core/git/GitOperationsTest.kt
@@ -30,4 +30,15 @@ class GitOperationsTest {
             )
         assertThat(evaluatedGitRepositoryURI).isEqualTo("https://john:[email protected]/group/project.git")
     }
+
+    @Test
+    fun shouldNotEvaluatePatternsThatResembleEnvVarsWhenTheValueIsNotAvailable() {
+        val gitRepositoryURI = "https://gitlab-ci-token:${'$'}{CI_JOB_TOKEN}@gitlab.com/group/${'$'}{do-not-eval}/project.git"
+        val evaluatedGitRepositoryURI =
+            evaluateEnvVariablesInGitRepoURI(
+                gitRepositoryURI = gitRepositoryURI,
+                mapOf("CI_JOB_TOKEN" to "token")
+            )
+        assertThat(evaluatedGitRepositoryURI).isEqualTo("https://gitlab-ci-token:[email protected]/group/${'$'}{do-not-eval}/project.git")
+    }
 }