diff --git a/cmd/gen.go b/cmd/gen.go index 56da1ea..85c8d3f 100644 --- a/cmd/gen.go +++ b/cmd/gen.go @@ -17,8 +17,8 @@ limitations under the License. package cmd import ( - "github.com/Raskyld/go-tektasker/internal/gengo" - "github.com/Raskyld/go-tektasker/internal/genyaml" + "github.com/raskyld/go-tektasker/internal/gengo" + "github.com/raskyld/go-tektasker/internal/genyaml" "github.com/spf13/cobra" "path/filepath" "sigs.k8s.io/controller-tools/pkg/genall" diff --git a/cmd/init.go b/cmd/init.go index f34e3cb..3802166 100644 --- a/cmd/init.go +++ b/cmd/init.go @@ -17,7 +17,7 @@ limitations under the License. package cmd import ( - initGenerator "github.com/Raskyld/go-tektasker/internal/init" + initGenerator "github.com/raskyld/go-tektasker/internal/init" "github.com/spf13/cobra" "sigs.k8s.io/controller-tools/pkg/genall" ) diff --git a/cmd/markers.go b/cmd/markers.go index 71bafd2..92ce914 100644 --- a/cmd/markers.go +++ b/cmd/markers.go @@ -18,7 +18,7 @@ package cmd import ( "errors" - ttmarkers "github.com/Raskyld/go-tektasker/pkg/markers" + ttmarkers "github.com/raskyld/go-tektasker/pkg/markers" "github.com/spf13/cobra" "os" "sigs.k8s.io/controller-tools/pkg/genall/help" diff --git a/go.mod b/go.mod index a8c6b02..aea8f8f 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/Raskyld/go-tektasker +module github.com/raskyld/go-tektasker go 1.21 diff --git a/internal/gengo/gen_func.go b/internal/gengo/gen_func.go index ad92fad..6834495 100644 --- a/internal/gengo/gen_func.go +++ b/internal/gengo/gen_func.go @@ -24,7 +24,7 @@ import ( "strings" "text/template" - ttmarkers "github.com/Raskyld/go-tektasker/pkg/markers" + ttmarkers "github.com/raskyld/go-tektasker/pkg/markers" "sigs.k8s.io/controller-tools/pkg/genall" "sigs.k8s.io/controller-tools/pkg/markers" ) diff --git a/internal/gengo/gen_internal.go b/internal/gengo/gen_internal.go index 05c44fb..a58bdb1 100644 --- a/internal/gengo/gen_internal.go +++ b/internal/gengo/gen_internal.go @@ -18,7 +18,7 @@ package gengo import ( "bytes" - ttmarkers "github.com/Raskyld/go-tektasker/pkg/markers" + ttmarkers "github.com/raskyld/go-tektasker/pkg/markers" "log/slog" "sigs.k8s.io/controller-tools/pkg/genall" "sigs.k8s.io/controller-tools/pkg/markers" diff --git a/internal/genyaml/gen.go b/internal/genyaml/gen.go index 6e2c6c6..b4e06c6 100644 --- a/internal/genyaml/gen.go +++ b/internal/genyaml/gen.go @@ -21,7 +21,7 @@ import ( "encoding/json" "errors" "fmt" - ttmarkers "github.com/Raskyld/go-tektasker/pkg/markers" + ttmarkers "github.com/raskyld/go-tektasker/pkg/markers" "go/ast" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/internal/init/gen.go b/internal/init/gen.go index 93f155f..74e2bac 100644 --- a/internal/init/gen.go +++ b/internal/init/gen.go @@ -17,80 +17,80 @@ limitations under the License. package init import ( - "fmt" - ttemplate "github.com/Raskyld/go-tektasker/internal/init/internal/template" - ttmarkers "github.com/Raskyld/go-tektasker/pkg/markers" - "log/slog" - "sigs.k8s.io/controller-tools/pkg/genall" - "sigs.k8s.io/controller-tools/pkg/markers" - "strings" - "text/template" + "fmt" + ttemplate "github.com/raskyld/go-tektasker/internal/init/internal/template" + ttmarkers "github.com/raskyld/go-tektasker/pkg/markers" + "log/slog" + "sigs.k8s.io/controller-tools/pkg/genall" + "sigs.k8s.io/controller-tools/pkg/markers" + "strings" + "text/template" ) type Generator struct { - Logger *slog.Logger - Template *template.Template - TaskName string + Logger *slog.Logger + Template *template.Template + TaskName string } func New(logger *slog.Logger, taskName string) *Generator { - gen := &Generator{ - Logger: logger, - Template: &template.Template{}, - TaskName: taskName, - } - - gen.Template.Funcs(template.FuncMap{ - "Raw": func(content ...string) string { - return fmt.Sprintf("{{%s}}", strings.Join(content, " ")) - }, - }) - - gen.RegisterTemplate(ttemplate.TaskfileName, ttemplate.TaskfileTpl). - RegisterTemplate(ttemplate.DotEnvName, ttemplate.DotEnvTpl). - RegisterTemplate(ttemplate.TaskGoName, ttemplate.TaskGoTpl) - - return gen + gen := &Generator{ + Logger: logger, + Template: &template.Template{}, + TaskName: taskName, + } + + gen.Template.Funcs(template.FuncMap{ + "Raw": func(content ...string) string { + return fmt.Sprintf("{{%s}}", strings.Join(content, " ")) + }, + }) + + gen.RegisterTemplate(ttemplate.TaskfileName, ttemplate.TaskfileTpl). + RegisterTemplate(ttemplate.DotEnvName, ttemplate.DotEnvTpl). + RegisterTemplate(ttemplate.TaskGoName, ttemplate.TaskGoTpl) + + return gen } func (*Generator) RegisterMarkers(into *markers.Registry) error { - return ttmarkers.Register(into) + return ttmarkers.Register(into) } func (g *Generator) RegisterTemplate(name string, tpl string) *Generator { - nt, err := g.Template.New(name).Parse(tpl) - if err != nil { - panic(err) - } + nt, err := g.Template.New(name).Parse(tpl) + if err != nil { + panic(err) + } - g.Template = nt - return g + g.Template = nt + return g } func (g *Generator) Generate(output genall.OutputRule) error { - err := g.genFile(output, ttemplate.TaskfileName, "Taskfile.yaml", nil) - if err != nil { - return err - } - - err = g.genFile(output, ttemplate.DotEnvName, ".env", nil) - if err != nil { - return err - } - - err = g.genFile(output, ttemplate.TaskGoName, "task.go", ttemplate.TaskGoArgs{TaskName: g.TaskName}) - if err != nil { - return err - } - - return nil + err := g.genFile(output, ttemplate.TaskfileName, "Taskfile.yaml", nil) + if err != nil { + return err + } + + err = g.genFile(output, ttemplate.DotEnvName, ".env", nil) + if err != nil { + return err + } + + err = g.genFile(output, ttemplate.TaskGoName, "task.go", ttemplate.TaskGoArgs{TaskName: g.TaskName}) + if err != nil { + return err + } + + return nil } func (g *Generator) genFile(output genall.OutputRule, tplName, path string, args any) error { - wr, err := output.Open(nil, path) - if err != nil { - return err - } + wr, err := output.Open(nil, path) + if err != nil { + return err + } - return g.Template.ExecuteTemplate(wr, tplName, args) + return g.Template.ExecuteTemplate(wr, tplName, args) } diff --git a/main.go b/main.go index fea49c4..e39a217 100644 --- a/main.go +++ b/main.go @@ -18,7 +18,7 @@ package main import ( "fmt" - "github.com/Raskyld/go-tektasker/cmd" + "github.com/raskyld/go-tektasker/cmd" "os" )