Switch toolchain formatting to json.

Signed-off-by: David Calavera <[email protected]>

Author: calavera

go/internal/data/hello-world.zip renamed to go/internal/data/hello-rs-function-test.zip

@@ -8,6 +8,7 @@ import (
 	"crypto/sha256"
 	"debug/elf"
 	"encoding/hex"
+	"encoding/json"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -103,6 +104,10 @@ type FileBundle struct {
 	Buffer io.ReadSeeker
 }
 
+type toolchainSpec struct {
+	Runtime string `json:"runtime"`
+}
+
 func (f *FileBundle) Read(p []byte) (n int, err error) {
 	return f.Buffer.Read(p)
 }
@@ -630,22 +635,13 @@ func readZipRuntime(filePath string) (string, error) {
 			}
 			defer fc.Close()
 
-			reader := bufio.NewReader(fc)
-			for {
-				line, err := reader.ReadString('\n')
-				if err != nil && err != io.EOF {
-					// Ignore any errors and choose the default runtime.
-					// This preserves the current behavior in this library.
-					return jsRuntime, nil
-				}
-
-				if strings.HasPrefix(line, "runtime=") {
-					split := strings.SplitN(line, "=", 2)
-					if len(split) == 2 && split[1] != "" {
-						return split[1], nil
-					}
-				}
+			var tc toolchainSpec
+			if err := json.NewDecoder(fc).Decode(&tc); err != nil {
+				// Ignore any errors and choose the default runtime.
+				// This preserves the current behavior in this library.
+				return jsRuntime, nil
 			}
+			return tc.Runtime, nil
 		}
 	}
 

go/porcelain/deploy.go

@@ -132,7 +132,7 @@ func TestConcurrentFileUpload(t *testing.T) {
 }
 
 func TestReadZipRuntime(t *testing.T) {
-	runtime, err := readZipRuntime("../internal/data/hello-world.zip")
+	runtime, err := readZipRuntime("../internal/data/hello-rs-function-test.zip")
 	if err != nil {
 		t.Fatalf("unexpected error reading zip file: %v", err)
 	}