eric/weatherreporter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Remove unused report output config

Browse Source
This commit is contained in:
Eric Rakestraw
2026-05-29 20:36:29 +00:00
parent 1355605e70
commit 4f45dee332
6 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
internal/cli/root.go
View File

@@ -223,7 +223,6 @@ func (r Runner) resolveGenerate(args []string) (app.GenerateRequest, error) {
Path: opts.ConfigPath, Path: opts.ConfigPath,
Units: opts.Units, Units: opts.Units,
Timezone: opts.Timezone, Timezone: opts.Timezone,
Output: opts.Output,
}) })
if err != nil { if err != nil {
return app.GenerateRequest{}, err return app.GenerateRequest{}, err

6
internal/config/config.go
View File

@@ -17,7 +17,6 @@ type Config struct {
MissingSource MissingSourceConfig `yaml:"missing_source"` MissingSource MissingSourceConfig `yaml:"missing_source"`
Scriptorium ScriptoriumConfig `yaml:"scriptorium"` Scriptorium ScriptoriumConfig `yaml:"scriptorium"`
Workspace WorkspaceConfig `yaml:"workspace"` Workspace WorkspaceConfig `yaml:"workspace"`
Reports ReportOutputConfig `yaml:"reports"`
Dayparts []DaypartConfig `yaml:"dayparts"` Dayparts []DaypartConfig `yaml:"dayparts"`
RecentChange RecentChangeConfig `yaml:"recent_change"` RecentChange RecentChangeConfig `yaml:"recent_change"`
} }
@@ -52,11 +51,6 @@ type WorkspaceConfig struct {
PreflightDir string `yaml:"preflight_dir"` PreflightDir string `yaml:"preflight_dir"`
} }
type ReportOutputConfig struct {
OutputDir string `yaml:"output_dir"`
Paths map[string]string `yaml:"paths"`
}
type DaypartConfig struct { type DaypartConfig struct {
Name string `yaml:"name"` Name string `yaml:"name"`
Start string `yaml:"start"` Start string `yaml:"start"`

5
internal/config/config_test.go
View File

@@ -92,7 +92,7 @@ func TestInvalidConfigProducesActionableError(t *testing.T) {
} }
func TestLoadAppliesOverrides(t *testing.T) { func TestLoadAppliesOverrides(t *testing.T) {
cfg, err := Load(LoadOptions{Units: "metric", Timezone: "+09:30", Output: "./out"}) cfg, err := Load(LoadOptions{Units: "metric", Timezone: "+09:30"})
if err != nil { if err != nil {
t.Fatalf("Load() error = %v", err) t.Fatalf("Load() error = %v", err)
} }
@@ -102,7 +102,4 @@ func TestLoadAppliesOverrides(t *testing.T) {
if cfg.WeatherAPI.Timezone != "+09:30" { if cfg.WeatherAPI.Timezone != "+09:30" {
t.Fatalf("Timezone = %q, want +09:30", cfg.WeatherAPI.Timezone) t.Fatalf("Timezone = %q, want +09:30", cfg.WeatherAPI.Timezone)
} }
if cfg.Reports.OutputDir != "./out" {
t.Fatalf("OutputDir = %q, want ./out", cfg.Reports.OutputDir)
}
} }

4
internal/config/defaults.go
View File

@@ -28,10 +28,6 @@ func Defaults() Config {
DataPackagesDir: "data-packages", DataPackagesDir: "data-packages",
PreflightDir: "preflight", PreflightDir: "preflight",
}, },
Reports: ReportOutputConfig{
OutputDir: "reports",
Paths: map[string]string{},
},
Dayparts: []DaypartConfig{ Dayparts: []DaypartConfig{
{Name: "overnight", Start: "00:00", End: "06:00"}, {Name: "overnight", Start: "00:00", End: "06:00"},
{Name: "morning", Start: "06:00", End: "12:00"}, {Name: "morning", Start: "06:00", End: "12:00"},

7
internal/config/load.go
View File

@@ -12,7 +12,6 @@ type LoadOptions struct {
Path string Path string
Units string Units string
Timezone string Timezone string
Output string
} }
func Load(opts LoadOptions) (Config, error) { func Load(opts LoadOptions) (Config, error) {
@@ -35,9 +34,6 @@ func Load(opts LoadOptions) (Config, error) {
if opts.Timezone != "" { if opts.Timezone != "" {
cfg.WeatherAPI.Timezone = opts.Timezone cfg.WeatherAPI.Timezone = opts.Timezone
} }
if opts.Output != "" {
cfg.Reports.OutputDir = opts.Output
}
if err := Validate(cfg); err != nil { if err := Validate(cfg); err != nil {
return Config{}, err return Config{}, err
@@ -61,8 +57,5 @@ func mergeFile(cfg *Config, path string) error {
if cfg.MissingSource.Sources == nil { if cfg.MissingSource.Sources == nil {
cfg.MissingSource.Sources = map[string]MissingSourcePolicy{} cfg.MissingSource.Sources = map[string]MissingSourcePolicy{}
} }
if cfg.Reports.Paths == nil {
cfg.Reports.Paths = map[string]string{}
}
return nil return nil
} }

3
internal/config/validate.go
View File

@@ -58,9 +58,6 @@ func Validate(cfg Config) error {
if cfg.Workspace.Root == "" { if cfg.Workspace.Root == "" {
return fmt.Errorf("workspace.root is required") return fmt.Errorf("workspace.root is required")
} }
if cfg.Reports.OutputDir == "" {
return fmt.Errorf("reports.output_dir is required")
}
if len(cfg.Dayparts) == 0 { if len(cfg.Dayparts) == 0 {
return fmt.Errorf("dayparts must contain at least one entry") return fmt.Errorf("dayparts must contain at least one entry")
} }