Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove trustkey id migration and config.TrustKeyPath #44329

Merged
merged 5 commits into from
Dec 1, 2022
Merged

Remove trustkey id migration and config.TrustKeyPath #44329

merged 5 commits into from
Dec 1, 2022

Commits on Nov 28, 2022

  1. daemon: remove migrateTrustKeyID() 

    The migration code is in the 22.06 branch, and if we don't migrate
the only side-effect is the daemon's ID being regenerated (as a
UUID).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    1981706 View commit details
    Browse the repository at this point in the history

  2. daemon/config: remove TrustKeyPath, and local utilities 

    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 <github@gone.nl>
    @thaJeztah
    thaJeztah committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    5cdd6ab View commit details
    Browse the repository at this point in the history

  3. distribution: use ad-hoc trustkey for tests 

    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    e854b2a View commit details
    Browse the repository at this point in the history

  4. use ad-hoc libtrust key 

    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 <github@gone.nl>
    @thaJeztah
    thaJeztah committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    8feeaec View commit details
    Browse the repository at this point in the history

  5. distribution: remove unused RequireSchema2 

    It's never set, so we can remove it.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    85fddc0 View commit details
    Browse the repository at this point in the history