Merge pull request #74 from SaaldjorMike/mike/custom_useragent

Allow custom 'User-Agent' header

api/client.go

@@ -13,12 +13,15 @@ import (
 	"github.com/shurcooL/graphql"
 )
 
+const defaultUserAgent = "Humio-go-client/unknown"
+
 type Client struct {
 	config Config
 }
 
 type Config struct {
 	Address           *url.URL
+	UserAgent         string
 	Token             string
 	CACertificatePEM  string
 	Insecure          bool
@@ -57,6 +60,10 @@ func NewClient(config Config) *Client {
 		config.Address.Path = config.Address.Path + "/"
 	}
 
+	if config.UserAgent == "" {
+		config.UserAgent = defaultUserAgent
+	}
+
 	return &Client{
 		config: config,
 	}
@@ -73,6 +80,10 @@ func (c *Client) headers() map[string]string {
 		headers["ProxyOrganization"] = c.config.ProxyOrganization
 	}
 
+	if c.config.UserAgent != "" {
+		headers["User-Agent"] = c.config.UserAgent
+	}
+
 	return headers
 }
 

cmd/humioctl/root.go

@@ -223,6 +223,7 @@ func newApiClientE(cmd *cobra.Command, opts ...func(config *api.Config)) (*api.C
 	config.CACertificatePEM = viper.GetString(viperkey.CACertificate)
 	config.Insecure = viper.GetBool(viperkey.Insecure)
 	config.ProxyOrganization = viper.GetString(viperkey.ProxyOrganization)
+	config.UserAgent = fmt.Sprintf("humioctl/%s (%s on %s)", version, commit, date)
 
 	for _, opt := range opts {
 		opt(&config)