Fix incorrect handling when unfetched packages are deleted from upstream #2230
Conversation
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
| func checkPackageTags(pkgPath, ref string, upstreamRepo *gitutil.GitUpstreamRepo) string { | ||
| // Check if we have a ref in the upstream that matches the package-specific | ||
| // reference. If we do, we use that reference. | ||
| ps := strings.Split(pkgPath, "/") |
Contributor
There was a problem hiding this comment.
Contributor
Author
There was a problem hiding this comment.
The package path provided in the Kptfile is OS agnostic, so we should not use the OS specific filepath package here.
| // Check the diff. If there are local changes, we keep the subpackage. | ||
| // If the package has been deleted from upstream, we only want to delete | ||
| // it from local if it has no changes. | ||
| originUnfetched, err := pkg.IsPackageUnfetched(originPath) |
Contributor
There was a problem hiding this comment.
Why are we doing this check here ? Why can't we make sure that all the 3 sources are fetched when they are initially pulled on to local ?
Contributor
|
@mortent Is this still needed ? Can we close this and handle this when there are issues faced by customers with this behavior? |
Contributor
|
@liamfallon to review |
Contributor
|
kushal.harish.naidu@ericsson.com, this is slose to what you are working on in Porch |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
This PR fixes a corner case that is not handled correctly. If the upstream package contains an unfetched subpackage, it will be fetched when the package is cloned (so similar to how
syncworks in old kpt). If this package is later deleted from upstream, it should only be deleted from local if there are no local changes. Currently this doesn't work correctly, since the package in origin will be unfetched and therefore running the diff will always show changes. With this change, the update logic will fetch the full package for origin before doing a diff.Fixes: #2216
Must merge after #2217