chore(loo-4798): set user-agent header (#31)

Author: notnmeyer

cmd/api_key.go

@@ -9,7 +9,7 @@ import (
 )
 
 func runAPIKey(cfg *config.Config) (*api.APIKeyResponse, error) {
-	return api.NewClient(cfg.EndpointURL, cfg.APIKey, cfg.Debug).GetAPIKey()
+	return newAPIClient(cfg).GetAPIKey()
 }
 
 var apiKeyCmd = &cobra.Command{

cmd/auth_login.go

@@ -66,7 +66,7 @@ func runAuthLogin(apiKey, name string, skipVerify bool) (*api.APIKeyResponse, er
 		}
 		return nil, nil
 	}
-	result, err := api.NewClient(config.EndpointURL(), apiKey, debugFlag).GetAPIKey()
+	result, err := newAPIClient(&config.Config{EndpointURL: config.EndpointURL(), APIKey: apiKey, Debug: debugFlag}).GetAPIKey()
 	if err != nil {
 		return nil, fmt.Errorf("API key verification failed: %w", err)
 	}

cmd/auth_status.go

@@ -47,7 +47,7 @@ func runAuthStatus() (*config.Config, *api.APIKeyResponse, *config.PersistentCon
 	if err != nil {
 		return nil, nil, nil, err
 	}
-	keyResp, err := api.NewClient(cfg.EndpointURL, cfg.APIKey, cfg.Debug).GetAPIKey()
+	keyResp, err := newAPIClient(cfg).GetAPIKey()
 	if err != nil {
 		return nil, nil, nil, fmt.Errorf("API key verification failed: %w", err)
 	}

cmd/contact_properties.go

@@ -9,11 +9,11 @@ import (
 )
 
 func runContactPropertiesList(cfg *config.Config, customOnly bool) ([]api.ContactProperty, error) {
-	return api.NewClient(cfg.EndpointURL, cfg.APIKey, cfg.Debug).ListContactProperties(customOnly)
+	return newAPIClient(cfg).ListContactProperties(customOnly)
 }
 
 func runContactPropertiesCreate(cfg *config.Config, name, propType string) error {
-	return api.NewClient(cfg.EndpointURL, cfg.APIKey, cfg.Debug).CreateContactProperty(name, propType)
+	return newAPIClient(cfg).CreateContactProperty(name, propType)
 }
 
 var contactPropertiesCmd = &cobra.Command{

cmd/contacts.go

@@ -77,7 +77,7 @@ func contactFieldParamsFromCmd(cmd *cobra.Command) (contactFieldParams, error) {
 // find
 
 func runContactsFind(cfg *config.Config, email, userID string) ([]api.Contact, error) {
-	return api.NewClient(cfg.EndpointURL, cfg.APIKey, cfg.Debug).FindContacts(api.FindContactParams{
+	return newAPIClient(cfg).FindContacts(api.FindContactParams{
 		Email:  email,
 		UserID: userID,
 	})
@@ -149,7 +149,7 @@ type contactCreateResult struct {
 }
 
 func runContactsCreate(cfg *config.Config, req api.CreateContactRequest) (string, error) {
-	return api.NewClient(cfg.EndpointURL, cfg.APIKey, cfg.Debug).CreateContact(req)
+	return newAPIClient(cfg).CreateContact(req)
 }
 
 var contactsCreateCmd = &cobra.Command{
@@ -196,7 +196,7 @@ var contactsCreateCmd = &cobra.Command{
 // update
 
 func runContactsUpdate(cfg *config.Config, req api.UpdateContactRequest) error {
-	return api.NewClient(cfg.EndpointURL, cfg.APIKey, cfg.Debug).UpdateContact(req)
+	return newAPIClient(cfg).UpdateContact(req)
 }
 
 var contactsUpdateCmd = &cobra.Command{
@@ -244,7 +244,7 @@ var contactsUpdateCmd = &cobra.Command{
 // delete
 
 func runContactsDelete(cfg *config.Config, email, userID string) error {
-	return api.NewClient(cfg.EndpointURL, cfg.APIKey, cfg.Debug).DeleteContact(email, userID)
+	return newAPIClient(cfg).DeleteContact(email, userID)
 }
 
 var contactsDeleteCmd = &cobra.Command{

cmd/events.go

@@ -35,7 +35,7 @@ func parseMailingLists(pairs []string) (map[string]bool, error) {
 }
 
 func runEventsSend(cfg *config.Config, req api.SendEventRequest) error {
-	return api.NewClient(cfg.EndpointURL, cfg.APIKey, cfg.Debug).SendEvent(req)
+	return newAPIClient(cfg).SendEvent(req)
 }
 
 var eventsCmd = &cobra.Command{

cmd/lists.go

@@ -9,7 +9,7 @@ import (
 )
 
 func runListsList(cfg *config.Config) ([]api.MailingList, error) {
-	return api.NewClient(cfg.EndpointURL, cfg.APIKey, cfg.Debug).ListMailingLists()
+	return newAPIClient(cfg).ListMailingLists()
 }
 
 var listsCmd = &cobra.Command{

cmd/root.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/loops-so/cli/internal/api"
 	"github.com/loops-so/cli/internal/config"
 	"github.com/spf13/cobra"
 )
@@ -15,6 +16,11 @@ var outputFormat outputFlag = "text"
 var teamFlag string
 var debugFlag bool
 
+func newAPIClient(cfg *config.Config) *api.Client {
+	return api.NewClient(cfg.EndpointURL, cfg.APIKey, cfg.Debug).
+		WithUserAgent("loops-cli/" + version)
+}
+
 func loadConfig() (*config.Config, error) {
 	cfg, err := config.Load(teamFlag)
 	if err != nil {

cmd/transactional.go

@@ -64,7 +64,7 @@ func attachmentFromPath(path string) (api.Attachment, error) {
 }
 
 func runTransactionalList(cfg *config.Config, params api.PaginationParams) ([]api.TransactionalEmail, error) {
-	client := api.NewClient(cfg.EndpointURL, cfg.APIKey, cfg.Debug)
+	client := newAPIClient(cfg)
 	if params.Cursor != "" {
 		emails, _, err := client.ListTransactional(params)
 		return emails, err
@@ -78,7 +78,7 @@ func runTransactionalList(cfg *config.Config, params api.PaginationParams) ([]ap
 }
 
 func runTransactionalSend(cfg *config.Config, req api.SendTransactionalRequest) error {
-	return api.NewClient(cfg.EndpointURL, cfg.APIKey, cfg.Debug).SendTransactional(req)
+	return newAPIClient(cfg).SendTransactional(req)
 }
 
 var transactionalCmd = &cobra.Command{

internal/api/client.go

@@ -36,6 +36,7 @@ type Client struct {
 	apiKey     string
 	httpClient *http.Client
 	debug      bool
+	userAgent  string
 }
 
 func NewClient(baseURL, apiKey string, debug bool) *Client {
@@ -44,9 +45,15 @@ func NewClient(baseURL, apiKey string, debug bool) *Client {
 		apiKey:     apiKey,
 		httpClient: &http.Client{Timeout: 5 * time.Second},
 		debug:      debug,
+		userAgent:  "loops-go/dev",
 	}
 }
 
+func (c *Client) WithUserAgent(ua string) *Client {
+	c.userAgent = ua
+	return c
+}
+
 func errorFromResponse(resp *http.Response) *APIError {
 	var body struct {
 		Error   string `json:"error"`
@@ -119,6 +126,7 @@ func (c *Client) newRequest(method, path string, body io.Reader) (*http.Request,
 		return nil, err
 	}
 	req.Header.Set("Authorization", "Bearer "+c.apiKey)
+	req.Header.Set("User-Agent", c.userAgent)
 	if body != nil {
 		req.Header.Set("Content-Type", "application/json")
 	}