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

Update TUF status generation to use new TUF repository #26099

Merged
merged 4 commits into from
Feb 7, 2025
Merged

Update TUF status generation to use new TUF repository #26099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e351ea0
Update TUF status
lucasmrod Feb 5, 2025
e08e301
Fixes to the tool
lucasmrod Feb 6, 2025
58315f9
Fix to always use json parsing
lucasmrod Feb 6, 2025
a2b406d
Address PR comments
lucasmrod Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/fleetd-tuf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ jobs:
with:
go-version-file: 'go.mod'

- name: Update orbit/old-TUF.md
run: |
make fleetd-old-tuf

- name: Update orbit/TUF.md
run: |
make fleetd-tuf
Expand Down
12 changes: 10 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,9 +395,17 @@ changelog-chrome:
sh -c "cat new-CHANGELOG.md ee/fleetd-chrome/CHANGELOG.md > tmp-CHANGELOG.md && rm new-CHANGELOG.md && mv tmp-CHANGELOG.md ee/fleetd-chrome/CHANGELOG.md"
sh -c "git rm ee/fleetd-chrome/changes/*"

# Updates the documentation for the currently released versions of fleetd components in Fleet's TUF.
# Updates the documentation for the currently released versions of fleetd components in old Fleet's TUF (tuf.fleetctl.com).
fleetd-old-tuf:
sh -c 'echo "<!-- DO NOT EDIT. This document is automatically generated by running \`make fleetd-old-tuf\`. -->\n# tuf.fleetctl.com\n\nFollowing are the currently deployed versions of fleetd components on the \`stable\` and \`edge\` channel.\n" > orbit/old-TUF.md'
sh -c 'echo "## \`stable\`\n" >> orbit/old-TUF.md'
sh -c 'go run tools/tuf/status/tuf-status.go channel-version -s3-vendor amazon -url https://tuf.fleetctl.com -channel stable -format markdown >> orbit/old-TUF.md'
sh -c 'echo "\n## \`edge\`\n" >> orbit/old-TUF.md'
sh -c 'go run tools/tuf/status/tuf-status.go channel-version -s3-vendor amazon -url https://tuf.fleetctl.com -channel edge -format markdown >> orbit/old-TUF.md'

# Updates the documentation for the currently released versions of fleetd components in Fleet's TUF (updates.fleetdm.com).
fleetd-tuf:
sh -c 'echo "<!-- DO NOT EDIT. This document is automatically generated by running \`make fleetd-tuf\`. -->\n# tuf.fleetctl.com\n\nFollowing are the currently deployed versions of fleetd components on the \`stable\` and \`edge\` channel.\n" > orbit/TUF.md'
sh -c 'echo "<!-- DO NOT EDIT. This document is automatically generated by running \`make fleetd-tuf\`. -->\n# updates.fleetdm.com\n\nFollowing are the currently deployed versions of fleetd components on the \`stable\` and \`edge\` channel.\n" > orbit/TUF.md'
sh -c 'echo "## \`stable\`\n" >> orbit/TUF.md'
sh -c 'go run tools/tuf/status/tuf-status.go channel-version -channel stable -format markdown >> orbit/TUF.md'
sh -c 'echo "\n## \`edge\`\n" >> orbit/TUF.md'
Expand Down
2 changes: 1 addition & 1 deletion orbit/TUF.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- DO NOT EDIT. This document is automatically generated by running `make fleetd-tuf`. -->
# tuf.fleetctl.com
# updates.fleetdm.com

Following are the currently deployed versions of fleetd components on the `stable` and `edge` channel.

Expand Down
26 changes: 26 additions & 0 deletions orbit/old-TUF.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<!-- DO NOT EDIT. This document is automatically generated by running `make fleetd-old-tuf`. -->
# tuf.fleetctl.com

Following are the currently deployed versions of fleetd components on the `stable` and `edge` channel.

## `stable`

| Component\OS | macOS | Linux | Windows | Linux (arm64) |
|--------------|--------------|--------|---------|---------------|
| orbit | 1.38.1 | 1.38.1 | 1.38.1 | 1.38.1 |
| desktop | 1.38.1 | 1.38.1 | 1.38.1 | 1.38.1 |
| osqueryd | 5.15.0 | 5.15.0 | 5.15.0 | 5.15.0 |
| nudge | 1.1.10.81462 | - | - | - |
| swiftDialog | 2.1.0 | - | - | - |
| escrowBuddy | 1.0.0 | - | - | - |

## `edge`

| Component\OS | macOS | Linux | Windows | Linux (arm64) |
|--------------|--------|--------|---------|---------------|
| orbit | 1.38.1 | 1.38.1 | 1.38.1 | 1.38.1 |
| desktop | 1.38.1 | 1.38.1 | 1.38.1 | 1.38.1 |
| osqueryd | 5.15.0 | 5.15.0 | 5.15.0 | 5.15.0 |
| nudge | - | - | - | - |
| swiftDialog | - | - | - | - |
| escrowBuddy | - | - | - | - |
27 changes: 2 additions & 25 deletions tools/tuf/status/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,11 @@
# TUF status

The TUF status tool can be used to process information of a Fleet TUF repository hosted on AWS S3.
The default URL is Fleet's TUF: https://tuf.fleetctl.com.

# Fetch and filter targets

To get information of targets you can use the `key-filter` command.

E.g. to get all targets filtering by the `edge` channel:
```sh
go run tools/tuf/status/tuf-status.go key-filter -filter edge

Results filtered by "edge" and sorted by version, platform and key.

VERSION PLATFORM KEY LAST MODIFIED SIZE ETAG
edge linux targets/desktop/linux/edge/desktop.tar.gz 2024-01-09T20:51:49.000Z 16.3 MB "da05e73b8b351299f1d7063afb538529-2"
edge linux targets/orbit/linux/edge/orbit 2024-01-19T21:35:09.000Z 40.7 MB "a38ff2a2e47b73fe1456563126a8db6d-5"
edge linux targets/osqueryd/linux/edge/osqueryd 2024-01-03T22:19:35.000Z 86.5 MB "8d7e48d9e9883013bfc493d44b96b4e7-11"
edge macos targets/desktop/macos/edge/desktop.app.tar.gz 2024-01-09T20:52:04.000Z 31.9 MB "37e3048387d1f2724fb90417126f8444-4"
edge macos targets/orbit/macos/edge/orbit 2024-01-19T21:36:58.000Z 83.9 MB "7d9bc91b9ce6b5234195650c082d9b9b-11"
edge macos-app targets/osqueryd/macos-app/edge/osqueryd.app.tar.gz 2024-01-03T22:19:47.000Z 24.4 MB "653a3f86b2607798592de3c73a88b1f0-3"
edge windows targets/desktop/windows/edge/fleet-desktop.exe 2024-01-09T20:52:13.000Z 36.8 MB "a482a0e4f0b57e89e6846bd65b8d8ab1-5"
edge windows targets/orbit/windows/edge/orbit.exe 2024-01-19T21:38:37.000Z 40.7 MB "b90014b53abf013fc1bdaec39ab03683-5"
edge windows targets/osqueryd/windows/edge/osqueryd.exe 2024-01-03T22:19:52.000Z 24.8 MB "2887ba627688255d9ec009fbe7b02fbf-3"
```
The TUF status tool can be used to process information of a Fleet TUF repository hosted on AWS S3 or Cloudflare R2.
The default URL is Fleet's TUF: https://updates.fleetctl.com.

# Get the version numbers of a channel

To get the version numbers of components in a given channel you can use the `channel-version` command.

```sh
go run tools/tuf/status/tuf-status.go channel-version -channel stable
{
Expand Down
Loading
Loading