introduce ResolveServicesEnvironment and resolve service environment AFTER profiles have been applied #338
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
ndeloof
force-pushed
the
ResolveServicesEnvironment
branch
from
2d20532 to
dc76fd1
Compare
ndeloof
force-pushed
the
ResolveServicesEnvironment
branch
from
dc76fd1 to
2f8259f
Compare
milas
reviewed
Jan 13, 2023
types/project.go
Outdated
| } | ||
|
|
||
| // Do not defer to avoid it inside a loop | ||
| file.Close() //nolint:errcheck |
There was a problem hiding this comment.
This will leak if we end up returning an error above - perhaps os.ReadFile instead?
There was a problem hiding this comment.
+1, or if we just want to pass file name we should use envFile variable directly
types/types.go
Outdated
| @@ -357,12 +357,12 @@ type ThrottleDevice struct { | |||
| // ShellCommand is a string or list of string args. | |||
| // | |||
| // When marshaled to YAML, nil command fields will be omitted if `omitempty` | |||
| // is specified as a struct tag. Explicitly empty commands (i.e. `[]` or `''`) | |||
| // is specified as a struct tag. Explicitly empty commands (i.e. `[]` or `”`) | |||
There was a problem hiding this comment.
This is one of my favorite running gags of the moment 😂
There was a problem hiding this comment.
Suggested change
| // is specified as a struct tag. Explicitly empty commands (i.e. `[]` or `”`) | |
| // is specified as a struct tag. Explicitly empty commands (i.e. `[]` or `''`) |
glours
requested changes
Jan 18, 2023
types/project.go
Outdated
| } | ||
|
|
||
| // Do not defer to avoid it inside a loop | ||
| file.Close() //nolint:errcheck |
There was a problem hiding this comment.
+1, or if we just want to pass file name we should use envFile variable directly
types/types.go
Outdated
| @@ -357,12 +357,12 @@ type ThrottleDevice struct { | |||
| // ShellCommand is a string or list of string args. | |||
| // | |||
| // When marshaled to YAML, nil command fields will be omitted if `omitempty` | |||
| // is specified as a struct tag. Explicitly empty commands (i.e. `[]` or `''`) | |||
| // is specified as a struct tag. Explicitly empty commands (i.e. `[]` or `”`) | |||
There was a problem hiding this comment.
This is one of my favorite running gags of the moment 😂
types/types.go
Outdated
| @@ -357,12 +357,12 @@ type ThrottleDevice struct { | |||
| // ShellCommand is a string or list of string args. | |||
| // | |||
| // When marshaled to YAML, nil command fields will be omitted if `omitempty` | |||
| // is specified as a struct tag. Explicitly empty commands (i.e. `[]` or `''`) | |||
| // is specified as a struct tag. Explicitly empty commands (i.e. `[]` or `”`) | |||
There was a problem hiding this comment.
Suggested change
| // is specified as a struct tag. Explicitly empty commands (i.e. `[]` or `”`) | |
| // is specified as a struct tag. Explicitly empty commands (i.e. `[]` or `''`) |
types/types.go
Outdated
| // will serialize to an empty array (`[]`). | ||
| // | ||
| // When marshaled to JSON, the `omitempty` struct must NOT be specified. | ||
| // If the command field is nil, it will be serialized as `null`. | ||
| // Explicitly empty commands (i.e. `[]` or `''`) will serialize to an empty | ||
| // Explicitly empty commands (i.e. `[]` or `”`) will serialize to an empty |
There was a problem hiding this comment.
Suggested change
| // Explicitly empty commands (i.e. `[]` or `”`) will serialize to an empty | |
| // Explicitly empty commands (i.e. `[]` or `''`) will serialize to an empty |
There was a problem hiding this comment.
this makes me crazy
There was a problem hiding this comment.
My LSP has turned to doing the same thing and now I have to fix it before I make my PRs 😭
ndeloof
force-pushed
the
ResolveServicesEnvironment
branch
3 times, most recently
from
ebf718b to
b559569
Compare
…AFTER profiles have been applied Signed-off-by: Nicolas De Loof <[email protected]>
ndeloof
force-pushed
the
ResolveServicesEnvironment
branch
from
b559569 to
a30b5f7
Compare
milas
approved these changes
Jan 19, 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.
This introduces
WithProfilesso the loader can directly apply selected profiles, and moves env_file loading logic to a later phase, so we won't try to load for services which have been disabledAlso introduce load option
SkipResolveEnvFilesto fully bypass this and processenv_filesin a later phasecloses docker/compose#8713