fix(extends): fix extends related logs#645
Merged
ndeloof merged 2 commits intocompose-spec:mainfrom Jul 2, 2024
Merged
Conversation
ndeloof
approved these changes
Jun 24, 2024
ndeloof
reviewed
Jul 1, 2024
| if file != nil { | ||
| filename = file.(string) | ||
| services, err = getExtendsBaseFromFile(ctx, ref, filename, opts, tracker) | ||
| refFilename := file.(string) |
Collaborator
There was a problem hiding this comment.
I wonder about the impact not assigning filename anymore:
tracker.Add(filename, name) will then fail to capture the target file
Contributor
Author
There was a problem hiding this comment.
assigned the name to filename after the func call
ndeloof
approved these changes
Jul 1, 2024
Collaborator
|
@idsulik can you fix the conflict, please? |
Signed-off-by: Suleiman Dibirov <idsulik@gmail.com>
Signed-off-by: Suleiman Dibirov <idsulik@gmail.com>
Contributor
Author
jhrotko
approved these changes
Jul 2, 2024
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
4 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.
Fixes docker/compose#11571
It used to output wrong data if you extends from file and not full data if you want to use service in current file, new outputs:
local service:
before:
cannot extend service "known" in /Users/main/Development/idsulik/compose/tmp/docker-compose.yaml: service not foundafter:
cannot extend service "known" in /Users/main/Development/*/compose/tmp/docker-compose.yaml: service "blah" not foundservice from file:
before:
cannot extend service "blah" in in.yaml: service not foundafter:
cannot extend service "known" in /Users/main/Development/*/compose/tmp/docker-compose.yaml: service "blah" not found in in.yamldocker-compose-yaml: