REALMC-9363 - Removed client-side transpilation.

.evg.yml

@@ -7,15 +7,6 @@ functions:
           set -e
           wget --quiet ${go_url}
           tar xvf ./go1*gz
-  "fetch_yarn":
-    - command: shell.exec
-      params:
-        shell: "bash"
-        script: |
-          set -e
-          curl --silent -OL ${yarn_url}
-          tar zvxf latest.tar.gz
-          mv yarn-* yarn
   "fetch_baas_artifacts": &fetch_baas_artifacts
     - command: shell.exec
       params:
@@ -55,14 +46,6 @@ functions:
           [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
           nvm install ${node_version}
           nvm use ${node_version}
-  "setup_transpiler":
-      command: shell.exec
-      params:
-        shell: "bash"
-        script: |
-          set -e
-          mkdir -p realm-cli/etc/bin
-          cp baas_artifacts/transpiler realm-cli/etc/bin
   "setup_project":
     - command: git.get_project
       params:
@@ -159,10 +142,8 @@ tasks:
     exec_timeout_secs: 3600
     commands:
       - func: "fetch_go114"
-      - func: "fetch_yarn"
       - func: "fetch_baas_artifacts"
       - func: "setup_project"
-      - func: "setup_transpiler"
       - command: shell.exec
         params:
           shell: "bash"
@@ -190,7 +171,6 @@ tasks:
     exec_timeout_secs: 3600
     commands:
       - func: "fetch_go114"
-      - func: "fetch_yarn"
       - func: "fetch_baas_artifacts"
       - func: "setup_node"
       - func: "setup_project"
@@ -205,7 +185,6 @@ tasks:
             set -e
             export ROOT_DIR=`pwd`
             export PATH="$ROOT_DIR:$PATH"
-            export PATH=$PATH:$ROOT_DIR/realm-cli/etc/transpiler/bin/
             export GOROOT=$ROOT_DIR/go
             export PATH=$GOROOT/bin:$PATH
             export BAAS_NO_SKIP_TEST=1
@@ -264,9 +243,6 @@ tasks:
             export GOROOT=$ROOT_DIR/go
             export PATH=$GOROOT/bin:$PATH
 
-            mkdir -p realm-cli/etc/transpiler/bin
-            cp baas_artifacts/transpiler-* realm-cli/etc/transpiler/bin
-
             cd $ROOT_DIR/realm-cli
             export VERSION="${version}"
             export GOARCH=amd64
@@ -316,34 +292,6 @@ tasks:
           bucket: realm-clis
           content_type: application/octet-stream
           permissions: public-read
-      # transpilers
-      - command: s3.put
-        params:
-          aws_key: ${artifacts_aws_key}
-          aws_secret: ${artifacts_aws_secret}
-          local_file: realm-cli/etc/transpiler/bin/transpiler-linux-x64
-          remote_file: ${build_id}/linux-amd64/transpiler
-          bucket: realm-clis
-          content_type: application/octet-stream
-          permissions: public-read
-      - command: s3.put
-        params:
-          aws_key: ${artifacts_aws_key}
-          aws_secret: ${artifacts_aws_secret}
-          local_file: realm-cli/etc/transpiler/bin/transpiler-macos-x64
-          remote_file: ${build_id}/macos-amd64/transpiler
-          bucket: realm-clis
-          content_type: application/octet-stream
-          permissions: public-read
-      - command: s3.put
-        params:
-          aws_key: ${artifacts_aws_key}
-          aws_secret: ${artifacts_aws_secret}
-          local_file: realm-cli/etc/transpiler/bin/transpiler-win-x64
-          remote_file: ${build_id}/windows-amd64/transpiler.exe
-          bucket: realm-clis
-          content_type: application/octet-stream
-          permissions: public-read
 
 post:
   - command: gotest.parse_files

install.js

@@ -8,30 +8,26 @@ const basedownloadURL = `https://s3.amazonaws.com/realm-clis/${versionMetadata.b
 const linuxdownloadURL = `${basedownloadURL}/linux-amd64/realm-cli`;
 const macdownloadURL = `${basedownloadURL}/macos-amd64/realm-cli`;
 const windowsdownloadURL = `${basedownloadURL}/windows-amd64/realm-cli.exe`;
-// transpiler downloads
-const linuxTranspilerdownloadURL = `${basedownloadURL}/linux-amd64/transpiler`;
-const macTranspilerdownloadURL = `${basedownloadURL}/macos-amd64/transpiler`;
-const windowsTranspilerdownloadURL = `${basedownloadURL}/windows-amd64/transpiler.exe`;
 
-function getdownloadURL(cli) {
+function getdownloadURL() {
   const platform = process.platform;
   let downloadURL;
 
   if (platform === 'linux') {
     if (process.arch === 'x64') {
-      downloadURL = cli ? linuxdownloadURL : linuxTranspilerdownloadURL;
+      downloadURL = linuxdownloadURL;
     } else {
       throw new Error('Only Linux 64 bits supported.');
     }
   } else if (platform === 'darwin' || platform === 'freebsd') {
     if (process.arch === 'x64' || process.arch === 'arm64') {
-      downloadURL = cli ? macdownloadURL : macTranspilerdownloadURL;
+      downloadURL = macdownloadURL;
     } else {
       throw new Error('Only Mac 64 bits supported.');
     }
   } else if (platform === 'win32') {
     if (process.arch === 'x64') {
-      downloadURL = cli ? windowsdownloadURL : windowsTranspilerdownloadURL;
+      downloadURL = windowsdownloadURL;
     } else {
       throw new Error('Only Windows 64 bits supported.');
     }
@@ -96,7 +92,7 @@ function requstBinary(downloadURL, baseName) {
 // Install script starts here
 let downloadURL;
 try {
-  downloadURL = getdownloadURL(true);
+  downloadURL = getdownloadURL();
 } catch (err) {
   console.error('Realm CLI installation failed:', err);
   process.exit(1);
@@ -106,16 +102,3 @@ requstBinary(downloadURL, 'realm-cli').catch(err => {
   console.error('failed to download Realm CLI:', err);
   process.exit(1);
 });
-
-let transpilerdownloadURL;
-try {
-  transpilerdownloadURL = getdownloadURL(false);
-} catch (err) {
-  console.error('Realm CLI installation failed:', err);
-  process.exit(1);
-}
-
-requstBinary(transpilerdownloadURL, 'transpiler').catch(err => {
-  console.error('failed to download Realm CLI:', err);
-  process.exit(1);
-});

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)
+	DependenciesStatus(groupID, appID string) (DependenciesStatus, error)
 
 	CreateApp(groupID, name string, meta AppMeta) (App, error)
 	DeleteApp(groupID, appID string) error

internal/cloud/realm/dependencies.go

@@ -18,10 +18,44 @@ const (
 	dependenciesPathPattern        = appPathPattern + "/dependencies"
 	dependenciesArchivePathPattern = dependenciesPathPattern + "/archive"
 	dependenciesDiffPathPattern    = dependenciesPathPattern + "/diff"
+	dependenciesStatusPathPattern  = dependenciesPathPattern + "/status"
 
 	paramFile = "file"
 )
 
+// DependenciesStatus is used to get information from a dependencies status request
+type DependenciesStatus struct {
+	State   string `json:"status"`
+	Message string `json:"status_message"`
+}
+
+// set of known dependencies status states
+const (
+	DependenciesStateCreated    = "created"
+	DependenciesStateSuccessful = "successful"
+	DependenciesStateFailed     = "failed"
+)
+
+func (c *client) DependenciesStatus(groupID, appID string) (DependenciesStatus, error) {
+	res, err := c.do(
+		http.MethodGet,
+		fmt.Sprintf(dependenciesStatusPathPattern, groupID, appID),
+		api.RequestOptions{},
+	)
+	if err != nil {
+		return DependenciesStatus{}, err
+	}
+	if res.StatusCode != http.StatusOK {
+		return DependenciesStatus{}, api.ErrUnexpectedStatusCode{"get dependencies status", res.StatusCode}
+	}
+	defer res.Body.Close()
+	var status DependenciesStatus
+	if err := json.NewDecoder(res.Body).Decode(&status); err != nil {
+		return DependenciesStatus{}, err
+	}
+	return status, nil
+}
+
 func (c *client) ImportDependencies(groupID, appID, uploadPath string) error {
 	file, fileErr := os.Open(uploadPath)
 	if fileErr != nil {
@@ -37,9 +71,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 +83,21 @@ 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 nil
 }
 

internal/cloud/realm/dependencies_test.go

@@ -28,8 +28,32 @@ func TestRealmDependencies(t *testing.T) {
 		assert.Nil(t, err)
 
 		uploadPath := filepath.Join(wd, "testdata/dependencies_upload.zip")
+
+		_, err = client.DependenciesStatus(groupID, app.ID)
+		assert.Equal(t, realm.ServerError{Message: "dependency installation not found"}, err)
+
 		assert.Nil(t, client.ImportDependencies(groupID, app.ID, uploadPath))
 
+		startStatus, err := client.DependenciesStatus(groupID, app.ID)
+		assert.Nil(t, err)
+		assert.Equal(t, realm.DependenciesStatus{
+			State:   realm.DependenciesStateCreated,
+			Message: "processing request",
+		}, startStatus)
+
+		// wait for dependencies to finish installation
+		var currentStatus realm.DependenciesStatus
+		for i := 0; i < 50; i++ {
+			var err error
+			currentStatus, err = client.DependenciesStatus(groupID, app.ID)
+			assert.Nil(t, err)
+			if currentStatus.State != realm.DependenciesStateCreated {
+				break
+			}
+			time.Sleep(time.Second)
+		}
+		assert.Equal(t, realm.DependenciesStateSuccessful, currentStatus.State)
+
 		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 +102,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 +122,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]struct{} {
 	t.Helper()
 
 	fileInfo, err := file.Stat()
@@ -106,5 +131,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)
+	out := make(map[string]struct{}, len(zipPkg.File))
+
+	for _, file := range zipPkg.File {
+		if file.FileInfo().IsDir() {
+			continue
+		}
+		out[file.Name] = struct{}{}
+	}
+	return out
 }

internal/commands/app/diff.go

@@ -2,7 +2,6 @@ package app
 
 import (
 	"fmt"
-	"os"
 	"strings"
 
 	"github.com/10gen/realm-cli/internal/cli"
@@ -97,13 +96,12 @@ func (cmd *CommandDiff) Handler(profile *user.Profile, ui terminal.UI, clients c
 	}
 
 	if cmd.inputs.IncludeDependencies {
-		uploadPath, err := local.PrepareDependencies(app, ui)
+		appDependencies, err := local.FindAppDependencies(app.RootDir)
 		if err != nil {
 			return err
 		}
-		defer os.Remove(uploadPath) //nolint:errcheck
 
-		dependenciesDiff, err := clients.Realm.DiffDependencies(appToDiff.GroupID, appToDiff.ID, uploadPath)
+		dependenciesDiff, err := clients.Realm.DiffDependencies(appToDiff.GroupID, appToDiff.ID, appDependencies.ArchivePath)
 		if err != nil {
 			return err
 		}

internal/commands/app/diff_test.go

@@ -130,8 +130,7 @@ func TestAppDiffHandler(t *testing.T) {
 		cmd := &CommandDiff{diffInputs{LocalPath: "testdata/dependencies", IncludeDependencies: true}}
 		assert.Equal(t, nil, cmd.Handler(nil, ui, cli.Clients{Realm: realmClient}))
 
-		assert.Equal(t, `Transpiled dependency sources
-The following reflects the proposed changes to your Realm app
+		assert.Equal(t, `The following reflects the proposed changes to your Realm app
 diff1
 diff2
 Added Dependencies