Allow appending to UserAgent with ldflag

PagerDuty · Jul 31, 2024 · 5515015 · 5515015
1 parent a706ae2
commit 5515015
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/pagerduty/config.go b/pagerduty/config.go
@@ -8,6 +8,7 @@ import (
  "sync"
  "time"
 
+ "github.com/PagerDuty/terraform-provider-pagerduty/util"
  "github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging"
  "github.com/heimweh/go-pagerduty/pagerduty"
  "github.com/heimweh/go-pagerduty/persistentconfig"
@@ -98,6 +99,13 @@ func (c *Config) Client() (*pagerduty.Client, error) {
  APIAuthTokenType: c.APITokenType,
  }
 
+ if util.UserAgentAppend != "" {
+ if config.UserAgent == "" {
+ config.UserAgent = "heimweh/go-pagerduty(terraform)"
+ }
+ config.UserAgent += " " + util.UserAgentAppend
+ }
+
  client, err := pagerduty.NewClient(config)
  if err != nil {
  return nil, err
@@ -149,6 +157,13 @@ func (c *Config) SlackClient() (*pagerduty.Client, error) {
  UserAgent: c.UserAgent,
  }
 
+ if util.UserAgentAppend != "" {
+ if config.UserAgent == "" {
+ config.UserAgent = "heimweh/go-pagerduty(terraform)"
+ }
+ config.UserAgent += " " + util.UserAgentAppend
+ }
+
  client, err := pagerduty.NewClient(config)
  if err != nil {
  return nil, err

diff --git a/pagerdutyplugin/config.go b/pagerdutyplugin/config.go
@@ -92,10 +92,15 @@ func (c *Config) Client(ctx context.Context) (*pagerduty.Client, error) {
  maxRetries := 1
  retryInterval := 60 // seconds
 
+ userAgentVersion := c.TerraformVersion
+ if util.UserAgentAppend != "" {
+ userAgentVersion += " " + util.UserAgentAppend
+ }
+
  clientOpts := []pagerduty.ClientOptions{
  WithHTTPClient(httpClient),
  pagerduty.WithAPIEndpoint(apiURL),
- pagerduty.WithTerraformProvider(c.TerraformVersion),
+ pagerduty.WithTerraformProvider(userAgentVersion),
  pagerduty.WithRetryPolicy(maxRetries, retryInterval),
  }
 

diff --git a/util/util.go b/util/util.go
@@ -492,3 +492,5 @@ func CheckJSONEqual(expected string) resource.CheckResourceAttrWithFunc {
  return nil
  })
 }
+
+var UserAgentAppend string