From 72b4ab10c28e40441dca09ba9f523251c3611672 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Tue, 11 Feb 2025 12:51:46 -0800 Subject: [PATCH] allow passing github cache v2 urls from env Signed-off-by: Tonis Tiigi --- util/buildflags/cache.go | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/util/buildflags/cache.go b/util/buildflags/cache.go index 9cd5afb03d91..b144e2d76481 100644 --- a/util/buildflags/cache.go +++ b/util/buildflags/cache.go @@ -5,6 +5,7 @@ import ( "encoding/json" "maps" "os" + "strconv" "strings" awsconfig "github.com/aws/aws-sdk-go-v2/config" @@ -204,14 +205,29 @@ func addGithubToken(ci *controllerapi.CacheOptionsEntry) { if ci.Type != "gha" { return } + version, ok := ci.Attrs["version"] + if !ok { + if v, ok := os.LookupEnv("ACTIONS_CACHE_SERVICE_V2"); ok { + if b, err := strconv.ParseBool(v); err == nil && b { + version = "2" + ci.Attrs["version"] = version + } + } + } if _, ok := ci.Attrs["token"]; !ok { if v, ok := os.LookupEnv("ACTIONS_RUNTIME_TOKEN"); ok { ci.Attrs["token"] = v } } if _, ok := ci.Attrs["url"]; !ok { - if v, ok := os.LookupEnv("ACTIONS_CACHE_URL"); ok { - ci.Attrs["url"] = v + if version == "2" { + if v, ok := os.LookupEnv("ACTIONS_RESULTS_URL"); ok { + ci.Attrs["url"] = v + } + } else { + if v, ok := os.LookupEnv("ACTIONS_CACHE_URL"); ok { + ci.Attrs["url"] = v + } } } }