This repository has been archived by the owner on Feb 24, 2020. It is now read-only.
trust: fix regression on --root #1494
Merged
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
alban
force-pushed
the
alban/trust-root
branch
from
f0c19cf
to
8420962
Compare
| t.Fatalf("Expected but didn't find %q in %v", expected, err) | ||
| } | ||
|
|
||
| child.SendLine("yes") |
There was a problem hiding this comment.
or put it inside the if, also, we need to print the error
alban
force-pushed
the
alban/trust-root
branch
from
8420962
to
b30229e
Compare
| t.Logf("Trust the key with the correct prefix\n") | ||
| runRktTrust(t, ctx, "coreos.com/rkt-inspect") | ||
|
|
||
| t.Logf("Finally, run successfull the signed image\n") |
|
@iaguis : thanks for the review. Branch updated. |
| t.Logf("Trust the key even more\n") | ||
| runRktTrust(t, ctx, "foo.com") | ||
| runRktTrust(t, ctx, "example.com/my-app") | ||
| runRktTrust(t, ctx, "") // --root |
There was a problem hiding this comment.
should we also test only trusting the key with --root and make sure it works?
There was a problem hiding this comment.
Ok, I added a test for --root on imageFile2.
alban
force-pushed
the
alban/trust-root
branch
2 times, most recently
from
c44589a
to
36b62d9
Compare
|
@iaguis updated again. |
alban
force-pushed
the
alban/trust-root
branch
from
36b62d9
to
2154fc4
Compare
| func TestTrust(t *testing.T) { | ||
| imageFile := patchTestACI("rkt-inspect-trust1.aci", "--exec=/inspect --print-msg=Hello", "--name=rkt-prefix.com/my-app") | ||
| defer os.Remove(imageFile) | ||
| defer os.Remove(imageFile + ".asc") |
There was a problem hiding this comment.
It probably doesn't matter but the signature file is not created until you call runSignImage so this should appear after that.
|
A couple of nits but LGTM |
alban
force-pushed
the
alban/trust-root
branch
from
2154fc4
to
f807bea
Compare
|
Updated |
|
Merge on green 👍 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #1491
Also, add a functional test for
rkt trust.