James/schema changes (#52)

* Changes required for schema_changes in scale repo Signed-off-by: Jimmy Moore <[email protected]> * Removed mistake Signed-off-by: Jimmy Moore <[email protected]> * Updated go.sum Signed-off-by: Jimmy Moore <[email protected]> --------- Signed-off-by: Jimmy Moore <[email protected]>
loopholelabs · Dec 5, 2023 · 975a219 · 975a219
1 parent 676f8de
commit 975a219
Show file tree

Hide file tree

Showing 17 changed files with 89 additions and 61 deletions.
diff --git a/cmd/function/build.go b/cmd/function/build.go
@@ -19,6 +19,10 @@ package function
 import (
 	"encoding/base64"
 	"fmt"
+	"os"
+	"path"
+	"strings"
+
 	"github.com/loopholelabs/cmdutils"
 	"github.com/loopholelabs/cmdutils/pkg/command"
 	"github.com/loopholelabs/cmdutils/pkg/printer"
@@ -32,9 +36,6 @@ import (
 	"github.com/loopholelabs/scale/signature"
 	"github.com/loopholelabs/scale/storage"
 	"github.com/spf13/cobra"
-	"os"
-	"path"
-	"strings"
 )
 
 // BuildCmd encapsulates the commands for building Functions
@@ -160,11 +161,11 @@ func BuildCmd(hidden bool) command.SetupCommand[*config.Config] {
 
 				out := ch.Printer.Out()
 
-				var scaleFunc *scalefunc.Schema
+				var scaleFunc *scalefunc.V1BetaSchema
 				switch scalefunc.Language(sf.Language) {
 				case scalefunc.Go:
 					opts := &build.LocalGolangOptions{
-						Output:          out,
+						Stdout:          out,
 						Scalefile:       sf,
 						SourceDirectory: sourceDir,
 						SignatureSchema: signatureSchema,
@@ -178,7 +179,7 @@ func BuildCmd(hidden bool) command.SetupCommand[*config.Config] {
 					scaleFunc, err = build.LocalGolang(opts)
 				case scalefunc.Rust:
 					opts := &build.LocalRustOptions{
-						Output:          out,
+						Stdout:          out,
 						Scalefile:       sf,
 						SourceDirectory: sourceDir,
 						SignatureSchema: signatureSchema,
@@ -191,7 +192,7 @@ func BuildCmd(hidden bool) command.SetupCommand[*config.Config] {
 					scaleFunc, err = build.LocalRust(opts)
 				case scalefunc.TypeScript:
 					opts := &build.LocalTypescriptOptions{
-						Output:          out,
+						Stdout:          out,
 						Scalefile:       sf,
 						SourceDirectory: sourceDir,
 						SignatureSchema: signatureSchema,

diff --git a/cmd/function/delete.go b/cmd/function/delete.go
@@ -18,10 +18,10 @@ package function
 
 import (
 	"fmt"
+
 	"github.com/loopholelabs/cmdutils"
 	"github.com/loopholelabs/cmdutils/pkg/command"
 	"github.com/loopholelabs/cmdutils/pkg/printer"
-	"github.com/loopholelabs/scale"
 	"github.com/loopholelabs/scale-cli/analytics"
 	"github.com/loopholelabs/scale-cli/internal/config"
 	"github.com/loopholelabs/scale-cli/utils"
@@ -50,7 +50,7 @@ func DeleteCmd() command.SetupCommand[*config.Config] {
 					}
 				}
 
-				parsed := scale.Parse(args[0])
+				parsed := utils.Parse(args[0])
 				if parsed.Organization != "" && !scalefunc.ValidString(parsed.Organization) {
 					return utils.InvalidStringError("organization name", parsed.Organization)
 				}

diff --git a/cmd/function/export.go b/cmd/function/export.go
@@ -18,18 +18,18 @@ package function
 
 import (
 	"fmt"
+	"os"
+	"path"
+
 	"github.com/loopholelabs/cmdutils"
 	"github.com/loopholelabs/cmdutils/pkg/command"
 	"github.com/loopholelabs/cmdutils/pkg/printer"
-	"github.com/loopholelabs/scale"
 	"github.com/loopholelabs/scale-cli/analytics"
 	"github.com/loopholelabs/scale-cli/internal/config"
 	"github.com/loopholelabs/scale-cli/utils"
 	"github.com/loopholelabs/scale/scalefunc"
 	"github.com/loopholelabs/scale/storage"
 	"github.com/spf13/cobra"
-	"os"
-	"path"
 )
 
 // ExportCmd encapsulates the commands for exporting Functions
@@ -54,7 +54,7 @@ func ExportCmd() command.SetupCommand[*config.Config] {
 					}
 				}
 
-				parsed := scale.Parse(args[0])
+				parsed := utils.Parse(args[0])
 				if parsed.Organization == "" && !scalefunc.ValidString(parsed.Organization) {
 					return utils.InvalidStringError("organization name", parsed.Organization)
 				}

diff --git a/cmd/function/list.go b/cmd/function/list.go
@@ -18,6 +18,7 @@ package function
 
 import (
 	"fmt"
+
 	"github.com/loopholelabs/cmdutils"
 	"github.com/loopholelabs/cmdutils/pkg/command"
 	"github.com/loopholelabs/cmdutils/pkg/printer"
@@ -60,9 +61,9 @@ func ListCmd() command.SetupCommand[*config.Config] {
 					funcs[i] = functionModel{
 						Name:      entry.Schema.Name,
 						Tag:       entry.Schema.Tag,
-						Signature: entry.Schema.SignatureName,
+						Signature: entry.Schema.Signature.Name,
 						Language:  string(entry.Schema.Language),
-						Version:   string(entry.Schema.Version),
+						Version:   string(entry.Schema.Tag), // FIXME
 						Hash:      entry.Hash,
 						Org:       entry.Organization,
 					}

diff --git a/cmd/function/new.go b/cmd/function/new.go
@@ -18,10 +18,14 @@ package function
 
 import (
 	"fmt"
+	"os"
+	"path"
+	"strings"
+	textTemplate "text/template"
+
 	"github.com/loopholelabs/cmdutils"
 	"github.com/loopholelabs/cmdutils/pkg/command"
 	"github.com/loopholelabs/cmdutils/pkg/printer"
-	"github.com/loopholelabs/scale"
 	"github.com/loopholelabs/scale-cli/analytics"
 	"github.com/loopholelabs/scale-cli/client/registry"
 	"github.com/loopholelabs/scale-cli/internal/config"
@@ -31,10 +35,6 @@ import (
 	"github.com/loopholelabs/scale/scalefunc"
 	"github.com/loopholelabs/scale/storage"
 	"github.com/spf13/cobra"
-	"os"
-	"path"
-	"strings"
-	textTemplate "text/template"
 )
 
 // NewCmd encapsulates the commands for creating new Functions
@@ -99,7 +99,7 @@ func NewCmd(hidden bool) command.SetupCommand[*config.Config] {
 				var signaturePath string
 				var signatureVersion string
 				var signatureContext string
-				parsedSignature := scale.Parse(signature)
+				parsedSignature := utils.Parse(signature)
 				if parsedSignature.Organization == "local" {
 					signaturePath, err = st.Path(parsedSignature.Name, parsedSignature.Tag, parsedSignature.Organization, "")
 					if err != nil {

diff --git a/cmd/function/rename.go b/cmd/function/rename.go
@@ -18,10 +18,10 @@ package function
 
 import (
 	"fmt"
+
 	"github.com/loopholelabs/cmdutils"
 	"github.com/loopholelabs/cmdutils/pkg/command"
 	"github.com/loopholelabs/cmdutils/pkg/printer"
-	"github.com/loopholelabs/scale"
 	"github.com/loopholelabs/scale-cli/internal/config"
 	"github.com/loopholelabs/scale-cli/utils"
 	"github.com/loopholelabs/scale/scalefunc"
@@ -47,7 +47,7 @@ func RenameCmd() command.SetupCommand[*config.Config] {
 						return fmt.Errorf("failed to instantiate function storage for %s: %w", ch.Config.StorageDirectory, err)
 					}
 				}
-				parsed := scale.Parse(args[0])
+				parsed := utils.Parse(args[0])
 				if parsed.Organization != "" && !scalefunc.ValidString(parsed.Organization) {
 					return utils.InvalidStringError("organization name", parsed.Organization)
 				}
@@ -68,7 +68,7 @@ func RenameCmd() command.SetupCommand[*config.Config] {
 					return fmt.Errorf("function %s/%s:%s does not exist", parsed.Organization, parsed.Name, parsed.Tag)
 				}
 
-				newParsed := scale.Parse(args[1])
+				newParsed := utils.Parse(args[1])
 				if newParsed.Organization != "" && !scalefunc.ValidString(newParsed.Organization) {
 					return utils.InvalidStringError("organization name", newParsed.Organization)
 				}

diff --git a/cmd/function/run.go b/cmd/function/run.go
@@ -18,6 +18,14 @@ package function
 
 import (
 	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"os/signal"
+	"sync"
+	"syscall"
+	"time"
+
 	"github.com/loopholelabs/cmdutils"
 	"github.com/loopholelabs/cmdutils/pkg/command"
 	"github.com/loopholelabs/cmdutils/pkg/printer"
@@ -32,13 +40,6 @@ import (
 	"github.com/mattn/go-isatty"
 	"github.com/spf13/cobra"
 	"github.com/valyala/fasthttp"
-	"io"
-	"net/http"
-	"os"
-	"os/signal"
-	"sync"
-	"syscall"
-	"time"
 )
 
 // RunCmd encapsulates the commands for running Functions
@@ -63,9 +64,9 @@ func RunCmd(hidden bool) command.SetupCommand[*config.Config] {
 					}
 				}
 
-				fns := make([]*scalefunc.Schema, 0, len(args))
+				fns := make([]*scalefunc.V1BetaSchema, 0, len(args))
 				for _, f := range args {
-					parsed := scale.Parse(f)
+					parsed := utils.Parse(f)
 					if parsed.Organization != "" && !scalefunc.ValidString(parsed.Organization) {
 						return utils.InvalidStringError("organization name", parsed.Organization)
 					}
@@ -115,7 +116,7 @@ func RunCmd(hidden bool) command.SetupCommand[*config.Config] {
 							return fmt.Errorf("failed to close response body: %w", err)
 						}
 
-						s := new(scalefunc.Schema)
+						s := new(scalefunc.V1BetaSchema)
 						err = s.Decode(data)
 						if err != nil {
 							end()
@@ -140,7 +141,7 @@ func RunCmd(hidden bool) command.SetupCommand[*config.Config] {
 				analytics.Event("run-function", map[string]string{"chain-size": fmt.Sprintf("%d", len(fns))})
 
 				ctx := cmd.Context()
-				typecheckSignature, err := converter.NewSignature(fns[0].SignatureSchema)
+				typecheckSignature, err := converter.NewSignature(fns[0].Signature.Schema)
 				if err != nil {
 					return fmt.Errorf("failed to create type check signature: %w", err)
 				}
@@ -166,7 +167,7 @@ func RunCmd(hidden bool) command.SetupCommand[*config.Config] {
 								ctx.Error(fmt.Sprintf("Failed to create instance: %v", err), fasthttp.StatusInternalServerError)
 								return
 							}
-							sig, err := converter.NewSignature(fns[0].SignatureSchema)
+							sig, err := converter.NewSignature(fns[0].Signature.Schema)
 							if err != nil {
 								ctx.Error(fmt.Sprintf("Failed to create signature: %v", err), fasthttp.StatusInternalServerError)
 								return
@@ -226,7 +227,7 @@ func RunCmd(hidden bool) command.SetupCommand[*config.Config] {
 					if err != nil {
 						return fmt.Errorf("failed to create instance: %w", err)
 					}
-					sig, err := converter.NewSignature(fns[0].SignatureSchema)
+					sig, err := converter.NewSignature(fns[0].Signature.Schema)
 					if err != nil {
 						return fmt.Errorf("failed to create signature: %w", err)
 					}

diff --git a/cmd/registry/function/delete.go b/cmd/registry/function/delete.go
@@ -18,10 +18,10 @@ package function
 
 import (
 	"fmt"
+
 	"github.com/loopholelabs/cmdutils"
 	"github.com/loopholelabs/cmdutils/pkg/command"
 	"github.com/loopholelabs/cmdutils/pkg/printer"
-	"github.com/loopholelabs/scale"
 	"github.com/loopholelabs/scale-cli/analytics"
 	"github.com/loopholelabs/scale-cli/client/registry"
 	"github.com/loopholelabs/scale-cli/internal/config"
@@ -41,7 +41,7 @@ func DeleteCmd() command.SetupCommand[*config.Config] {
 			PreRunE:  utils.PreRunAuthenticatedAPI(ch),
 			PostRunE: utils.PostRunAuthenticatedAPI(ch),
 			RunE: func(cmd *cobra.Command, args []string) error {
-				parsed := scale.Parse(args[0])
+				parsed := utils.Parse(args[0])
 				if parsed.Organization != "" && !scalefunc.ValidString(parsed.Organization) {
 					return utils.InvalidStringError("organization name", parsed.Organization)
 				}

diff --git a/cmd/registry/function/push.go b/cmd/registry/function/push.go
@@ -19,11 +19,11 @@ package function
 import (
 	"bytes"
 	"fmt"
+
 	"github.com/go-openapi/runtime"
 	"github.com/loopholelabs/cmdutils"
 	"github.com/loopholelabs/cmdutils/pkg/command"
 	"github.com/loopholelabs/cmdutils/pkg/printer"
-	"github.com/loopholelabs/scale"
 	"github.com/loopholelabs/scale-cli/analytics"
 	"github.com/loopholelabs/scale-cli/client/registry"
 	"github.com/loopholelabs/scale-cli/internal/config"
@@ -52,7 +52,7 @@ func PushCmd() command.SetupCommand[*config.Config] {
 					}
 				}
 
-				parsed := scale.Parse(args[0])
+				parsed := utils.Parse(args[0])
 				if parsed.Organization != "" && !scalefunc.ValidString(parsed.Organization) {
 					return utils.InvalidStringError("organization name", parsed.Organization)
 				}

diff --git a/cmd/registry/signature/delete.go b/cmd/registry/signature/delete.go
@@ -18,10 +18,10 @@ package signature
 
 import (
 	"fmt"
+
 	"github.com/loopholelabs/cmdutils"
 	"github.com/loopholelabs/cmdutils/pkg/command"
 	"github.com/loopholelabs/cmdutils/pkg/printer"
-	"github.com/loopholelabs/scale"
 	"github.com/loopholelabs/scale-cli/analytics"
 	"github.com/loopholelabs/scale-cli/client/registry"
 	"github.com/loopholelabs/scale-cli/internal/config"
@@ -40,7 +40,7 @@ func DeleteCmd() command.SetupCommand[*config.Config] {
 			PreRunE:  utils.PreRunAuthenticatedAPI(ch),
 			PostRunE: utils.PostRunAuthenticatedAPI(ch),
 			RunE: func(cmd *cobra.Command, args []string) error {
-				parsed := scale.Parse(args[0])
+				parsed := utils.Parse(args[0])
 				if parsed.Organization != "" && !scalefunc.ValidString(parsed.Organization) {
 					return utils.InvalidStringError("organization name", parsed.Organization)
 				}

diff --git a/cmd/registry/signature/push.go b/cmd/registry/signature/push.go
@@ -19,11 +19,11 @@ package signature
 import (
 	"bytes"
 	"fmt"
+
 	"github.com/go-openapi/runtime"
 	"github.com/loopholelabs/cmdutils"
 	"github.com/loopholelabs/cmdutils/pkg/command"
 	"github.com/loopholelabs/cmdutils/pkg/printer"
-	"github.com/loopholelabs/scale"
 	"github.com/loopholelabs/scale-cli/analytics"
 	"github.com/loopholelabs/scale-cli/client/registry"
 	"github.com/loopholelabs/scale-cli/internal/config"
@@ -52,7 +52,7 @@ func PushCmd() command.SetupCommand[*config.Config] {
 					}
 				}
 
-				parsed := scale.Parse(args[0])
+				parsed := utils.Parse(args[0])
 				if parsed.Organization != "" && !scalefunc.ValidString(parsed.Organization) {
 					return utils.InvalidStringError("organization name", parsed.Organization)
 				}

diff --git a/cmd/signature/delete.go b/cmd/signature/delete.go
@@ -18,10 +18,10 @@ package signature
 
 import (
 	"fmt"
+
 	"github.com/loopholelabs/cmdutils"
 	"github.com/loopholelabs/cmdutils/pkg/command"
 	"github.com/loopholelabs/cmdutils/pkg/printer"
-	"github.com/loopholelabs/scale"
 	"github.com/loopholelabs/scale-cli/internal/config"
 	"github.com/loopholelabs/scale-cli/utils"
 	"github.com/loopholelabs/scale/scalefunc"
@@ -49,7 +49,7 @@ func DeleteCmd(hidden bool) command.SetupCommand[*config.Config] {
 					}
 				}
 
-				parsed := scale.Parse(args[0])
+				parsed := utils.Parse(args[0])
 				if parsed.Organization != "" && !scalefunc.ValidString(parsed.Organization) {
 					return utils.InvalidStringError("organization name", parsed.Organization)
 				}