Revert OCI and Location #2814
Revert OCI and Location #2814
Conversation
Preparing for merge of porch branch back into main,
Preparing for merge of porch branch back into main.
martinmaly
requested review from
droot,
mortent,
mengqiy,
frankfarzan,
yuwenma and
natasha41575
as code owners
| return nil | ||
| } | ||
|
|
||
| // cloneAndCopy fetches the provided repo and copies the content into the |
There was a problem hiding this comment.
Just a note - this would be a good file to bookmark - that in a PR to main if there are no diffs or if there are that the main is authoritative.
Unless the text of the code came from the current main (rather than a "commit revert") - then having no diffs should be almost certain.
There was a problem hiding this comment.
good point. I will still need to be very careful with the merge into main.
There was a problem hiding this comment.
Confirmed. this file is near identical; only diff relative to main are filesystem changes.
| kptfilev1.Git | ||
| Destination string | ||
| } | ||
|
|
||
| func GitParseArgs(ctx context.Context, args []string) (GitTarget, error) { | ||
| g := GitTarget{} | ||
| func GitParseArgs(ctx context.Context, args []string) (Target, error) { |
There was a problem hiding this comment.
Same note - this file is also good to spot check. Actually - rather than wait for PR to main - you could spot-check now with a copy-paste of the entire raw file from main in your working copy to verify that it remains "unchanged".
There was a problem hiding this comment.
ack. Will double check this file too
There was a problem hiding this comment.
this one is identical to main
|
|
||
| // shouldUpdateSubPkgRef checks if subpkg ref should be updated. | ||
| // This is true if pkg has the same upstream repo, upstream directory is within or equal to root pkg directory and original root pkg ref matches the subpkg ref. | ||
| func shouldUpdateSubPkgRef(subKf, rootKf *kptfilev1.KptFile, originalRootKfRef string) bool { |
There was a problem hiding this comment.
Point of interest --- this is exactly where the location.Rel comes from. The need to know that two remote locations are identical in repo and revision - and the if one's path is under or equal to the other - except w/out being tightly coupled to understanding the remote location types.
| // read KptFile cloned with the package if it exists | ||
| kptfile, err := pkg.ReadKptfile(filesys.FileSystemOrOnDisk{}, path) | ||
| kpgfile, err := pkg.ReadKptfile(filesys.FileSystemOrOnDisk{}, path) |
There was a problem hiding this comment.
spin off --- keeping this PR a pure revert is a good idea, but there's a minor local variable typo here that would be nice to fix in main
There was a problem hiding this comment.
Yeah :) I actually fixed this typo and much of my battling with rebases last night was trying to keep this typo fixed; ultimately I gave up; will fix in main.
Im preparation to merge porch branch into main: