v0.0.1: local dev trust store bootstrap

Author: benburkert

api/api.go

@@ -4,11 +4,14 @@ package api
 
 import (
 	"errors"
+	"fmt"
+	"mime"
 	"net/http"
 	"net/url"
 
 	"github.com/anchordotdev/cli"
 	"github.com/anchordotdev/cli/keyring"
+	"golang.org/x/exp/slices"
 )
 
 var (
@@ -19,18 +22,25 @@ var (
 func Client(cfg *cli.Config) (*http.Client, error) {
 	client := &http.Client{
 		Transport: urlRewriter{
-			RoundTripper: new(http.Transport),
-			URL:          cfg.API.URL,
+			RoundTripper: responseChecker{
+				RoundTripper: new(http.Transport),
+			},
+			URL: cfg.API.URL,
 		},
 	}
 
 	apiToken := cfg.API.Token
 	if apiToken == "" {
-		var err error
-		if apiToken, err = keyring.Get(cfg, keyring.APIToken); err == keyring.ErrNotFound {
+		var (
+			kr = keyring.Keyring{Config: cfg}
+
+			err error
+		)
+
+		if apiToken, err = kr.Get(keyring.APIToken); err == keyring.ErrNotFound {
 			return client, ErrSignedOut
 		} else if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("reading API token from keyring failed: %w", err)
 		}
 	}
 
@@ -56,6 +66,30 @@ func (r basicAuther) RoundTrip(req *http.Request) (*http.Response, error) {
 	return r.RoundTripper.RoundTrip(req)
 }
 
+type responseChecker struct {
+	http.RoundTripper
+}
+
+var jsonMediaTypes = mediaTypes{
+	"application/json",
+	"application/problem+json",
+}
+
+func (r responseChecker) RoundTrip(req *http.Request) (*http.Response, error) {
+	res, err := r.RoundTripper.RoundTrip(req)
+	if err != nil {
+		return nil, fmt.Errorf("request error %s %s: %w", req.Method, req.URL.Path, err)
+	}
+
+	if res.StatusCode == 500 {
+		return nil, fmt.Errorf("request failed: %w", err)
+	}
+	if contentType := res.Header.Get("Content-Type"); !jsonMediaTypes.Matches(contentType) {
+		return nil, fmt.Errorf("non-json response received: %q: %w", contentType, err)
+	}
+	return res, nil
+}
+
 type urlRewriter struct {
 	http.RoundTripper
 
@@ -67,10 +101,17 @@ func (r urlRewriter) RoundTrip(req *http.Request) (*http.Response, error) {
 	if err != nil {
 		return nil, err
 	}
-	if u, err = u.Parse(req.URL.Path); err != nil {
-		return nil, err
-	}
-	req.URL = u
+	req.URL = u.JoinPath(req.URL.Path)
 
 	return r.RoundTripper.RoundTrip(req)
 }
+
+type mediaTypes []string
+
+func (s mediaTypes) Matches(val string) bool {
+	media, _, err := mime.ParseMediaType(val)
+	if err != nil {
+		return false
+	}
+	return slices.Contains(s, media)
+}

api/apitest/apitest.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"flag"
 	"path/filepath"
+	"strings"
 
 	"io"
 	"log"
@@ -32,6 +33,7 @@ var (
 )
 
 type Server struct {
+	Host    string
 	RootDir string
 
 	URL string
@@ -48,6 +50,26 @@ func (s *Server) Close() {
 	s.waitfn()
 }
 
+func (s *Server) IsProxy() bool {
+	return *proxy
+}
+
+func (s *Server) GeneratePAT(email string) (string, error) {
+	if !s.IsProxy() {
+		return "test-token", nil
+	}
+
+	cmd := exec.Command("script/clitest-gen-pat", email)
+	cmd.Dir = s.RootDir
+
+	out, err := cmd.Output()
+	if err != nil {
+		return "", err
+	}
+
+	return strings.TrimSpace(string(out)), nil
+}
+
 func (s *Server) Start(ctx context.Context) error {
 	if *proxy {
 		return s.StartProxy(ctx)
@@ -69,7 +91,17 @@ func (s *Server) StartMock(ctx context.Context) error {
 		return err
 	}
 
-	s.URL = "http://" + addr + "/"
+	host, port, err := net.SplitHostPort(addr)
+	if err != nil {
+		stopfn()
+		return err
+	}
+
+	if s.Host != "" {
+		host = s.Host
+	}
+
+	s.URL = "http://" + host + ":" + port + "/v0"
 	s.stopfn = stopfn
 	s.waitfn = func() { waitfn() }
 
@@ -92,7 +124,17 @@ func (s *Server) StartProxy(ctx context.Context) error {
 		return err
 	}
 
-	addr, waitPrism, err := s.startProxy(ctx, addrRails)
+	host, port, err := net.SplitHostPort(addrRails)
+	if err != nil {
+		stopfn()
+		return err
+	}
+
+	if s.Host != "" {
+		host = s.Host
+	}
+
+	addr, waitPrism, err := s.startProxy(ctx, host+":"+port)
 	if err != nil {
 		lock.Unlock()
 		stopfn()
@@ -115,7 +157,17 @@ func (s *Server) StartProxy(ctx context.Context) error {
 	group.Go(waitPrism)
 	group.Go(waitRails)
 
-	s.URL = "http://" + addr + "/"
+	host, port, err = net.SplitHostPort(addr)
+	if err != nil {
+		stopfn()
+		return err
+	}
+
+	if s.Host != "" {
+		host = s.Host
+	}
+
+	s.URL = "http://" + host + ":" + port + "/v0"
 	s.stopfn = stopfn
 	s.waitfn = func() {
 		defer lock.Unlock()
@@ -178,13 +230,13 @@ func (s *Server) startRails(ctx context.Context) (string, func() error, error) {
 		return "", nil, err
 	}
 
-	host, port, err := net.SplitHostPort(addr)
+	_, port, err := net.SplitHostPort(addr)
 	if err != nil {
 		return "", nil, err
 	}
 
 	args := []string{
-		"rails", "server", "--port", port, "--binding", host,
+		"script/clitest-server", "::", port,
 	}
 
 	wait, err := s.startCmd(ctx, args)

api/openapi.gen.go

@@ -8,14 +8,10 @@ import (
 	"github.com/anchordotdev/cli/api/apitest"
 )
 
-var (
-	srv = &apitest.Server{
-		RootDir: "../..",
-		// RootDir: "../..",
-	}
-
-	proxyMode = flag.Bool("proxy", false, "run prism in proxy mode")
-)
+var srv = &apitest.Server{
+	Host:    "api.anchor.lcl.host",
+	RootDir: "../..",
+}
 
 func TestMain(m *testing.M) {
 	flag.Parse()