feat: decouple env plugin from language runtimes #452
Merged
Conversation
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
darvld
added
module:graalvm
darvld
changed the title
github-actions
bot
added
platform:jvm
darvld
commented
Oct 6, 2023
| * @see EnvConfig | ||
| */ | ||
| @DelicateElideApi public class Environment private constructor (public val config: EnvConfig) { | ||
| private val effectiveEnvironment: AtomicReference<MutableMap<String, String?>> = AtomicReference(null) |
There was a problem hiding this comment.
environment is now mapped from the config, we no longer need to manually synchronize or even assign this map (lazy is technically still synchronized).
darvld
commented
Oct 6, 2023
| override val key: Key<Environment> = Key("Environment") | ||
|
|
||
| override fun install(scope: InstallationScope, configuration: EnvConfig.() -> Unit): Environment { | ||
| // apply the configuration and create the plugin instance | ||
| val config = EnvConfig().apply(configuration) | ||
| val instance = Environment(config) | ||
|
|
||
| // @TODO: graceful language detection |
There was a problem hiding this comment.
fixed, now there's no need for language detection
darvld
commented
Oct 6, 2023
| @@ -60,80 +56,40 @@ import elide.vm.annotations.Polyglot | |||
|
|
|||
| /** Apply an environment [config] to a context [builder] during the [ContextCreated] event. */ | |||
| internal fun onContextCreate(builder: PolyglotContextBuilder) { | |||
| if (config.app.enabled) { | |||
There was a problem hiding this comment.
Environment map initialization logic has been moved to a lazy property
darvld
commented
Oct 6, 2023
| private val mutableEnvironmentVariables: MutableMap<String, EnvVar> = ConcurrentSkipListMap() | ||
|
|
||
| /** Register an [EnvVar] with the given [key]. */ | ||
| public fun setEnv(key: String, value: EnvVar) { |
There was a problem hiding this comment.
Following a similar pattern to language bindings in AbstractLanguagePlugin, expose only an immutable map and very restricted mutating operations using methods.
darvld
force-pushed
the
feat/env-plugin-refactor
branch
2 times, most recently
from
a8b92d3
to
a084931
Compare
Signed-off-by: Dario Valdespino <dvaldespino00@gmail.com>
Signed-off-by: Dario Valdespino <dvaldespino00@gmail.com>
Signed-off-by: Dario Valdespino <dvaldespino00@gmail.com>
darvld
force-pushed
the
feat/env-plugin-refactor
branch
from
a084931
to
06dd1ec
Compare
sgammon
approved these changes
Oct 10, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
This PR updates the
Environmentplugin to remove dependencies on language plugins.The env variables proxy is injected through polyglot bindings by default. Languages without support for polyglot bindings may install the env proxy manually to language-scoped bindings using
Environment.install(PolyglotContext, GuestLanguage).