Add project.id to configuration

Author: kyleconroy

internal/bundler/metadata.go

@@ -13,7 +13,7 @@ func projectMetadata() ([][2]string, error) {
 		{"sqlc_version", info.Version},
 		{"go_version", runtime.Version()},
 		{"goos", runtime.GOOS},
-		{"goach", runtime.GOARCH},
+		{"goarch", runtime.GOARCH},
 		{"created", now.Format(time.RFC3339)},
 	}, nil
 }

internal/bundler/multipart.go

@@ -36,6 +36,7 @@ func writeInputs(w *multipart.Writer, file string, conf *config.Config) error {
 	if err != nil {
 		return err
 	}
+	params = append(params, [2]string{"project_id", conf.Project.ID})
 	for _, val := range params {
 		if err = w.WriteField(val[0], val[1]); err != nil {
 			return err

internal/bundler/upload.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"mime/multipart"
 	"net/http"
+	"os"
 
 	"github.com/kyleconroy/sqlc/internal/config"
 )
@@ -24,11 +25,19 @@ func NewUploader(configPath, dir string, conf *config.Config) *Uploader {
 	}
 }
 
+func (up *Uploader) Validate() error {
+	if up.config.Project.ID == "" {
+		return fmt.Errorf("project ID is not set")
+	}
+	return nil
+}
+
 func (up *Uploader) Upload(ctx context.Context, result map[string]string) error {
+	if err := up.Validate(); err != nil {
+		return err
+	}
 	body := bytes.NewBuffer([]byte{})
 
-	// gw := gzip.NewWriter(body)
-	// defer gw.Close()
 	w := multipart.NewWriter(body)
 	defer w.Close()
 
@@ -39,11 +48,7 @@ func (up *Uploader) Upload(ctx context.Context, result map[string]string) error
 		return err
 	}
 
-	// if err := gw.Flush(); err != nil {
-	// 	return err
-	// }
 	w.Close()
-	// gw.Close()
 
 	req, err := http.NewRequest("POST", "http://localhost:8090/upload", body)
 	if err != nil {
@@ -52,14 +57,15 @@ func (up *Uploader) Upload(ctx context.Context, result map[string]string) error
 
 	// Set sqlc-version header
 	req.Header.Set("Content-Type", w.FormDataContentType())
+	req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", os.Getenv("SQLC_AUTH_TOKEN")))
 	req = req.WithContext(ctx)
 
 	client := &http.Client{}
 	resp, err := client.Do(req)
 	if err != nil {
 		return err
 	}
-	if resp.StatusCode != http.StatusOK {
+	if resp.StatusCode >= 400 {
 		return fmt.Errorf("code=%d", resp.StatusCode)
 	}
 	return nil

internal/cmd/package.go

@@ -18,25 +18,25 @@ var packageCmd = &cobra.Command{
 		stderr := cmd.ErrOrStderr()
 		dir, name := getConfigPath(stderr, cmd.Flag("file"))
 		if err := createPkg(cmd.Context(), ParseEnv(cmd), dir, name, stderr); err != nil {
-			fmt.Fprintf(stderr, "error uploading project: %s\n", err)
+			fmt.Fprintf(stderr, "error uploading: %s\n", err)
 			os.Exit(1)
 		}
 		return nil
 	},
 }
 
 func createPkg(ctx context.Context, e Env, dir, filename string, stderr io.Writer) error {
-	output, err := Generate(ctx, e, dir, filename, stderr)
-	if err != nil {
-		os.Exit(1)
-	}
 	configPath, conf, err := readConfig(stderr, dir, filename)
 	if err != nil {
 		return err
 	}
 	up := bundler.NewUploader(configPath, dir, conf)
-	if err != nil {
+	if err := up.Validate(); err != nil {
 		return err
 	}
+	output, err := Generate(ctx, e, dir, filename, stderr)
+	if err != nil {
+		os.Exit(1)
+	}
 	return up.Upload(ctx, output)
 }

internal/config/config.go

@@ -78,9 +78,14 @@ const (
 )
 
 type Config struct {
-	Version string `json:"version" yaml:"version"`
-	SQL     []SQL  `json:"sql" yaml:"sql"`
-	Gen     Gen    `json:"overrides,omitempty" yaml:"overrides"`
+	Version string  `json:"version" yaml:"version"`
+	Project Project `json:"project" yaml:"project"`
+	SQL     []SQL   `json:"sql" yaml:"sql"`
+	Gen     Gen     `json:"overrides,omitempty" yaml:"overrides"`
+}
+
+type Project struct {
+	ID string `json:"id" yaml:"id"`
 }
 
 type Gen struct {

internal/config/v_one.go

@@ -10,6 +10,7 @@ import (
 
 type V1GenerateSettings struct {
 	Version   string              `json:"version" yaml:"version"`
+	Project   Project             `json:"project" yaml:"project"`
 	Packages  []v1PackageSettings `json:"packages" yaml:"packages"`
 	Overrides []Override          `json:"overrides,omitempty" yaml:"overrides,omitempty"`
 	Rename    map[string]string   `json:"rename,omitempty" yaml:"rename,omitempty"`
@@ -105,6 +106,7 @@ func (c *V1GenerateSettings) ValidateGlobalOverrides() error {
 func (c *V1GenerateSettings) Translate() Config {
 	conf := Config{
 		Version: c.Version,
+		Project: c.Project,
 	}
 
 	for _, pkg := range c.Packages {