[23.0 backport] use ad-hoc libtrust trustkey #44566
Merged
Conversation
Member
thaJeztah
commented
Dec 1, 2022
thaJeztah
commented
- This is a reduced set of Remove trustkey id migration and config.TrustKeyPath #44329 - this variant is keeping the trustkey migration code (so that existing installs keep the daemon ID), but replacing the code consuming the key (which is only used for CI) with using an ad-hoc key.
thaJeztah
changed the title
Member
Author
|
Interesting failure; looks unrelated, but haven't seen this before; |
thaJeztah
force-pushed
the
23.0_backport_remove_trustkey_id_migration
branch
from
1e5a57d to
7f64951
Compare
This is a subset of 1981706 on master, preserving the tests for migrating the key to engine-id. Signed-off-by: Sebastiaan van Stijn <[email protected]>
Turned out that the loadOrCreateTrustKey() utility was doing exactly the same as libtrust.LoadOrCreateTrustKey(), so making it a thin wrapped. I kept the tests to verify the behavior, but we could remove them as we only need this for our integration tests. The storage location for the generated key was changed (again as we only need this for some integration tests), so we can remove the TrustKeyPath from the config. Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 5cdd6ab) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit e854b2a) Signed-off-by: Sebastiaan van Stijn <[email protected]>
This is only used for tests, and the key is not verified anymore, so instead of creating a key and storing it, we can just use an ad-hoc one. Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 8feeaec) Signed-off-by: Sebastiaan van Stijn <[email protected]>
It's never set, so we can remove it. Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 85fddc0) Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
force-pushed
the
23.0_backport_remove_trustkey_id_migration
branch
from
7f64951 to
4952dc2
Compare
corhere
approved these changes
Dec 8, 2022
Member
Author
|
thx! let me get this one in |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.