Fix an issue accessing the Config when we mutate it. #88
Conversation
This file contains 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
| @@ -132,6 +132,10 @@ func Config(base v1.Image, cfg v1.Config) (v1.Image, error) { | |||
| diffIDMap: make(map[v1.Hash]v1.Layer), | |||
| digestMap: make(map[v1.Hash]v1.Layer), | |||
| } | |||
| image.manifest.Config.Digest, err = image.ConfigName() | |||
There was a problem hiding this comment.
I haven't read through all of this file, but we do this above in Append, do we need to do it here too?
There was a problem hiding this comment.
This doesn't call append :)
|
if you rebase you'll pick up my patch that ignores vendor/ in gofmt. |
mattmoor
force-pushed
the
fix-config-mutation
branch
from
369c2c7
to
a0990f3
Compare
|
I fixed the test |
dlorenc
approved these changes
Apr 21, 2018
v1/mutate/mutate_test.go
Outdated
| if !manifestsAreEqual(t, source, result) { | ||
| t.Fatal("mutating the config mutated the manifest") | ||
| if manifestsAreEqual(t, source, result) { | ||
| t.Fatal("mutating the config MUST the manifest") |
We were changing the `ConfigFile.Config`, but we weren't updating the `Manifest`'s digest for the `ConfigFile`. This meant that things keying off of the `Manifest`'s `ConfigFile` digest field to access things through `LayerByDigest` would end up being delegated to the base image's implementation. In my case, this was manifesting as us asking GCR for a non-existent blob (`remote.Image`). Related: google#87
mattmoor
force-pushed
the
fix-config-mutation
branch
from
a0990f3
to
665ec5e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
We were changing the
ConfigFile.Config, but we weren't updating theManifest's digest for theConfigFile. This meant that things keying off of theManifest'sConfigFiledigest field to access things throughLayerByDigestwould end up being delegated to the base image's implementation. In my case, this was manifesting as us asking GCR for a non-existent blob (remote.Image).Related: #87