add getDistributions api

api/v1/distributions_test.go

@@ -1,8 +1,23 @@
-package packagecloud
+package packagecloud_test
 
-import "testing"
+import (
+	"context"
+	"os"
+	"testing"
+
+	packagecloud "github.com/atotto/packagecloud/api/v1"
+	"github.com/atotto/packagecloud/api/v1/packagecloudtest"
+)
 
 func TestDistro(t *testing.T) {
+	ctx := context.Background()
+	ctx = packagecloudtest.SetupToken(t, ctx, os.Getenv("PACKAGECLOUD_TOKEN"))
+
+	distributions, err := packagecloud.GetDistributions(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+
 	id, ok := distributions.DebianDistroVersionID("debian", "stretch")
 	if !ok {
 		t.Fatal("not found")

api/v1/package.go

@@ -22,20 +22,24 @@ import (
 func PushPackage(ctx context.Context, repos, distro, version string, fpath string) error {
 	var distroVersionID string
 	var ok bool
+
+	ds, err := GetDistributions(ctx)
+	if err != nil {
+		return err
+	}
 	switch filepath.Ext(fpath) {
 	case ".deb":
-		distroVersionID, ok = distributions.DebianDistroVersionID(distro, version)
+		distroVersionID, ok = ds.DebianDistroVersionID(distro, version)
 	case ".whl":
 		distro = "python"
 		version = ""
-		distroVersionID, ok = distributions.PythonDistroVersionID(distro, version)
+		distroVersionID, ok = ds.PythonDistroVersionID(distro, version)
 	}
 	if !ok {
 		return status.Errorf(codes.InvalidArgument, "unknown distribution: %s/%s", distro, version)
 	}
 
 	var r io.ReadCloser
-	var err error
 	if strings.HasPrefix(fpath, "http://") || strings.HasPrefix(fpath, "https://") {
 		resp, err := http.Get(fpath)
 		if err != nil {

api/v1/packagecloudtest/context.go

@@ -0,0 +1,15 @@
+package packagecloudtest
+
+import (
+	"context"
+	"testing"
+
+	packagecloud "github.com/atotto/packagecloud/api/v1"
+)
+
+func SetupToken(tb testing.TB, ctx context.Context, token string) context.Context {
+	if token == "" {
+		tb.Fatalf("empty token")
+	}
+	return packagecloud.WithPackagecloudToken(ctx, token)
+}

command.go

@@ -232,23 +232,28 @@ var helpDistroCommand = &commandBase{
 	nil,
 	func(ctx context.Context, f *flag.FlagSet, args ...interface{}) subcommands.ExitStatus {
 		var v interface{}
+		distributions, err := packagecloud.GetDistributions(ctx)
+		if err != nil {
+			log.Println(err)
+			return subcommands.ExitUsageError
+		}
 		switch typ := f.Arg(0); typ {
 		case "deb", "debian":
 			if name := f.Arg(1); name != "" {
-				for _, distros := range packagecloud.GetDistributions().Deb {
+				for _, distros := range distributions.Deb {
 					if distros.IndexName == name {
 						v = distros.Versions
 						break
 					}
 				}
 			} else {
-				v = packagecloud.GetDistributions().Deb
+				v = distributions.Deb
 			}
 
 		case "py", "python":
-			v = packagecloud.GetDistributions().Py
+			v = distributions.Py
 		case "":
-			v = packagecloud.GetDistributions()
+			v = distributions
 		default:
 			log.Printf("not supported type:%s", typ)
 			return subcommands.ExitUsageError

go.mod

@@ -7,3 +7,5 @@ require (
 	github.com/mattn/go-zglob v0.0.3
 	google.golang.org/grpc v1.24.0
 )
+
+replace github.com/atotto/packagecloud => ./