grim/convey

Port from logrus to log/slog
default tip
5 months ago, Elliott Sales de Andrade
c588f9b3f559
Port from logrus to log/slog

This doesn't really take much advantage of structured logging beyond what is already done (`id` and `idColor`), and consequently the log handler does not try to do any handling of anything more than that (i.e., grouping, or arbitrary attributes beyond those defined).

One should maybe have a `Context` available to pass in, but there isn't one, and anyway, the log handler doesn't use it, so I've passed in a `TODO` instead.

Everything else is just normal import/rename changes.

Testing Done:
Ran `go run . run`

Reviewed at https://reviews.imfreedom.org/r/2871/
// Convey
// Copyright 2016-2019 Gary Kramlich <grim@reaperworld.com>
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
package tasks
import (
"fmt"
"log/slog"
"path/filepath"
"keep.imfreedom.org/grim/convey/environment"
"keep.imfreedom.org/grim/convey/fs"
"keep.imfreedom.org/grim/convey/runtime"
"keep.imfreedom.org/grim/convey/yaml"
)
type Import struct {
Files yaml.StringOrSlice `yaml:"files"`
Path string `yaml:"path"`
}
// New creates a new Import task.
func (i *Import) New() runtime.Task {
return &Import{}
}
// Valid validates the export task.
func (i *Import) Valid() error {
if len(i.Files) == 0 {
return ErrNoFiles
}
return nil
}
// Execute runs the task.
func (i *Import) Execute(name string, logger *slog.Logger, env environment.Environment, rt *runtime.Runtime) error {
fullEnv := env.Copy().Merge(rt.Environment)
for _, pattern := range i.Files {
pattern := fullEnv.Expand(pattern)
if pattern == "" {
continue
}
spec := fs.ParsePathSpec(pattern)
matches, err := filepath.Glob(filepath.Join(rt.ConfigPath, spec.Source()))
if err != nil {
return err
}
if len(matches) == 0 {
return fmt.Errorf("no matches found for %s", spec.Source())
}
for _, match := range matches {
ws, err := rt.Workspace()
if err != nil {
return err
}
err = ws.Import(match, spec.Destination())
if err != nil {
return err
}
}
}
return nil
}
func (i *Import) Deprecated() error {
return nil
}