Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

James/schema changes #52

Merged
merged 3 commits into from
Dec 5, 2023
Merged

James/schema changes #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52e5db8
Changes required for schema_changes in scale repo
jimmyaxod Nov 22, 2023
4482ab3
Removed mistake
jimmyaxod Nov 22, 2023
ef34bc1
Updated go.sum
jimmyaxod Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions cmd/function/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions cmd/function/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
}
Expand Down
8 changes: 4 additions & 4 deletions cmd/function/export.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
}
Expand Down
5 changes: 3 additions & 2 deletions cmd/function/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package function

import (
"fmt"

"github.com/loopholelabs/cmdutils"
"github.com/loopholelabs/cmdutils/pkg/command"
"github.com/loopholelabs/cmdutils/pkg/printer"
Expand Down Expand Up @@ -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,
}
Expand Down
12 changes: 6 additions & 6 deletions cmd/function/new.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions cmd/function/rename.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand Down
27 changes: 14 additions & 13 deletions cmd/function/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -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)
}
Expand Down Expand Up @@ -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()
Expand All @@ -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)
}
Expand All @@ -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
Expand Down Expand Up @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/registry/function/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/registry/function/push.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/registry/signature/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/registry/signature/push.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/signature/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
}
Expand Down
Loading