-
-
Notifications
You must be signed in to change notification settings - Fork 44
fix(env): ensure BackendRuntimeConfig.Envs overrides base Envs #341
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
Merged
+117
−1
Merged
Changes from all commits
Commits
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 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
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
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -38,6 +38,27 @@ func MergeResources(toMerge corev1.ResourceList, toBeMerged corev1.ResourceList) | |||||||||||||
| return toMerge | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| // MergeEnvs merges two env var list and ensures that entries in BackendRuntimeConfig.Env take precedence. | ||||||||||||||
| // This function takes two slices of corev1.EnvVar: 'base' and 'overrides'. It returns a new slice of corev1.EnvVar | ||||||||||||||
| // where the 'overrides' values overwrite any duplicate names in 'base'. | ||||||||||||||
| func MergeEnvs(base []corev1.EnvVar, overrides []corev1.EnvVar) []corev1.EnvVar { | ||||||||||||||
| envMap := make(map[string]corev1.EnvVar) | ||||||||||||||
|
|
||||||||||||||
| for _, env := range base { | ||||||||||||||
| envMap[env.Name] = env | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| for _, env := range overrides { | ||||||||||||||
| envMap[env.Name] = env | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| result := make([]corev1.EnvVar, 0, len(envMap)) | ||||||||||||||
| for _, env := range envMap { | ||||||||||||||
| result = append(result, env) | ||||||||||||||
| } | ||||||||||||||
| return result | ||||||||||||||
|
Comment on lines
+55
to
+59
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
result := make([]corev1.EnvVar, 0, len(envMap))
for env := range maps.Values(envMap) {
result = append(result, env)
}
return result |
||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| // MergeKVs will merge kvs in toBeMerged to toMerge. | ||||||||||||||
| // If kvs exist in toMerge, they will be replaced. | ||||||||||||||
| func MergeKVs(toMerge map[string]string, toBeMerged map[string]string) map[string]string { | ||||||||||||||
|
|
||||||||||||||
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
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 even we didn't merge them, still work here because the latter env will overwrite the former ones, but merge them makes it more clear. Thanks!