Skip to content

Commit

Permalink
google-api-go-client: enable user to add custom User-Agent
Browse files Browse the repository at this point in the history 
Change-Id: Ic76f44a744bc70100ee118ee3db76b8386530925
Reviewed-on: https://code-review.googlesource.com/2060
Reviewed-by: Brad Fitzpatrick <[email protected]>
  • Loading branch information
@gmlewis
gmlewis committed Mar 20, 2015
1 parent a59c135 commit 78fbf5a
Show file tree
Hide file tree
Showing 154 changed files with 12,866 additions and 15,282 deletions.
26 changes: 17 additions & 9 deletions adexchangebuyer/v1.2/adexchangebuyer-gen.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,22 @@ func New(client *http.Client) (*Service, error) {
}

type Service struct {
client *http.Client
BasePath string // API endpoint base URL
client *http.Client
BasePath string // API endpoint base URL
UserAgent string // optional additional User-Agent fragment

Accounts *AccountsService

Creatives *CreativesService
}

func (s *Service) userAgent() string {
if s.UserAgent == "" {
return googleapi.UserAgent
}
return googleapi.UserAgent + " " + s.UserAgent
}

func NewAccountsService(s *Service) *AccountsService {
rs := &AccountsService{s: s}
return rs
Expand Down Expand Up @@ -285,7 +293,7 @@ func (c *AccountsGetCall) Do() (*Account, error) {
googleapi.Expand(req.URL, map[string]string{
"id": strconv.FormatInt(c.id, 10),
})
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down Expand Up @@ -358,7 +366,7 @@ func (c *AccountsListCall) Do() (*AccountsList, error) {
urls += "?" + params.Encode()
req, _ := http.NewRequest("GET", urls, body)
googleapi.SetOpaque(req.URL)
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down Expand Up @@ -432,7 +440,7 @@ func (c *AccountsPatchCall) Do() (*Account, error) {
"id": strconv.FormatInt(c.id, 10),
})
req.Header.Set("Content-Type", ctype)
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down Expand Up @@ -520,7 +528,7 @@ func (c *AccountsUpdateCall) Do() (*Account, error) {
"id": strconv.FormatInt(c.id, 10),
})
req.Header.Set("Content-Type", ctype)
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down Expand Up @@ -604,7 +612,7 @@ func (c *CreativesGetCall) Do() (*Creative, error) {
"accountId": strconv.FormatInt(c.accountId, 10),
"buyerCreativeId": c.buyerCreativeId,
})
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down Expand Up @@ -692,7 +700,7 @@ func (c *CreativesInsertCall) Do() (*Creative, error) {
req, _ := http.NewRequest("POST", urls, body)
googleapi.SetOpaque(req.URL)
req.Header.Set("Content-Type", ctype)
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down Expand Up @@ -790,7 +798,7 @@ func (c *CreativesListCall) Do() (*CreativesList, error) {
urls += "?" + params.Encode()
req, _ := http.NewRequest("GET", urls, body)
googleapi.SetOpaque(req.URL)
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down
54 changes: 31 additions & 23 deletions adexchangebuyer/v1.3/adexchangebuyer-gen.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,9 @@ func New(client *http.Client) (*Service, error) {
}

type Service struct {
client *http.Client
BasePath string // API endpoint base URL
client *http.Client
BasePath string // API endpoint base URL
UserAgent string // optional additional User-Agent fragment

Accounts *AccountsService

Expand All @@ -81,6 +82,13 @@ type Service struct {
PretargetingConfig *PretargetingConfigService
}

func (s *Service) userAgent() string {
if s.UserAgent == "" {
return googleapi.UserAgent
}
return googleapi.UserAgent + " " + s.UserAgent
}

func NewAccountsService(s *Service) *AccountsService {
rs := &AccountsService{s: s}
return rs
Expand Down Expand Up @@ -683,7 +691,7 @@ func (c *AccountsGetCall) Do() (*Account, error) {
googleapi.Expand(req.URL, map[string]string{
"id": strconv.FormatInt(c.id, 10),
})
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down Expand Up @@ -756,7 +764,7 @@ func (c *AccountsListCall) Do() (*AccountsList, error) {
urls += "?" + params.Encode()
req, _ := http.NewRequest("GET", urls, body)
googleapi.SetOpaque(req.URL)
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down Expand Up @@ -830,7 +838,7 @@ func (c *AccountsPatchCall) Do() (*Account, error) {
"id": strconv.FormatInt(c.id, 10),
})
req.Header.Set("Content-Type", ctype)
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down Expand Up @@ -918,7 +926,7 @@ func (c *AccountsUpdateCall) Do() (*Account, error) {
"id": strconv.FormatInt(c.id, 10),
})
req.Header.Set("Content-Type", ctype)
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down Expand Up @@ -999,7 +1007,7 @@ func (c *BillingInfoGetCall) Do() (*BillingInfo, error) {
googleapi.Expand(req.URL, map[string]string{
"accountId": strconv.FormatInt(c.accountId, 10),
})
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down Expand Up @@ -1073,7 +1081,7 @@ func (c *BillingInfoListCall) Do() (*BillingInfoList, error) {
urls += "?" + params.Encode()
req, _ := http.NewRequest("GET", urls, body)
googleapi.SetOpaque(req.URL)
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down Expand Up @@ -1142,7 +1150,7 @@ func (c *BudgetGetCall) Do() (*Budget, error) {
"accountId": strconv.FormatInt(c.accountId, 10),
"billingId": strconv.FormatInt(c.billingId, 10),
})
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down Expand Up @@ -1240,7 +1248,7 @@ func (c *BudgetPatchCall) Do() (*Budget, error) {
"billingId": strconv.FormatInt(c.billingId, 10),
})
req.Header.Set("Content-Type", ctype)
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down Expand Up @@ -1341,7 +1349,7 @@ func (c *BudgetUpdateCall) Do() (*Budget, error) {
"billingId": strconv.FormatInt(c.billingId, 10),
})
req.Header.Set("Content-Type", ctype)
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down Expand Up @@ -1433,7 +1441,7 @@ func (c *CreativesGetCall) Do() (*Creative, error) {
"accountId": strconv.FormatInt(c.accountId, 10),
"buyerCreativeId": c.buyerCreativeId,
})
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down Expand Up @@ -1521,7 +1529,7 @@ func (c *CreativesInsertCall) Do() (*Creative, error) {
req, _ := http.NewRequest("POST", urls, body)
googleapi.SetOpaque(req.URL)
req.Header.Set("Content-Type", ctype)
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down Expand Up @@ -1640,7 +1648,7 @@ func (c *CreativesListCall) Do() (*CreativesList, error) {
urls += "?" + params.Encode()
req, _ := http.NewRequest("GET", urls, body)
googleapi.SetOpaque(req.URL)
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down Expand Up @@ -1748,7 +1756,7 @@ func (c *DirectDealsGetCall) Do() (*DirectDeal, error) {
googleapi.Expand(req.URL, map[string]string{
"id": strconv.FormatInt(c.id, 10),
})
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down Expand Up @@ -1821,7 +1829,7 @@ func (c *DirectDealsListCall) Do() (*DirectDealsList, error) {
urls += "?" + params.Encode()
req, _ := http.NewRequest("GET", urls, body)
googleapi.SetOpaque(req.URL)
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down Expand Up @@ -1914,7 +1922,7 @@ func (c *PerformanceReportListCall) Do() (*PerformanceReportList, error) {
urls += "?" + params.Encode()
req, _ := http.NewRequest("GET", urls, body)
googleapi.SetOpaque(req.URL)
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down Expand Up @@ -2021,7 +2029,7 @@ func (c *PretargetingConfigDeleteCall) Do() error {
"accountId": strconv.FormatInt(c.accountId, 10),
"configId": strconv.FormatInt(c.configId, 10),
})
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return err
Expand Down Expand Up @@ -2102,7 +2110,7 @@ func (c *PretargetingConfigGetCall) Do() (*PretargetingConfig, error) {
"accountId": strconv.FormatInt(c.accountId, 10),
"configId": strconv.FormatInt(c.configId, 10),
})
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down Expand Up @@ -2195,7 +2203,7 @@ func (c *PretargetingConfigInsertCall) Do() (*PretargetingConfig, error) {
"accountId": strconv.FormatInt(c.accountId, 10),
})
req.Header.Set("Content-Type", ctype)
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down Expand Up @@ -2276,7 +2284,7 @@ func (c *PretargetingConfigListCall) Do() (*PretargetingConfigList, error) {
googleapi.Expand(req.URL, map[string]string{
"accountId": strconv.FormatInt(c.accountId, 10),
})
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down Expand Up @@ -2365,7 +2373,7 @@ func (c *PretargetingConfigPatchCall) Do() (*PretargetingConfig, error) {
"configId": strconv.FormatInt(c.configId, 10),
})
req.Header.Set("Content-Type", ctype)
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down Expand Up @@ -2464,7 +2472,7 @@ func (c *PretargetingConfigUpdateCall) Do() (*PretargetingConfig, error) {
"configId": strconv.FormatInt(c.configId, 10),
})
req.Header.Set("Content-Type", ctype)
req.Header.Set("User-Agent", "google-api-go-client/0.5")
req.Header.Set("User-Agent", c.s.userAgent())
res, err := c.s.client.Do(req)
if err != nil {
return nil, err
Expand Down
Loading

0 comments on commit 78fbf5a

Please sign in to comment.