diff --git a/go.mod b/go.mod index a228ecfc1..309a5f3d4 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( require ( github.com/briandowns/spinner v1.21.0 github.com/mattn/go-shellwords v1.0.12 - github.com/meroxa/turbine-core v0.0.0-20230504152501-46e9c62980fc + github.com/meroxa/turbine-core v0.0.0-20230505191118-69c808bc1b16 github.com/stretchr/testify v1.8.2 github.com/withfig/autocomplete-tools/integrations/cobra v1.2.1 golang.org/x/mod v0.10.0 diff --git a/go.sum b/go.sum index 86df3908d..0fe77c770 100644 --- a/go.sum +++ b/go.sum @@ -190,8 +190,8 @@ github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebG github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= github.com/meroxa/meroxa-go v0.0.0-20230331072126-47c9496dfb9b h1:xIxLrz8h0QA0QmFZrW3ciIjmEnGDszS/z3yjfD3d+pY= github.com/meroxa/meroxa-go v0.0.0-20230331072126-47c9496dfb9b/go.mod h1:VaDn0fLKHG2VoI9MQVEqwtfum4BaGr8pcgtfWRe8/Dk= -github.com/meroxa/turbine-core v0.0.0-20230504152501-46e9c62980fc h1:oAchuSSluUUBZYUQShgOz8x0/47HEbMjZBzsE4XceZo= -github.com/meroxa/turbine-core v0.0.0-20230504152501-46e9c62980fc/go.mod h1:uZhedBTvrGalpLdWtG0UhpphiecO5dS7GLK87boPSA4= +github.com/meroxa/turbine-core v0.0.0-20230505191118-69c808bc1b16 h1:VpYgi4pq1uqCihAyLZbwEpacWU8wB+6af5Jv66r5XUU= +github.com/meroxa/turbine-core v0.0.0-20230505191118-69c808bc1b16/go.mod h1:uZhedBTvrGalpLdWtG0UhpphiecO5dS7GLK87boPSA4= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/nirasan/go-oauth-pkce-code-verifier v0.0.0-20170819232839-0fbfe93532da h1:qiPWuGGr+1GQE6s9NPSK8iggR/6x/V+0snIoOPYsBgc= diff --git a/vendor/github.com/meroxa/turbine-core/pkg/app/init.go b/vendor/github.com/meroxa/turbine-core/pkg/app/init.go index f9e2fab2e..298ec4272 100644 --- a/vendor/github.com/meroxa/turbine-core/pkg/app/init.go +++ b/vendor/github.com/meroxa/turbine-core/pkg/app/init.go @@ -4,6 +4,7 @@ import ( "embed" "log" "os" + "path" "path/filepath" "strings" "text/template" @@ -38,7 +39,7 @@ func (a *AppInit) createFixtures() error { return err } - content, err := templateFS.ReadDir(filepath.Join("templates", string(a.Language), directory)) + content, err := templateFS.ReadDir(path.Join("templates", string(a.Language), directory)) if err != nil { return err } @@ -56,7 +57,7 @@ func (a *AppInit) createFixtures() error { // duplicateFile reads from a template and write to a file located to a path provided by the user func (a *AppInit) duplicateFile(fileName string) error { - t, err := template.ParseFS(templateFS, filepath.Join("templates", string(a.Language), fileName)) + t, err := template.ParseFS(templateFS, path.Join("templates", string(a.Language), fileName)) if err != nil { return err } @@ -87,7 +88,7 @@ func (a *AppInit) duplicateFile(fileName string) error { func (a *AppInit) listTemplateContent() ([]string, []string, error) { var files, directories []string - content, err := templateFS.ReadDir(filepath.Join("templates", string(a.Language))) + content, err := templateFS.ReadDir(path.Join("templates", string(a.Language))) if err != nil { return files, directories, err } diff --git a/vendor/modules.txt b/vendor/modules.txt index 645274602..7068a90f0 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -111,7 +111,7 @@ github.com/mattn/go-shellwords ## explicit; go 1.20 github.com/meroxa/meroxa-go/pkg/meroxa github.com/meroxa/meroxa-go/pkg/mock -# github.com/meroxa/turbine-core v0.0.0-20230504152501-46e9c62980fc +# github.com/meroxa/turbine-core v0.0.0-20230505191118-69c808bc1b16 ## explicit; go 1.20 github.com/meroxa/turbine-core/lib/go/github.com/meroxa/turbine/core github.com/meroxa/turbine-core/pkg/app