Merge pull request #38 from crazy-max/url-concat

improve URL joining to prevent malformed cache service URLs

Author: crazy-max

cache.go

@@ -545,7 +545,7 @@ func (c *Cache) doWithRetries(ctx context.Context, r *request) (*http.Response,
 }
 
 func (c *Cache) url(p string) string {
-	return c.URL + "_apis/artifactcache/" + p
+	return strings.TrimRight(c.URL, "/") + "/_apis/artifactcache/" + p
 }
 
 func (c *Cache) AllKeys(ctx context.Context, api *RestAPI, prefix string) (map[string]struct{}, error) {

cache_v2.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"encoding/json"
 	"io"
+	"strings"
 	"time"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
@@ -204,5 +205,5 @@ func (c *Cache) newRequestV2(url string, body func() io.Reader) *request {
 }
 
 func (c *Cache) urlV2(p string) string {
-	return c.URL + "twirp/github.actions.results.api.v1.CacheService/" + p
+	return strings.TrimRight(c.URL, "/") + "/twirp/github.actions.results.api.v1.CacheService/" + p
 }