-
Notifications
You must be signed in to change notification settings - Fork 323
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Optional scripts
section in libraries' config
#11555
Closed
Closed
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
package org.enso.pkg | ||
|
||
import io.circe.{Decoder, DecodingFailure, Encoder, Json} | ||
import org.enso.scala.yaml.{YamlDecoder, YamlEncoder} | ||
import org.yaml.snakeyaml.error.YAMLException | ||
import org.yaml.snakeyaml.nodes.{MappingNode, Node, ScalarNode, SequenceNode} | ||
|
||
import java.util | ||
|
||
case class Script(name: String, arguments: Seq[String]) | ||
|
||
object Script { | ||
|
||
/** [[Encoder]] instance for the [[Script]]. */ | ||
implicit val encoder: Encoder[Script] = { script => | ||
val vs = script.arguments.map(Json.fromString) | ||
Json.obj(script.name -> Json.arr(vs: _*)) | ||
} | ||
|
||
implicit val yamlEncoder: YamlEncoder[Script] = | ||
new YamlEncoder[Script] { | ||
override def encode(value: Script) = { | ||
val fields = new util.ArrayList[String](value.arguments.length) | ||
value.arguments.foreach(v => fields.add(v)) | ||
toMap(value.name, fields) | ||
} | ||
} | ||
|
||
/** [[Decoder]] instance for the [[Script]]. */ | ||
implicit val decoder: Decoder[Script] = { json => | ||
for { | ||
key <- json.key.toRight(DecodingFailure("no key", Nil)) | ||
fields <- json.get[List[String]](key) | ||
} yield Script(key, fields) | ||
} | ||
|
||
implicit val yamlDecoder: YamlDecoder[Script] = | ||
new YamlDecoder[Script] { | ||
override def decode(node: Node): Either[Throwable, Script] = | ||
node match { | ||
case mappingNode: MappingNode => | ||
if (mappingNode.getValue.size() == 1) { | ||
val groupNode = mappingNode.getValue.get(0) | ||
(groupNode.getKeyNode, groupNode.getValueNode) match { | ||
case (scalarNode: ScalarNode, seqNode: SequenceNode) => | ||
val stringDecoder = implicitly[YamlDecoder[String]] | ||
val valuesDecoder = implicitly[YamlDecoder[Seq[String]]] | ||
|
||
for { | ||
k <- stringDecoder.decode(scalarNode) | ||
vs <- valuesDecoder.decode(seqNode) | ||
} yield Script(k, vs) | ||
case _ => | ||
Left( | ||
new YAMLException( | ||
"Failed to decode script. Expected a map field" | ||
) | ||
) | ||
} | ||
} else { | ||
Left( | ||
new YAMLException("Failed to decode script") | ||
) | ||
} | ||
} | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -32,7 +32,9 @@ class ConfigSpec | |
Contact(None, Some("[email protected]")) | ||
), | ||
preferLocalLibraries = true, | ||
componentGroups = None | ||
componentGroups = None, | ||
scripts = | ||
List(Script("refresh", List("Standard.Base.Http.Caches.refresh"))) | ||
) | ||
val deserialized = Config.fromYaml(config.toYaml).get | ||
deserialized shouldEqual config | ||
|
@@ -71,6 +73,61 @@ class ConfigSpec | |
} | ||
} | ||
|
||
"Scripts" should { | ||
"correctly de-serialize and serialize back" in { | ||
val config = | ||
"""|name: FooBar | ||
|namespace: local | ||
|scripts: | ||
|- refresh: | ||
| - Standard.Base.Http.Caches.refresh | ||
| - Standard.Base.Caches.refresh | ||
|""".stripMargin | ||
val parsed = Config.fromYaml(config).get | ||
|
||
val expectedScripts = List( | ||
Script( | ||
"refresh", | ||
List( | ||
"Standard.Base.Http.Caches.refresh", | ||
"Standard.Base.Caches.refresh" | ||
) | ||
) | ||
) | ||
parsed.scripts shouldEqual expectedScripts | ||
val serialized = parsed.toYaml | ||
serialized shouldEqual config | ||
} | ||
|
||
"reject duplicate entries" in { | ||
val config = | ||
"""|name: FooBar | ||
|namespace: local | ||
|scripts: | ||
|- refresh: | ||
| - Standard.Base.Http.Caches.refresh | ||
|- refresh: | ||
| - Standard.Base.Http.Caches.refresh | ||
|""".stripMargin | ||
val parsed = Config.fromYaml(config) | ||
parsed.isFailure shouldBe true | ||
parsed.failed.get.getMessage should include("Scripts have to be unique") | ||
} | ||
|
||
"accept unknown scripts" in { | ||
val config = | ||
"""|name: FooBar | ||
|namespace: local | ||
|scripts: | ||
|- startup: | ||
| - Standard.Base.Boot.start | ||
|""".stripMargin | ||
val parsed = Config.fromYaml(config) | ||
parsed.isSuccess shouldBe true | ||
parsed.get.scripts.head.name shouldBe "startup" | ||
} | ||
} | ||
|
||
"Component groups" should { | ||
|
||
"correctly de-serialize and serialize back the components syntax" in { | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you can use
nil()
helper method (see two lines above)