tweak: use cache-busting URLs for downloads

beyondessential · Apr 3, 2024 · 91e3fe0 · 91e3fe0
1 parent b6563dd
commit 91e3fe0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -33,20 +33,20 @@ The above URLs are for the current release. If you want to always get the latest
 
 | Platform | Variant | Download |
 | -------- | ------- | -------- |
-| Windows | x86 | [bestool.exe](https://tools.ops.tamanu.io/bestool/latest/x86_64-pc-windows-msvc/bestool.exe) |
-| Linux | x86 | [bestool](https://tools.ops.tamanu.io/bestool/latest/x86_64-unknown-linux-gnu/bestool) |
-| Linux | x86 static | [bestool](https://tools.ops.tamanu.io/bestool/latest/x86_64-unknown-linux-musl/bestool) |
-| Linux | ARM64 | [bestool](https://tools.ops.tamanu.io/bestool/latest/aarch64-unknown-linux-musl/bestool) |
-| Mac | Intel | [bestool](https://tools.ops.tamanu.io/bestool/latest/x86_64-apple-darwin/bestool) |
-| Mac | ARM64 | [bestool](https://tools.ops.tamanu.io/bestool/latest/aarch64-apple-darwin/bestool) |
+| Windows | x86 | [bestool.exe](https://tools.ops.tamanu.io/bestool/latest/x86_64-pc-windows-msvc/bestool.exe?latest) |
+| Linux | x86 | [bestool](https://tools.ops.tamanu.io/bestool/latest/x86_64-unknown-linux-gnu/bestool?latest) |
+| Linux | x86 static | [bestool](https://tools.ops.tamanu.io/bestool/latest/x86_64-unknown-linux-musl/bestool?latest) |
+| Linux | ARM64 | [bestool](https://tools.ops.tamanu.io/bestool/latest/aarch64-unknown-linux-musl/bestool?latest) |
+| Mac | Intel | [bestool](https://tools.ops.tamanu.io/bestool/latest/x86_64-apple-darwin/bestool?latest) |
+| Mac | ARM64 | [bestool](https://tools.ops.tamanu.io/bestool/latest/aarch64-apple-darwin/bestool?latest) |
 
 ### In GitHub Actions
 
 ```yaml
 - name: Download bestool
   shell: bash
   run: |
-    curl -Lo ${{ runner.os == 'Windows' && 'bestool.exe' || 'bestool' }} https://tools.ops.tamanu.io/bestool/gha/${{ runner.os }}-${{ runner.arch }}
+    curl -Lo ${{ runner.os == 'Windows' && 'bestool.exe' || 'bestool' }} https://tools.ops.tamanu.io/bestool/gha/${{ runner.os }}-${{ runner.arch }}?bust=${{ github.run_id }}
     [[ -f bestool ]] && chmod +x bestool
 
 - name: Use bestool
@@ -65,7 +65,7 @@ Or combined:
   run: |
     bestool=bestool
     [[ ${{ runner.os }} == "Windows" ]] && bestool=bestool.exe
-    curl -Lo $bestool https://tools.ops.tamanu.io/bestool/gha/${{ runner.os }}-${{ runner.arch }}
+    curl -Lo $bestool https://tools.ops.tamanu.io/bestool/gha/${{ runner.os }}-${{ runner.arch }}?bust=${{ github.run_id }}
     [[ -f bestool ]] && chmod +x bestool
     ./$bestool --version # or something more useful
 ```

diff --git a/src/actions/caddy/download.rs b/src/actions/caddy/download.rs
@@ -64,12 +64,13 @@ pub async fn run(ctx: Context<CaddyArgs, DownloadArgs>) -> Result<()> {
 	let mut url = None;
 	for target in detected_targets {
 		let try_url = Url::parse(&format!(
-			"https://tools.ops.tamanu.io/caddy/{version}/caddy-{target}{ext}",
+			"https://tools.ops.tamanu.io/caddy/{version}/caddy-{target}{ext}?bust={date}",
 			ext = if target.contains("windows") {
 				".exe"
 			} else {
 				""
 			},
+			date = chrono::Utc::now(),
 		))
 		.into_diagnostic()?;
 		debug!(url=%try_url, "trying URL");

diff --git a/src/actions/self_update.rs b/src/actions/self_update.rs
@@ -63,11 +63,12 @@ pub async fn run(ctx: Context<SelfUpdateArgs>) -> Result<()> {
 	let dest = dir.join(&filename);
 
 	let url = format!(
-		"https://tools.ops.tamanu.io/bestool/{version}/{target}/{filename}",
+		"https://tools.ops.tamanu.io/bestool/{version}/{target}/{filename}?bust={date}",
 		target = detected_targets
 			.first()
 			.cloned()
 			.unwrap_or_else(|| TARGET.into()),
+		date = chrono::Utc::now(),
 	);
 	info!(url = %url, "downloading");
 

diff --git a/src/actions/walg/download.rs b/src/actions/walg/download.rs
@@ -64,12 +64,13 @@ pub async fn run(ctx: Context<WalgArgs, DownloadArgs>) -> Result<()> {
 	let mut url = None;
 	for target in detected_targets {
 		let try_url = Url::parse(&format!(
-			"https://tools.ops.tamanu.io/wal-g/{version}/wal-g-{target}{ext}",
+			"https://tools.ops.tamanu.io/wal-g/{version}/wal-g-{target}{ext}?bust={date}",
 			ext = if target.contains("windows") {
 				".exe"
 			} else {
 				""
 			},
+			date = chrono::Utc::now(),
 		))
 		.into_diagnostic()?;
 		debug!(url=%try_url, "trying URL");