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.

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

Upgrade downloader after ceremony #9556

Merged
merged 9 commits into from
Jul 9, 2021
Merged

Upgrade downloader after ceremony #9556

merged 9 commits into from
Jul 9, 2021

Conversation

coignetp
Copy link
Contributor

@coignetp coignetp commented Jun 18, 2021

What does this PR do?

Upgrade tuf, in-toto and securesytemlib to the latest version support Python 2

https://github.com/theupdateframework/tuf/releases/tag/v0.17.0
https://github.com/in-toto/in-toto/blob/develop/CHANGELOG.md#v101
https://github.com/secure-systems-lab/securesystemslib/blob/master/CHANGELOG.md#securesystemslib-v0201

Motivation

Additional Notes

Hold on #9649 and #9648

Removed datadog-docker-daemon from the test since it's an agent 5 integration moved to the agent. The wheel is no longer maintained or signed and was removed from master.
Last signature was made by a revoked developer.

Review checklist (to be filled by reviewers)

  • Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
  • PR title must be written as a CHANGELOG entry (see why)
  • Files changes must correspond to the primary purpose of the PR as described in the title (small unrelated changes should have their own PR)
  • PR must have changelog/ and integration/ labels attached

@codecov
Copy link

codecov bot commented Jun 18, 2021

Codecov Report

Merging #9556 (6838b12) into master (30abc06) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Flag Coverage Δ
datadog_checks_downloader 80.64% <100.00%> (+0.24%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Copy link
Member

@trishankatdatadog trishankatdatadog left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but need to sign, bump version number, and release, no?

Copy link
Member

@trishankatdatadog trishankatdatadog left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update to latest TUF root metadata after v3 ceremony.

@coignetp coignetp force-pushed the paul/upgrade-tufintoto branch from 895327e to 799a221 Compare July 7, 2021 09:52
@coignetp coignetp changed the title Upgrade tuf in-toto dependencies Upgrade downloader after ceremony Jul 7, 2021
Comment on lines +27 to +29
EXCLUDED_INTEGRATIONS = [
"datadog-docker-daemon",
]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This integration was last released by a revoked key a few months ago. This integration was removed from integrations-core, so it shouldn't be installable on new agents with 3.core.root.layout

cc @trishankatdatadog

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, it's a bit brittle, isn't it, because how do you test new versions of this integration going forward? I recommend you get an approved key for 3.core.root.layout to release a new version instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This integration was removed from master (#5988), it is not released anymore. It's only shipped in agent 5 so it shouldn't be installed on agent 6 or 7

@trishankatdatadog
Copy link
Member

Hashes of new TUF roots match expected values:

> curl -fsSL https://dd-integrations-core-wheels-build-stable.datadoghq.com/metadata.staged/7.root.json | shasum -a 256
21a70e85ce8d5b5ee1283fab083e99577794d5b31add68c04b2fc8ed454d0a87  -

> curl -fsSL https://dd-integrations-core-wheels-build-stable.datadoghq.com/metadata.staged/8.root.json | shasum -a 256
ef1e2d74c5e68aabdb7edb54fb2405cd8723897f0156fd767cae2f30ccea3f14  -

@coignetp or @FlorianVeaux, please double-check if you like.

Copy link
Member

@trishankatdatadog trishankatdatadog left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost there, thanks!

Comment on lines +27 to +29
EXCLUDED_INTEGRATIONS = [
"datadog-docker-daemon",
]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, it's a bit brittle, isn't it, because how do you test new versions of this integration going forward? I recommend you get an approved key for 3.core.root.layout to release a new version instead.

@coignetp coignetp merged commit d2e6640 into master Jul 9, 2021
@coignetp coignetp deleted the paul/upgrade-tufintoto branch July 9, 2021 07:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants