REALMC-9363 - Removed client-side transpilation.

Author: gagik

internal/cloud/realm/client.go

@@ -30,6 +30,7 @@ type Client interface {
 	ImportDependencies(groupID, appID, uploadPath string) error
 	Diff(groupID, appID string, appData interface{}) ([]string, error)
 	DiffDependencies(groupID, appID, uploadPath string) (DependenciesDiff, error)
+	GetDependenciesStatus(groupID, appID string) (DependenciesStatus, error)
 
 	CreateApp(groupID, name string, meta AppMeta) (App, error)
 	DeleteApp(groupID, appID string) error

internal/cloud/realm/dependencies.go

@@ -10,6 +10,7 @@ import (
 	"mime/multipart"
 	"net/http"
 	"os"
+	"time"
 
 	"github.com/10gen/realm-cli/internal/utils/api"
 )
@@ -18,10 +19,42 @@ const (
 	dependenciesPathPattern        = appPathPattern + "/dependencies"
 	dependenciesArchivePathPattern = dependenciesPathPattern + "/archive"
 	dependenciesDiffPathPattern    = dependenciesPathPattern + "/diff"
+	dependenciesStatusPathPattern  = dependenciesPathPattern + "/status"
 
 	paramFile = "file"
 )
 
+// AppDependenciesInfo is used to get information from a dependencies status request
+type AppDependenciesInfo struct {
+	Status DependenciesStatus `json:"status"`
+}
+
+// represents possible dependency statuses
+type DependenciesStatus string
+
+// set of known dependencies statuses
+const (
+	DependenciesStatusCreated    DependenciesStatus = "created"
+	DependenciesStatusSuccessful DependenciesStatus = "successful"
+	DependenciesStatusFailed     DependenciesStatus = "failed"
+)
+
+func (c *client) GetDependenciesStatus(groupID, appID string) (DependenciesStatus, error) {
+	res, err := c.do(
+		http.MethodGet,
+		fmt.Sprintf(dependenciesStatusPathPattern, groupID, appID),
+		api.RequestOptions{},
+	)
+	if err != nil {
+		return "", err
+	}
+	var transpilation AppDependenciesInfo
+	if err := json.NewDecoder(res.Body).Decode(&transpilation); err != nil {
+		return "", err
+	}
+	return transpilation.Status, nil
+}
+
 func (c *client) ImportDependencies(groupID, appID, uploadPath string) error {
 	file, fileErr := os.Open(uploadPath)
 	if fileErr != nil {
@@ -37,9 +70,9 @@ func (c *client) ImportDependencies(groupID, appID, uploadPath string) error {
 	body := &bytes.Buffer{}
 	w := multipart.NewWriter(body)
 
-	form, formErr := w.CreateFormFile(paramFile, fileInfo.Name())
-	if formErr != nil {
-		return formErr
+	form, err := w.CreateFormFile(paramFile, fileInfo.Name())
+	if err != nil {
+		return err
 	}
 
 	if _, err := io.Copy(form, file); err != nil {
@@ -49,20 +82,43 @@ func (c *client) ImportDependencies(groupID, appID, uploadPath string) error {
 		return err
 	}
 
-	res, resErr := c.do(
-		http.MethodPost,
+	res, err := c.do(
+		http.MethodPut,
 		fmt.Sprintf(dependenciesPathPattern, groupID, appID),
 		api.RequestOptions{
 			Body:        body,
 			ContentType: w.FormDataContentType(),
 		},
 	)
-	if resErr != nil {
-		return resErr
+	if err != nil {
+		return err
 	}
 	if res.StatusCode != http.StatusNoContent {
-		return api.ErrUnexpectedStatusCode{"import dependencies", res.StatusCode}
+		return fmt.Errorf("import got invalid status code %d", res.StatusCode)
+	}
+
+	waitForTranspilation := func() error {
+		status, err := c.GetDependenciesStatus(groupID, appID)
+		if err != nil {
+			return err
+		}
+		for status == DependenciesStatusCreated {
+			time.Sleep(time.Second)
+			status, err = c.GetDependenciesStatus(groupID, appID)
+			if err != nil {
+				return err
+			}
+			if status == DependenciesStatusFailed {
+				return fmt.Errorf("failed to transpile dependencies")
+			}
+		}
+		return nil
+	}
+
+	if err := waitForTranspilation(); err != nil {
+		return err
 	}
+
 	return nil
 }
 

internal/cloud/realm/dependencies_test.go

@@ -28,8 +28,15 @@ func TestRealmDependencies(t *testing.T) {
 		assert.Nil(t, err)
 
 		uploadPath := filepath.Join(wd, "testdata/dependencies_upload.zip")
+
+		_, err = client.GetDependenciesStatus(groupID, app.ID)
+		assert.NotNilf(t, err, "dependency status must return error before import")
 		assert.Nil(t, client.ImportDependencies(groupID, app.ID, uploadPath))
 
+		status, err := client.GetDependenciesStatus(groupID, app.ID)
+		assert.Equalf(t, status, realm.DependenciesStatusSuccessful, "must wait until dependency status is successful during import")
+		assert.Nil(t, err)
+
 		t.Run("and wait for those dependencies to be deployed to the app", func(t *testing.T) {
 			deployments, err := client.Deployments(groupID, app.ID)
 			assert.Nil(t, err)
@@ -78,7 +85,8 @@ func TestRealmDependencies(t *testing.T) {
 			assert.Nil(t, expectedDepsErr)
 			defer expectedDeps.Close()
 
-			assert.Equalf(t, parseZipArchive(t, expectedDeps), parseZipArchive(t, actualDeps), "expected archives to match")
+			// make sure same files are present; contents may be different because of transpilation
+			assert.Equal(t, getZipFileNames(t, expectedDeps), getZipFileNames(t, actualDeps))
 		})
 	})
 
@@ -97,7 +105,7 @@ func TestRealmDependencies(t *testing.T) {
 	})
 }
 
-func parseZipArchive(t *testing.T, file *os.File) map[string]string {
+func getZipFileNames(t *testing.T, file *os.File) map[string]bool {
 	t.Helper()
 
 	fileInfo, err := file.Stat()
@@ -106,5 +114,13 @@ func parseZipArchive(t *testing.T, file *os.File) map[string]string {
 	zipPkg, err := zip.NewReader(file, fileInfo.Size())
 	assert.Nil(t, err)
 
-	return parseZipPkg(t, zipPkg)
+	fileNames := make(map[string]bool, len(zipPkg.File))
+
+	for _, file := range zipPkg.File {
+		if file.FileInfo().IsDir() {
+			continue
+		}
+		fileNames[file.Name] = true
+	}
+	return fileNames
 }

internal/local/dependencies.go

@@ -2,7 +2,6 @@ package local
 
 import (
 	"archive/zip"
-	"context"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -11,7 +10,6 @@ import (
 	"time"
 
 	"github.com/10gen/realm-cli/internal/terminal"
-
 	"github.com/briandowns/spinner"
 )
 
@@ -50,7 +48,7 @@ func FindAppDependencies(path string) (Dependencies, error) {
 }
 
 // PrepareUpload prepares a dependencies upload package by creating a .zip file
-// containing the specified archive's transpiled file contents in a tempmorary directory
+// containing the specified archive's file contents in a temporary directory
 // and returns that file path
 func (d Dependencies) PrepareUpload() (string, error) {
 	file, err := os.Open(d.ArchivePath)
@@ -64,11 +62,6 @@ func (d Dependencies) PrepareUpload() (string, error) {
 		return "", err
 	}
 
-	transpiler, err := newDefaultTranspiler()
-	if err != nil {
-		return "", err
-	}
-
 	dir, err := ioutil.TempDir("", "") // uses os.TempDir and guarantees existence and proper permissions
 	if err != nil {
 		return "", err
@@ -129,16 +122,8 @@ func (d Dependencies) PrepareUpload() (string, error) {
 		}
 	}
 
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	transpiledSources, err := transpiler.Transpile(ctx, jsSources...)
-	if err != nil {
-		return "", err
-	}
-
-	for i, transpiledSource := range transpiledSources {
-		if err := writeFile(jsPaths[i], []byte(transpiledSource)); err != nil {
+	for i, jsSource := range jsSources {
+		if err := writeFile(jsPaths[i], []byte(jsSource)); err != nil {
 			return "", err
 		}
 	}