Skip to content

Commit a7389f9

Browse files
authored
Merge pull request #103 from mattrent/update-sdk
Update to new SDK version
2 parents 307fd26 + 473b2be commit a7389f9

31 files changed

Lines changed: 1354 additions & 618 deletions

.github/workflows/license.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ jobs:
3030
- name: Checkout
3131
uses: actions/checkout@v3
3232
- name: License
33-
uses: apache/skywalking-eyes@main
33+
uses: apache/skywalking-eyes@v0.4.0

cmd/fl/app/app.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"github.com/alecthomas/kong"
2323
"github.com/funlessdev/fl-cli/internal/command/admin"
2424
"github.com/funlessdev/fl-cli/internal/command/fn"
25+
"github.com/funlessdev/fl-cli/internal/command/mod"
2526
"github.com/funlessdev/fl-cli/internal/command/template"
2627
"github.com/funlessdev/fl-cli/pkg"
2728
"github.com/funlessdev/fl-cli/pkg/build"
@@ -32,6 +33,7 @@ import (
3233

3334
type CLI struct {
3435
Fn fn.Fn `cmd:"" help:"create, delete and manage functions"`
36+
Mod mod.Mod `cmd:"" help:"create, delete and manage modules"`
3537
Admin admin.Admin `cmd:"" aliases:"a" help:"deploy and manage the platform"`
3638
Template template.Template `cmd:"" help:"pull function templates"`
3739

@@ -60,6 +62,7 @@ func ParseCMD(version string) (*kong.Context, error) {
6062
return nil, err
6163
}
6264
fnSvc := &client.FnService{Client: flClient}
65+
modSvc := &client.ModService{Client: flClient}
6366

6467
kong_ctx := kong.Parse(&cli,
6568
kong.Name("fl"),
@@ -72,6 +75,7 @@ func ParseCMD(version string) (*kong.Context, error) {
7275
}),
7376
kong.BindTo(ctx, (*context.Context)(nil)),
7477
kong.BindTo(fnSvc, (*client.FnHandler)(nil)),
78+
kong.BindTo(modSvc, (*client.ModHandler)(nil)),
7579
kong.BindTo(logger, (*log.FLogger)(nil)),
7680
kong.BindTo(dockerShell, (*deploy.DockerShell)(nil)),
7781
kong.BindTo(kubernetesDeployer, (*deploy.KubernetesDeployer)(nil)),

go.mod

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,32 @@ go 1.19
1818

1919
require (
2020
github.com/alecthomas/kong v0.7.1
21-
github.com/docker/docker v20.10.21+incompatible
22-
github.com/docker/go-connections v0.4.0
23-
github.com/funlessdev/fl-client-sdk-go v0.0.0-20221126172432-e2986ae86033
21+
github.com/docker/docker v20.10.22+incompatible
22+
github.com/funlessdev/fl-client-sdk-go v0.0.0-20230110194424-c7f5f5016383
2423
github.com/theckman/yacspin v0.13.12
2524
gotest.tools/v3 v3.4.0
26-
k8s.io/api v0.25.4
27-
k8s.io/apimachinery v0.25.4
28-
k8s.io/client-go v0.25.4
25+
k8s.io/api v0.26.0
26+
k8s.io/apimachinery v0.26.0
27+
k8s.io/client-go v0.26.0
2928
)
3029

3130
require (
3231
github.com/Microsoft/go-winio v0.6.0 // indirect
33-
github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 // indirect
34-
github.com/PuerkitoBio/purell v1.2.0 // indirect
35-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
32+
github.com/ProtonMail/go-crypto v0.0.0-20230109192245-7efeeb08f296 // indirect
3633
github.com/acomagu/bufpipe v1.0.3 // indirect
37-
github.com/cloudflare/circl v1.1.0 // indirect
34+
github.com/cloudflare/circl v1.3.1 // indirect
3835
github.com/davecgh/go-spew v1.1.1 // indirect
3936
github.com/docker/distribution v2.8.1+incompatible // indirect
37+
github.com/docker/go-connections v0.4.0 // indirect
4038
github.com/docker/go-units v0.5.0 // indirect
4139
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
4240
github.com/emirpasic/gods v1.18.1 // indirect
4341
github.com/fatih/color v1.13.0 // indirect
4442
github.com/go-git/gcfg v1.5.0 // indirect
45-
github.com/go-git/go-billy/v5 v5.3.1 // indirect
43+
github.com/go-git/go-billy/v5 v5.4.0 // indirect
4644
github.com/go-logr/logr v1.2.3 // indirect
47-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
48-
github.com/go-openapi/jsonreference v0.20.0 // indirect
45+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
46+
github.com/go-openapi/jsonreference v0.20.1 // indirect
4947
github.com/go-openapi/swag v0.22.3 // indirect
5048
github.com/gogo/protobuf v1.3.2 // indirect
5149
github.com/golang/protobuf v1.5.2 // indirect
@@ -59,7 +57,7 @@ require (
5957
github.com/kevinburke/ssh_config v1.2.0 // indirect
6058
github.com/mailru/easyjson v0.7.7 // indirect
6159
github.com/mattn/go-colorable v0.1.13 // indirect
62-
github.com/mattn/go-isatty v0.0.16 // indirect
60+
github.com/mattn/go-isatty v0.0.17 // indirect
6361
github.com/mattn/go-runewidth v0.0.14 // indirect
6462
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
6563
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -71,37 +69,37 @@ require (
7169
github.com/pjbgf/sha1cd v0.2.3 // indirect
7270
github.com/pmezard/go-difflib v1.0.0 // indirect
7371
github.com/rivo/uniseg v0.4.3 // indirect
74-
github.com/sergi/go-diff v1.1.0 // indirect
72+
github.com/sergi/go-diff v1.2.0 // indirect
7573
github.com/sirupsen/logrus v1.9.0 // indirect
7674
github.com/skeema/knownhosts v1.1.0 // indirect
7775
github.com/spf13/pflag v1.0.5 // indirect
7876
github.com/stretchr/objx v0.5.0 // indirect
7977
github.com/xanzy/ssh-agent v0.3.3 // indirect
80-
golang.org/x/crypto v0.3.0 // indirect
78+
golang.org/x/crypto v0.5.0 // indirect
8179
golang.org/x/mod v0.7.0 // indirect
82-
golang.org/x/net v0.2.0 // indirect
83-
golang.org/x/oauth2 v0.2.0 // indirect
84-
golang.org/x/sys v0.2.0 // indirect
85-
golang.org/x/term v0.2.0 // indirect
86-
golang.org/x/text v0.4.0 // indirect
87-
golang.org/x/time v0.2.0 // indirect
88-
golang.org/x/tools v0.3.0 // indirect
80+
golang.org/x/net v0.5.0 // indirect
81+
golang.org/x/oauth2 v0.4.0 // indirect
82+
golang.org/x/sys v0.4.0 // indirect
83+
golang.org/x/term v0.4.0 // indirect
84+
golang.org/x/text v0.6.0 // indirect
85+
golang.org/x/time v0.3.0 // indirect
86+
golang.org/x/tools v0.5.0 // indirect
8987
google.golang.org/appengine v1.6.7 // indirect
9088
google.golang.org/protobuf v1.28.1 // indirect
9189
gopkg.in/inf.v0 v0.9.1 // indirect
9290
gopkg.in/warnings.v0 v0.1.2 // indirect
9391
gopkg.in/yaml.v2 v2.4.0 // indirect
9492
gopkg.in/yaml.v3 v3.0.1 // indirect
9593
k8s.io/klog/v2 v2.80.1 // indirect
96-
k8s.io/kube-openapi v0.0.0-20221123214604-86e75ddd809a // indirect
97-
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 // indirect
94+
k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596 // indirect
95+
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
9896
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
9997
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
10098
sigs.k8s.io/yaml v1.3.0 // indirect
10199
)
102100

103101
require (
104-
github.com/go-git/go-git/v5 v5.5.1
102+
github.com/go-git/go-git/v5 v5.5.2
105103
github.com/mitchellh/go-homedir v1.1.0
106104
github.com/pkg/errors v0.9.1 // indirect
107105
github.com/stretchr/testify v1.8.1

0 commit comments

Comments
 (0)