Skip to content

Commit abd3674

Browse files
author
Derek Smart
committed
allow any when event name
Signed-off-by: Derek Smart <derek.smart@delphix.com>
1 parent 2e9094b commit abd3674

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ class Validator(val contents: JsonNode) {
66

77
var currentPosition: String = ""
88
var errors = mutableListOf<String>()
9-
val allowedEvents = listOf<String>("push", "pull-request-opened", "pull-request-closed", "build-failure", "bookmark-complete")
109
val allowedActions = listOf<String>("datapod.refresh", "datapod.create", "bookmark.share", "datapod.delete", "bookmark.create", "datapod.undo", "bookmark.delete")
1110

1211
fun getMessage(field:String): String {
@@ -61,15 +60,6 @@ class Validator(val contents: JsonNode) {
6160
}
6261
}
6362

64-
fun events(events: JsonNode) {
65-
for(event in events){
66-
val name = Mapper().getNodeName(event)
67-
currentPosition = "$currentPosition.$name"
68-
if (name !in allowedEvents) invalid(name)
69-
if (event.get("$name").asText() !in allowedActions) invalid(event.get("$name").asText())
70-
}
71-
}
72-
7363
fun environments(environments: JsonNode) {
7464
for(environment in environments){
7565
val name = Mapper().getNodeName(environment)
@@ -79,8 +69,8 @@ class Validator(val contents: JsonNode) {
7969
field(environment["$name"], "datapod")
8070
}
8171
node(environment["$name"], "when")
72+
environment["$name"]["when"] ?: return
8273
if (environment["$name"]["when"].size() == 0) empty("when")
83-
events(environment["$name"]["when"])
8474
}
8575
}
8676

0 commit comments

Comments
 (0)