Skip to content

Commit 72ac03a

Browse files
author
Derek Smart
committed
accept bookmark as cli param
Signed-off-by: Derek Smart <derek.smart@delphix.com>
1 parent 296a65d commit 72ac03a

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

src/main/kotlin/com/delphix/yamlparser/Parser.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ object Parser {
7272

7373
class Parse : CliktCommand() {
7474
val env: String by option(help="Path to env file.").default(".env")
75+
val bookmark: String by option(help="Bookmark name.").default("")
7576

7677
override fun run(){
7778
val file = File("delphix.yaml")
@@ -93,7 +94,7 @@ object Parser {
9394
val env: Map<String, String> = loadEnvs(env)
9495
val delphix: Delphix = Delphix(Http(env["delphixEngine"]?: ""))
9596
val yaml: Yaml = Mapper().mapYaml(contents)
96-
val runner: Runner = Runner(yaml, env, delphix)
97+
val runner: Runner = Runner(yaml, env, delphix, bookmark)
9798

9899
try {
99100
runner.run()

src/main/kotlin/com/delphix/yamlparser/Runner.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,16 @@ import org.json.JSONObject
88
class Runner (
99
val yaml: Yaml,
1010
val env: Map<String, String>,
11-
val delphix: Delphix
11+
val delphix: Delphix,
12+
val bookmark: String
1213
) {
1314
var currentAction: JSONObject = JSONObject()
1415

1516
fun getBuildTag(environment: String): String {
1617
val commit = env["gitCommit"]?: "BUILDTAG"
18+
if (bookmark.isNotEmpty()) {
19+
return bookmark
20+
}
1721
return environment + "-" + commit.substring(0,6)
1822
}
1923

src/test/kotlin/com/delphix/yamlparser/RunnerTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class RunnerTest {
2424
val yaml: Yaml = Mapper().mapYaml(mapJsonToNode(jsonString))
2525
val env: Map<String, String> = mapOf("gitBranch" to "origin/develop", "gitCommit" to "0bb822091eed2ae15d67ed91f3ba8591b39e6c4e", "gitEvent" to "push", "delphixEngine" to "delphixEngine", "delphixUser" to "delphixUser", "delphixPass" to "delphixPass", "delphixRepository" to "Postgres vFiles (9.6.8)")
2626
val delphix : Delphix = mock()
27-
val runner: Runner = Runner(yaml, env, delphix)
27+
val runner: Runner = Runner(yaml, env, delphix, "bookmark")
2828

2929
@Test fun `can call Delphix`() : Unit {
3030
/*

0 commit comments

Comments
 (0)