fix conflict while running multiple 'protogen' or 'build' commands on…

… at the same time
streamingfast · Dec 6, 2024 · f6ecbc0 · f6ecbc0
1 parent 1dda42d
commit f6ecbc0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/cmd/substreams/build.go b/cmd/substreams/build.go
@@ -397,5 +397,9 @@ func runCommandInDir(ctx context.Context, dir string, cmdArgs []string) error {
 		return fmt.Errorf("error running `%s`: %w", strings.Join(cmdArgs, " "), err)
 	}
 
+	if cmd.ProcessState.ExitCode() != 0 {
+		return fmt.Errorf("command %q failed with exit code %d", strings.Join(cmdArgs, " "), cmd.ProcessState.ExitCode())
+	}
+
 	return nil
 }
diff --git a/codegen/proto_generator.go b/codegen/proto_generator.go
@@ -36,7 +36,14 @@ func NewProtoGenerator(outputPath string, excludedPaths []string, generateMod bo
 }
 
 func (g *ProtoGenerator) GenerateProto(pkg *pbsubstreams.Package) error {
-	spkgTemporaryFilePath := filepath.Join(os.TempDir(), pkg.PackageMeta[0].Name+".tmp.spkg")
+
+	tmpDir, err := os.MkdirTemp("", "substreams_protogen")
+	if err != nil {
+		return err
+	}
+	defer os.RemoveAll(tmpDir)
+
+	spkgTemporaryFilePath := filepath.Join(tmpDir, pkg.PackageMeta[0].Name+".tmp.spkg")
 	cnt, err := proto.Marshal(pkg)
 	if err != nil {
 		return fmt.Errorf("marshalling package: %w", err)