Ensure environment variables have higher priority than plugin configuration stored on disk#496
Merged
nikita-tkachenko-datadog merged 2 commits intoJan 20, 2025
Conversation
…ration stored on disk
nikita-tkachenko-datadog
added
the
changelog/Fixed
nikita-tkachenko-datadog
marked this pull request as ready for review
January 20, 2025 11:31
drodriguezhdez
left a comment
drodriguezhdez
left a comment
Collaborator
There was a problem hiding this comment.
Dropped some comments
Comment on lines
+48
to
+50
| String apiUrl = System.getenv().getOrDefault(TARGET_API_URL_PROPERTY, this.apiUrl); | ||
| String logsUrl = System.getenv().getOrDefault(TARGET_LOG_INTAKE_URL_PROPERTY, this.logsUrl); | ||
| String webhooksUrl = System.getenv().getOrDefault(TARGET_WEBHOOK_INTAKE_URL_PROPERTY, this.webhooksUrl); |
Collaborator
There was a problem hiding this comment.
Suggested change
| String apiUrl = System.getenv().getOrDefault(TARGET_API_URL_PROPERTY, this.apiUrl); | |
| String logsUrl = System.getenv().getOrDefault(TARGET_LOG_INTAKE_URL_PROPERTY, this.logsUrl); | |
| String webhooksUrl = System.getenv().getOrDefault(TARGET_WEBHOOK_INTAKE_URL_PROPERTY, this.webhooksUrl); | |
| Map<String, String> envVars = System.getenv() | |
| String apiUrl = envVars.getOrDefault(TARGET_API_URL_PROPERTY, this.apiUrl); | |
| String logsUrl = envVars.getOrDefault(TARGET_LOG_INTAKE_URL_PROPERTY, this.logsUrl); | |
| String webhooksUrl = envVars.getOrDefault(TARGET_WEBHOOK_INTAKE_URL_PROPERTY, this.webhooksUrl); |
Should we generate a local variable to avoid calling System.getenv() repeteadly?
Collaborator
Author
There was a problem hiding this comment.
Makes sense, fixed
| if (defaultKey != null){ | ||
| return new DatadogTextApiKey(defaultKey); | ||
| } else { | ||
| return this; |
Collaborator
There was a problem hiding this comment.
So basically, this in this context is the instance deserialized using the xml config file?
Could we add a comment on this line indicating this?
Collaborator
Author
There was a problem hiding this comment.
this in this context is the instance deserialized using the xml config file
Correct. Added the comment explaining it
nikita-tkachenko-datadog
deleted the
nikita-tkachenko/environment-vars-config-precedence
branch
January 20, 2025 14:06
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Requirements for Contributing to this repository
What does this PR do?
Ensures that
DATADOG_JENKINS_PLUGIN_*environment variables have higher precedence than plugin configuration values stored on disk.Fixes #494
Description of the Change
Alternate Designs
Possible Drawbacks
Verification Process
Additional Notes
Release Notes
Review checklist (to be filled by reviewers)
changelog/label attached. If applicable it should have thebackward-incompatiblelabel attached.do-not-merge/label attached.kind/andseverity/labels attached at least.