mosaic: ensure that concurrent sst operations do not overwrite each

other
sst · Jul 8, 2024 · e2fbb4d · e2fbb4d
1 parent 5e7e748
commit e2fbb4d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/pkg/js/js.go b/pkg/js/js.go
@@ -3,8 +3,10 @@ package js
 import (
 	"fmt"
 	"log/slog"
+	"os"
 	"path/filepath"
 	"strings"
+	"time"
 
 	esbuild "github.com/evanw/esbuild/pkg/api"
 )
@@ -19,8 +21,8 @@ type EvalOptions struct {
 }
 
 func Build(input EvalOptions) (esbuild.BuildResult, error) {
-	outfile := filepath.Join(input.Dir, ".sst", "platform", "sst.config.mjs")
-	slog.Info("esbuild building")
+	outfile := filepath.Join(input.Dir, ".sst", "platform", fmt.Sprintf("sst.config.%v.mjs", time.Now().UnixMilli()))
+	slog.Info("esbuild building", outfile)
 	result := esbuild.Build(esbuild.BuildOptions{
 		Banner: map[string]string{
 			"js": `
@@ -82,3 +84,9 @@ func FormatError(input []esbuild.Message) string {
 	}
 	return strings.Join(lines, "\n")
 }
+
+func Cleanup(result esbuild.BuildResult) {
+	for _, file := range result.OutputFiles {
+		os.Remove(file.Path)
+	}
+}
diff --git a/pkg/project/platform.go b/pkg/project/platform.go
@@ -2,6 +2,7 @@ package project
 
 import (
 	"encoding/json"
+	"fmt"
 	"log/slog"
 	"os"
 	"path/filepath"
@@ -11,7 +12,9 @@ import (
 
 func (p *Project) CheckPlatform(version string) bool {
 	if version == "dev" {
-		return false
+		currentExecutable, _ := os.Executable()
+		info, _ := os.Stat(currentExecutable)
+		version = fmt.Sprint(info.ModTime().UnixMilli())
 	}
 	slog.Info("checking platform")
 	contents, err := os.ReadFile(filepath.Join(p.PathPlatformDir(), "version"))
@@ -30,6 +33,11 @@ func (p *Project) CopyPlatform(version string) error {
 		return err
 	}
 	p.lock = ProviderLock{}
+	if version == "dev" {
+		currentExecutable, _ := os.Executable()
+		info, _ := os.Stat(currentExecutable)
+		version = fmt.Sprint(info.ModTime().UnixMilli())
+	}
 	return os.WriteFile(filepath.Join(platformDir, "version"), []byte(version), 0644)
 }
 

diff --git a/pkg/project/project.go b/pkg/project/project.go
@@ -140,6 +140,7 @@ console.log("~j" + JSON.stringify(mod.app({
 	if err != nil {
 		return nil, fmt.Errorf("%w%s", ErrBuildFailed, err)
 	}
+	defer js.Cleanup(buildResult)
 
 	slog.Info("evaluating config")
 	node := exec.Command("node", "--no-warnings", string(buildResult.OutputFiles[1].Path))

diff --git a/pkg/project/stack.go b/pkg/project/stack.go
@@ -239,6 +239,7 @@ func (s *stack) Run(ctx context.Context, input *StackInput) error {
 		})
 		return err
 	}
+	defer js.Cleanup(buildResult)
 	outfile := buildResult.OutputFiles[1].Path
 
 	if input.OnFiles != nil {