Skip to content

Commit

Permalink
Custom HTTP User-Agent, move version to internal package
Browse files Browse the repository at this point in the history
  • Loading branch information
isobit committed Jun 29, 2024
1 parent 1aad4f3 commit a9d614d
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
NAME := ndog

VERSION := $(if $(VERSION),$(VERSION),$(shell git describe --tags --match 'v*' HEAD))
LDFLAGS := -X main.Version=$(VERSION)
LDFLAGS := -X github.com/isobit/ndog/internal/version.Version=$(VERSION)

.PHONY: all build fmt test lint

Expand Down
7 changes: 5 additions & 2 deletions internal/schemes/http/connect.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/isobit/ndog/internal"
"github.com/isobit/ndog/internal/log"
"github.com/isobit/ndog/internal/util"
"github.com/isobit/ndog/internal/version"
)

type connectOptions struct {
Expand All @@ -31,8 +32,10 @@ var connectOptionHelpGraphql = ndog.OptionsHelp{}.

func extractConnectOptions(opts ndog.Options, subscheme string) (connectOptions, error) {
o := connectOptions{
Method: "GET",
Headers: map[string]string{},
Method: "GET",
Headers: map[string]string{
"User-Agent": fmt.Sprintf("ndog/%s", version.Version),
},
}

switch subscheme {
Expand Down
3 changes: 3 additions & 0 deletions internal/version/version.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package version

var Version string = "unknown"
5 changes: 2 additions & 3 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@ import (
ndog_log "github.com/isobit/ndog/internal/log"
"github.com/isobit/ndog/internal/schemes"
ndog_tls "github.com/isobit/ndog/internal/tls"
ndog_version "github.com/isobit/ndog/internal/version"
)

var Version string = "unknown"

func main() {
if stderrStat, err := os.Stderr.Stat(); err == nil {
if stderrStat.Mode()&os.ModeCharDevice != 0 {
Expand Down Expand Up @@ -67,7 +66,7 @@ func (cmd Ndog) Run() error {
return schemeHelp(cmd.SchemeHelp)
}
if cmd.Version {
fmt.Fprintln(os.Stderr, Version)
fmt.Fprintln(os.Stderr, ndog_version.Version)
return nil
}

Expand Down

0 comments on commit a9d614d

Please sign in to comment.