applyconfig: use dkl/pkg
This commit is contained in:
@ -3,16 +3,17 @@ package applyconfig
|
||||
import (
|
||||
"os"
|
||||
|
||||
"github.com/rs/zerolog"
|
||||
"github.com/rs/zerolog/log"
|
||||
"github.com/spf13/cobra"
|
||||
"novit.nc/direktil/inits/pkg/apply"
|
||||
"novit.nc/direktil/pkg/config"
|
||||
|
||||
dlog "novit.nc/direktil/pkg/log"
|
||||
"novit.tech/direktil/pkg/config"
|
||||
"novit.tech/direktil/pkg/config/apply"
|
||||
)
|
||||
|
||||
var (
|
||||
filters []string
|
||||
log = dlog.Get("dkl")
|
||||
filters []string
|
||||
pathPrefix string
|
||||
)
|
||||
|
||||
func Command() (c *cobra.Command) {
|
||||
@ -26,11 +27,14 @@ func Command() (c *cobra.Command) {
|
||||
|
||||
flag := c.Flags()
|
||||
flag.StringArrayVarP(&filters, "filter", "F", []string{}, "glob filter to select files to apply")
|
||||
flag.StringVarP(&pathPrefix, "prefix", "P", "", "path prefix")
|
||||
|
||||
return c
|
||||
}
|
||||
|
||||
func run(_ *cobra.Command, args []string) {
|
||||
log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
|
||||
|
||||
configPath := args[0]
|
||||
|
||||
var (
|
||||
@ -39,20 +43,19 @@ func run(_ *cobra.Command, args []string) {
|
||||
)
|
||||
|
||||
if configPath == "-" {
|
||||
log.Print("loading config from stdin")
|
||||
log.Info().Str("from", "stdin").Msg("loading config")
|
||||
cfg, err = config.Read(os.Stdin)
|
||||
|
||||
} else {
|
||||
log.Print("loading config from ", configPath)
|
||||
log.Info().Str("from", configPath).Msg("loading config")
|
||||
cfg, err = config.Load(configPath)
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
log.Print("failed to load config: ", err)
|
||||
log.Fatal().Err(err).Msg("failed to load config")
|
||||
}
|
||||
|
||||
if err = apply.Files(cfg /*log,*/, filters...); err != nil {
|
||||
log.Taint(dlog.Fatal, "failed to apply files: ", err)
|
||||
os.Exit(1)
|
||||
if err = apply.Files(cfg, pathPrefix, filters...); err != nil {
|
||||
log.Fatal().Err(err).Msg("failed to apply files")
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user