images/create: handle tag/digest if Tag specified #24184
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: inknos 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 |
github-actions
bot
added
the
kind/api-change
pkg/api/handlers/compat/images.go
Outdated
| // if both name and tagOrDigest are defined we try to use the tagOrDigest image part and override the tag/digest | ||
| if len(name) > 0 && len(tagOrDigest) > 0 && strings.Contains(name, separator) { | ||
| parts := strings.Split(name, separator) | ||
| return fmt.Sprintf("%s%s%s", strings.Join(parts[:len(parts)-1], ""), separator, tagOrDigest) | ||
| } |
There was a problem hiding this comment.
checking len(tagOrDigest) > 0 is unnecessary as the function returns early if that is empty so we know it cannot be empty here
Then using string.Contains() and strings.Split() adds more overhead then needed here. You can use
strings.LastIndex(name, separator) once and then when the index is > 0 you can trim the name with name[:index]
However more important speaking string parsing registry references like this does not look correct to me. In particular this will fail when a registry host includes a port number, i.e. 127.0.0.1:5000/myimage as this would cause the code to cut at the wrong place. I am not super familiar with c/image but assume we should have some "proper" parsing code there to deal with that already so maybe we could resuse that?
cc @mtrmac
If there is no such code we can use then we must at least ensure the : is after the first /
There was a problem hiding this comment.
I believe this is closer to the solution now. LatestIndex definitely was a better approach.
I looked around the codebase and didn't find a function to solve this, but would be nice it there was.
I tested the code just by trying this atm.
curl -vd '' --unix-socket "/tmp/podman/podman.sock" 'http://localhost:80/v1.40/images/create?fromImage=hello-world%3Alatest&tag=latest'
There was a problem hiding this comment.
If there is no such code we can use then we must at least ensure the : is after the first /
@Luap99 do you think this is actually needed? I believe that the last occurrence of : or @ should be enough, but I am not that familiar with registry/image uri
There was a problem hiding this comment.
127.0.0.1:5000/myimage is a valid image reference (i.e. not tag default to latest). In this case you would join the tag at the wrong place for name=127.0.0.1:5000/myimage and tagOrDigest=mytag will result in a broken 127.0.0.1:mytag AFAICS
I think it would be really good to add unit tests for this function to check these corner cases properly
There was a problem hiding this comment.
yup, to be honest, I would split this functionality into a separate function and unit test that
There was a problem hiding this comment.
I mean you could test the entire mergeNameAndTagOrDigest(), I don't think it needs to be split smaller than that but I would not be opposed either
Podman handles /images/create better when fromImage and Tag are specified. Now the tag/digest value provided in Tag will replace the one in fromImage Fixes: containers#23938 Signed-off-by: Nicola Sella <[email protected]>
| @@ -45,6 +45,11 @@ func mergeNameAndTagOrDigest(name, tagOrDigest string) string { | |||
| // We have a digest, so let's change the separator. | |||
| separator = "@" | |||
| } | |||
| // if both name and tagOrDigest are defined we try to use the tagOrDigest image part and override the tag/digest | |||
| if len(name) > 0 && strings.Contains(name, separator) { | |||
There was a problem hiding this comment.
the contains is unnecessary, LastIndex already tells you if it contains or not so we only need to walk the string once not twice
Podman handles /images/create better when fromImage and Tag are specified. Now the tag/digest value provided in Tag will replace the one in fromImage
Fixes: #23938
Does this PR introduce a user-facing change?