fix script for cargo-nextest- with release prefix

Author: olix0r

Dockerfile

@@ -123,8 +123,8 @@ RUN url="https://github.com/rhysd/actionlint/releases/download/${ACTIONLINT_VERS
 
 # checksec checks binaries for security issues.
 FROM apt-base as checksec
-ARG CHECKSEC_VERSION=3.0.2 # repo=slimm609/checksec.sh
-RUN url="https://raw.githubusercontent.com/slimm609/checksec.sh/${CHECKSEC_VERSION}/checksec" ; \
+ARG CHECKSEC_VERSION=2.7.1 # ignore
+RUN url="https://raw.githubusercontent.com/slimm609/checksec/${CHECKSEC_VERSION}/checksec" ; \
     scurl -o /usr/local/bin/checksec "$url" && chmod 755 /usr/local/bin/checksec
 
 # shellcheck lints shell scripts.
@@ -161,9 +161,9 @@ RUN url="https://github.com/google/protobuf/releases/download/$PROTOC_VERSION/pr
 
 # cargo-action-fmt formats `cargo build` JSON output to Github Actions annotations.
 FROM apt-base as cargo-action-fmt
-ARG CARGO_ACTION_FMT_VERSION=v2.0.1 # repo=olix0r/cargo-action-fmt
-RUN url="https://github.com/olix0r/cargo-action-fmt/releases/download/release%2Fv${CARGO_ACTION_FMT_VERSION}/cargo-action-fmt-x86_64-unknown-linux-gnu" ; \
-    scurl -o /usr/local/bin/cargo-action-fmt "$url" && chmod +x /usr/local/bin/cargo-action-fmt
+ARG CARGO_ACTION_FMT_VERSION=v1.0.4 # ignore
+RUN url="https://github.com/olix0r/cargo-action-fmt/releases/download/release%2F${CARGO_ACTION_FMT_VERSION}/cargo-action-fmt-${CARGO_ACTION_FMT_VERSION}-x86_64-unknown-linux-musl.tar.gz" ; \
+    scurl "$url" | tar zvxf - -C /usr/local/bin cargo-action-fmt
 
 # cargo-deny checks cargo dependencies for licensing and RUSTSEC security issues.
 FROM apt-base as cargo-deny
@@ -173,7 +173,7 @@ RUN url="https://github.com/EmbarkStudios/cargo-deny/releases/download/${CARGO_D
 
 # cargo-nextest is a nicer test runner.
 FROM apt-base as cargo-nextest
-ARG NEXTEST_VERSION=cargo-nextest-0.9.99 # repo=nextest-rs/nextest
+ARG NEXTEST_VERSION=0.9.99 # repo=nextest-rs/nextest,prefix=cargo-nextest-
 RUN url="https://github.com/nextest-rs/nextest/releases/download/cargo-nextest-${NEXTEST_VERSION}/cargo-nextest-${NEXTEST_VERSION}-x86_64-unknown-linux-gnu.tar.gz" ; \
     scurl "$url" | tar zvxf - -C /usr/local/bin cargo-nextest
 

justfile

@@ -75,6 +75,9 @@ sync-k3s-images:
 
 minimum-k8s := '20'
 
+update-versions:
+    go run ./update-versions.go --in-place
+
 # Inspect a k3s image by tag
 _k3s-inspect tag:
     skopeo inspect 'docker://{{ k3s-image }}:{{ tag }}'

repos/linkerd2-proxy

@@ -33,7 +33,6 @@ const (
 	httpTimeout  = 10 * time.Second
 	goDLIndexURL = "https://go.dev/dl/?mode=json"
 	userAgent    = "update-versions/1.0 (+https://github.com/linkerd/dev)"
-	commentRepo  = "repo="
 )
 
 var (
@@ -132,6 +131,47 @@ func latestRustMinorVersion(ctx context.Context) (string, error) {
 	return parts[0] + "." + parts[1], nil
 }
 
+// parseHints extracts repo and prefix hints from a comment suffix like "# repo=owner/repo,prefix=xyz-"
+func parseHints(suffix string) (repo, prefix string) {
+	s := strings.TrimSpace(strings.TrimPrefix(strings.TrimSpace(suffix), "#"))
+	for _, part := range strings.Split(s, ",") {
+		kv := strings.SplitN(strings.TrimSpace(part), "=", 2)
+		log.Printf("Parsing hint: %q -> %v", part, kv)
+		if len(kv) != 2 {
+			continue
+		}
+		switch kv[0] {
+		case "repo":
+			repo = kv[1]
+		case "prefix":
+			prefix = kv[1]
+		}
+	}
+	return
+}
+
+// latestGitHubTagWithPrefix lists releases and returns the first tag without the given prefix
+func latestGitHubTagWithPrefix(ctx context.Context, repo, prefix string) (string, error) {
+	// fetch up to 100 releases and skip prereleases
+	var releases []struct {
+		TagName   string `json:"tag_name"`
+		Prerelease bool   `json:"prerelease"`
+	}
+	url := fmt.Sprintf("https://api.github.com/repos/%s/releases?per_page=100", repo)
+	if err := httpGetJSON(ctx, url, githubToken, &releases); err != nil {
+		return "", err
+	}
+	for _, r := range releases {
+		if r.Prerelease {
+			continue
+		}
+		if strings.HasPrefix(r.TagName, prefix) {
+			return strings.TrimPrefix(r.TagName, prefix), nil
+		}
+	}
+	return "", fmt.Errorf("no release found for %q with prefix %q", repo, prefix)
+}
+
 // ----------------------------------------------------------------------------
 // ARG line updater
 // ----------------------------------------------------------------------------
@@ -142,38 +182,29 @@ func updateARG(ctx context.Context, line string) (newLine string, changed bool,
 		return line, false, nil
 	}
 
-	prefix, name, curVal, suffix := m[1], m[2], m[3], m[4]
-	repoHint := extractRepoHint(suffix)
+	prefixIndent, name, curVal, suffix := m[1], m[2], m[3], m[4]
+	repoHint, prefixHint := parseHints(suffix)
 
 	var newVal string
-	switch name {
-	case "GO_TAG":
+	switch {
+	case prefixHint != "" && repoHint != "":
+		newVal, err = latestGitHubTagWithPrefix(ctx, repoHint, prefixHint)
+	case name == "GO_TAG":
 		newVal, err = latestGoMinorVersion(ctx)
-	case "RUST_TAG":
+	case name == "RUST_TAG":
 		newVal, err = latestRustMinorVersion(ctx)
-	default:
-		if repoHint == "" {
-			return line, false, nil
-		}
+	case repoHint != "":
 		newVal, err = latestGitHubTag(ctx, repoHint)
+	default:
+		return line, false, nil
 	}
 	if err != nil {
 		return "", false, err
 	}
 	if newVal == curVal {
 		return line, false, nil
 	}
-	return fmt.Sprintf("%s%s=%s%s\n", prefix, name, newVal, suffix), true, nil
-}
-
-func extractRepoHint(comment string) string {
-	if idx := strings.Index(comment, "#"); idx >= 0 {
-		comment = comment[idx+1:]
-		if pos := strings.Index(comment, commentRepo); pos >= 0 {
-			return strings.Fields(comment[pos+len(commentRepo):])[0]
-		}
-	}
-	return ""
+	return fmt.Sprintf("%s%s=%s%s\n", prefixIndent, name, newVal, suffix), true, nil
 }
 
 // ----------------------------------------------------------------------------