diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index edab4b2..881b3d1 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -17,6 +17,10 @@ jobs: - uses: actions/setup-go@v6 with: go-version: 1.26.0 + - name: go fix + run: | + go fix ./... + git diff --exit-code - name: golangci-lint uses: golangci/golangci-lint-action@v9 with: diff --git a/Taskfile.yaml b/Taskfile.yaml index 461657a..e713a4d 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -11,16 +11,22 @@ tasks: desc: Run fmt, tidy, and lint. cmds: - task: fmt + - task: fix - task: tidy - task: lint fmt: - desc: Run linters + desc: Run format deps: - install-golangci-lint cmds: - "{{.GOLANGCI}} fmt" + fix: + desc: Run go fix + cmds: + - go fix ./... + tidy: desc: Run go mod tidy. cmds: diff --git a/internal/config/cli.go b/internal/config/cli.go index 5ae615f..a79829e 100644 --- a/internal/config/cli.go +++ b/internal/config/cli.go @@ -10,7 +10,6 @@ import ( "go.aykhans.me/sarin/internal/types" versionpkg "go.aykhans.me/sarin/internal/version" - "go.aykhans.me/utils/common" ) const cliUsageText = `Usage: @@ -202,23 +201,23 @@ func (parser ConfigCLIParser) Parse() (*Config, error) { switch flagVar.Name { // General config case "show-config", "s": - config.ShowConfig = common.ToPtr(showConfig) + config.ShowConfig = new(showConfig) case "config-file", "f": for _, configFile := range configFiles { config.Files = append(config.Files, *types.ParseConfigFile(configFile)) } case "concurrency", "c": - config.Concurrency = common.ToPtr(concurrency) + config.Concurrency = new(concurrency) case "requests", "r": - config.Requests = common.ToPtr(requestCount) + config.Requests = new(requestCount) case "duration", "d": - config.Duration = common.ToPtr(duration) + config.Duration = new(duration) case "quiet", "q": - config.Quiet = common.ToPtr(quiet) + config.Quiet = new(quiet) case "output", "o": - config.Output = common.ToPtr(ConfigOutputType(output)) + config.Output = new(ConfigOutputType(output)) case "dry-run", "z": - config.DryRun = common.ToPtr(dryRun) + config.DryRun = new(dryRun) // Request config case "url", "U": @@ -251,9 +250,9 @@ func (parser ConfigCLIParser) Parse() (*Config, error) { case "values", "V": config.Values = append(config.Values, values...) case "timeout", "T": - config.Timeout = common.ToPtr(timeout) + config.Timeout = new(timeout) case "insecure", "I": - config.Insecure = common.ToPtr(insecure) + config.Insecure = new(insecure) case "lua": config.Lua = append(config.Lua, luaScripts...) case "js": diff --git a/internal/config/config.go b/internal/config/config.go index 6a72219..a70bfb5 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -356,26 +356,26 @@ func (config *Config) SetDefaults() { config.Timeout = &Defaults.RequestTimeout } if config.Concurrency == nil { - config.Concurrency = common.ToPtr(Defaults.Concurrency) + config.Concurrency = new(Defaults.Concurrency) } if config.ShowConfig == nil { - config.ShowConfig = common.ToPtr(Defaults.ShowConfig) + config.ShowConfig = new(Defaults.ShowConfig) } if config.Quiet == nil { - config.Quiet = common.ToPtr(Defaults.Quiet) + config.Quiet = new(Defaults.Quiet) } if config.Insecure == nil { - config.Insecure = common.ToPtr(Defaults.Insecure) + config.Insecure = new(Defaults.Insecure) } if config.DryRun == nil { - config.DryRun = common.ToPtr(Defaults.DryRun) + config.DryRun = new(Defaults.DryRun) } if !config.Headers.Has("User-Agent") { config.Headers = append(config.Headers, types.Header{Key: "User-Agent", Value: []string{Defaults.UserAgent}}) } if config.Output == nil { - config.Output = common.ToPtr(Defaults.Output) + config.Output = new(Defaults.Output) } } diff --git a/internal/config/env.go b/internal/config/env.go index 6736b9a..b273a75 100644 --- a/internal/config/env.go +++ b/internal/config/env.go @@ -7,7 +7,6 @@ import ( "time" "go.aykhans.me/sarin/internal/types" - "go.aykhans.me/utils/common" utilsParse "go.aykhans.me/utils/parser" ) @@ -67,7 +66,7 @@ func (parser ConfigENVParser) Parse() (*Config, error) { } if output := parser.getEnv("OUTPUT"); output != "" { - config.Output = common.ToPtr(ConfigOutputType(output)) + config.Output = new(ConfigOutputType(output)) } if insecure := parser.getEnv("INSECURE"); insecure != "" { diff --git a/internal/config/file.go b/internal/config/file.go index 35dc5fa..2468b90 100644 --- a/internal/config/file.go +++ b/internal/config/file.go @@ -12,7 +12,6 @@ import ( "time" "go.aykhans.me/sarin/internal/types" - "go.aykhans.me/utils/common" "go.yaml.in/yaml/v4" ) @@ -241,7 +240,7 @@ func (parser ConfigFileParser) ParseYAML(data []byte) (*Config, error) { config.Quiet = parsedData.Quiet if parsedData.Output != nil { - config.Output = common.ToPtr(ConfigOutputType(*parsedData.Output)) + config.Output = new(ConfigOutputType(*parsedData.Output)) } config.Insecure = parsedData.Insecure