Merge pull request #252 from cdnjs/sven/incoming-name

fix: consistently name incoming version
cdnjs · Apr 15, 2022 · 73062ae · 73062ae
2 parents 0302453 + ca1dac5
commit 73062ae
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/functions/check-pkg-updates/update.go b/functions/check-pkg-updates/update.go
@@ -2,8 +2,8 @@ package check_pkg_updates
 
 import (
 	"context"
+	"fmt"
 	"log"
-	"path"
 	"sort"
 	"strings"
 
@@ -98,7 +98,8 @@ func DoUpdate(ctx context.Context, pkg *packages.Package, versions []version.Ver
 
 	log.Printf("%s: new version detected: %s\n", *pkg.Name, v.Version)
 	tarball := version.DownloadTar(ctx, v)
-	if err := gcp.AddIncomingFile(path.Base(v.Tarball), tarball, pkg, v); err != nil {
+	filename := fmt.Sprintf("%s-%s", *pkg.Name, v.Version)
+	if err := gcp.AddIncomingFile(filename, tarball, pkg, v); err != nil {
 		return errors.Wrap(err, "could not store in GCS: %s")
 	}
 

diff --git a/functions/force-update/main.go b/functions/force-update/main.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"log"
 	"net/http"
-	"path"
 
 	"github.com/cdnjs/tools/audit"
 	"github.com/cdnjs/tools/gcp"
@@ -73,7 +72,8 @@ func Invoke(w http.ResponseWriter, r *http.Request) {
 				return
 			}
 			tarball := version.DownloadTar(ctx, *targetVersion)
-			if err := gcp.AddIncomingFile(path.Base(targetVersion.Tarball), tarball, pkg, *targetVersion); err != nil {
+			filename := fmt.Sprintf("%s-%s", *pkg.Name, targetVersion.Version)
+			if err := gcp.AddIncomingFile(filename, tarball, pkg, *targetVersion); err != nil {
 				log.Fatalf("could not store in GCS: %s", err)
 			}
 			if err := audit.NewVersionDetected(ctx, *pkg.Name, targetVersion.Version); err != nil {