Also include the generated code in the upload request

Author: kyleconroy

internal/bundler/multipart.go

@@ -10,7 +10,7 @@ import (
 	"github.com/kyleconroy/sqlc/internal/sql/sqlpath"
 )
 
-func writeContents(w *multipart.Writer, file string, conf *config.Config) error {
+func writeInputs(w *multipart.Writer, file string, conf *config.Config) error {
 	refs := map[string]struct{}{}
 	refs[filepath.Base(file)] = struct{}{}
 
@@ -50,7 +50,7 @@ func addPart(w *multipart.Writer, file string) error {
 		return err
 	}
 	defer h.Close()
-	part, err := w.CreateFormFile("contents", file)
+	part, err := w.CreateFormFile("inputs", file)
 	if err != nil {
 		return err
 	}
@@ -60,3 +60,20 @@ func addPart(w *multipart.Writer, file string) error {
 	}
 	return nil
 }
+
+func writeOutputs(w *multipart.Writer, dir string, output map[string]string) error {
+	for filename, contents := range output {
+		rel, err := filepath.Rel(dir, filename)
+		if err != nil {
+			return err
+		}
+		part, err := w.CreateFormFile("outputs", rel)
+		if err != nil {
+			return err
+		}
+		if _, err := io.WriteString(part, contents); err != nil {
+			return err
+		}
+	}
+	return nil
+}

internal/bundler/upload.go

@@ -2,7 +2,6 @@ package bundler
 
 import (
 	"bytes"
-	"compress/gzip"
 	"context"
 	"fmt"
 	"mime/multipart"
@@ -14,37 +13,44 @@ import (
 type Uploader struct {
 	configPath string
 	config     *config.Config
+	dir        string
 }
 
-func NewUploader(configPath string, conf *config.Config) *Uploader {
+func NewUploader(configPath, dir string, conf *config.Config) *Uploader {
 	return &Uploader{
 		configPath: configPath,
 		config:     conf,
+		dir:        dir,
 	}
 }
 
-func (up *Uploader) Upload(ctx context.Context) error {
+func (up *Uploader) Upload(ctx context.Context, result map[string]string) error {
 	body := bytes.NewBuffer([]byte{})
 
-	gw := gzip.NewWriter(body)
-	defer gw.Close()
-	w := multipart.NewWriter(gw)
+	// gw := gzip.NewWriter(body)
+	// defer gw.Close()
+	w := multipart.NewWriter(body)
 	defer w.Close()
 
-	if err := writeContents(w, up.configPath, up.config); err != nil {
+	if err := writeInputs(w, up.configPath, up.config); err != nil {
 		return err
 	}
-
-	if err := gw.Flush(); err != nil {
+	if err := writeOutputs(w, up.dir, result); err != nil {
 		return err
 	}
+
+	// if err := gw.Flush(); err != nil {
+	// 	return err
+	// }
 	w.Close()
-	gw.Close()
+	// gw.Close()
 
-	req, err := http.NewRequest("POST", "http://localhost:8000/upload", body)
+	req, err := http.NewRequest("POST", "http://localhost:8090/upload", body)
 	if err != nil {
 		return err
 	}
+
+	// Set sqlc-version header
 	req.Header.Set("Content-Type", w.FormDataContentType())
 	req = req.WithContext(ctx)
 

internal/cmd/package.go

@@ -26,13 +26,17 @@ var packageCmd = &cobra.Command{
 }
 
 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, conf)
+	up := bundler.NewUploader(configPath, dir, conf)
 	if err != nil {
 		return err
 	}
-	return up.Upload(ctx)
+	return up.Upload(ctx, output)
 }