Fix revision incrementation when approving a package in a repo registered with --directory #125
Conversation
- make revision incrementation on rpkg approve work with --directory repos
- add new Directory attribute to PackageRevisionKey
- and use it when matching PackageRevisions to filter out from the List operation
- package approval flow looks for previous copies of the package to
determine new latest revision string (e.g. v1 -> v2)
- this involves matching the package-for-approval's path attribute
against existing packages' packageName attribute
- however:
- when a repo is registered using --directory to associate it with
a subfolder in the upstream Git repo, packageName is deliberately trimmed
of the directory attribute if it exists
- but the path in the package-for-approval still has the directory part
- so no existing packages can match to be counted as previous copies
- therefore the revision can never increase beyond "v1" and the v1 tag is
overwritten in Git with each new approval
- this also results in previous package copies disappearing
- also for packages with slashes in the name
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: JamesMcDermott The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
JamesMcDermott
requested review from
nagygergo,
liamfallon,
efiacor,
kushnaidu and
Catalin-Stratulat-Ericsson
There was a problem hiding this comment.
https://github.com/nordix/porch/blob/1ae60b4366b99064404315984cdbd0f4a44810f5/pkg/cache/repository.go#L249 -- There is also a creation of a PackageRevisionKey, which actually looks like a partial copy, but it seems it would need to refer to the directory as well.
Fixes #814