CRED-2147: Regenerated client code from templates

Author: tausman

api/datadog/client.go

@@ -26,6 +26,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+	"unicode/utf8"
 
 	"golang.org/x/oauth2"
 )
@@ -87,12 +88,16 @@ func UseDelegatedTokenAuth(ctx context.Context, headerParams *map[string]string,
 
 // SetAuthKeys sets the appropriate values in the headers parameter.
 func SetAuthKeys(ctx context.Context, headerParams *map[string]string, keys ...[2]string) {
-	if ctx != nil {
-		for _, key := range keys {
-			if auth, ok := ctx.Value(ContextAPIKeys).(map[string]APIKey); ok {
-				if apiKey, ok := auth[key[0]]; ok {
-					(*headerParams)[key[1]] = apiKey.Key
-				}
+	if ctx == nil {
+		return
+	}
+	if bearerToken, ok := ctx.Value(ContextBearerToken).(string); ok {
+		(*headerParams)[authorizationHeader] = fmt.Sprintf(bearerTokenFormat, bearerToken)
+	}
+	for _, key := range keys {
+		if auth, ok := ctx.Value(ContextAPIKeys).(map[string]APIKey); ok {
+			if apiKey, ok := auth[key[0]]; ok {
+				(*headerParams)[key[1]] = apiKey.Key
 			}
 		}
 	}
@@ -181,6 +186,10 @@ func (c *APIClient) CallAPI(request *http.Request) (*http.Response, error) {
 					dump = valueRegex.ReplaceAll(dump, []byte("REDACTED"))
 				}
 			}
+			if bearerToken, ok := newRequest.Context().Value(ContextBearerToken).(string); ok {
+				valueRegex := regexp.MustCompile(fmt.Sprintf("(?m)%s", bearerToken))
+				dump = valueRegex.ReplaceAll(dump, []byte("REDACTED"))
+			}
 			log.Printf("\n%s\n", string(dump))
 		}
 		resp, requestErr := c.Cfg.HTTPClient.Do(newRequest)

api/datadog/configuration.go

@@ -62,6 +62,9 @@ var (
 
 	// ContextOperationServerVariables overrides a server configuration variables using operation specific values.
 	ContextOperationServerVariables = contextKey("serverOperationVariables")
+
+	// ContextBearerToken takes a bearer token (e.g. PAT) as authentication for the request.
+	ContextBearerToken = contextKey("bearerToken")
 )
 
 // BasicAuth provides basic http authentication to a request passed via context using ContextBasicAuth.
@@ -1081,6 +1084,9 @@ func NewDefaultContext(ctx context.Context) context.Context {
 	if apiKey, ok := os.LookupEnv("DD_APP_KEY"); ok {
 		keys["appKeyAuth"] = APIKey{Key: apiKey}
 	}
+	if bearerToken, ok := os.LookupEnv("DD_BEARER_TOKEN"); ok {
+		ctx = context.WithValue(ctx, ContextBearerToken, bearerToken)
+	}
 	ctx = context.WithValue(
 		ctx,
 		ContextAPIKeys,

api/datadog/utils.go

@@ -11,7 +11,6 @@ import (
 	"reflect"
 	"strings"
 	"time"
-	"unicode/utf8"
 
 	"github.com/google/uuid"
 )

api/datadog/zstd.go

@@ -8,7 +8,6 @@ package datadog
 
 import (
 	"bytes"
-
 	"github.com/DataDog/zstd"
 )
 

api/datadogV1/api_authentication.go

@@ -5,7 +5,11 @@
 package datadogV1
 
 import (
+	"bytes"
 	_context "context"
+	_fmt "fmt"
+	_io "io"
+	_log "log"
 	_nethttp "net/http"
 	_neturl "net/url"
 

api/datadogV1/api_aws_integration.go

@@ -5,7 +5,11 @@
 package datadogV1
 
 import (
+	"bytes"
 	_context "context"
+	_fmt "fmt"
+	_io "io"
+	_log "log"
 	_nethttp "net/http"
 	_neturl "net/url"
 

api/datadogV1/api_aws_logs_integration.go

@@ -5,7 +5,11 @@
 package datadogV1
 
 import (
+	"bytes"
 	_context "context"
+	_fmt "fmt"
+	_io "io"
+	_log "log"
 	_nethttp "net/http"
 	_neturl "net/url"
 

api/datadogV1/api_azure_integration.go

@@ -5,7 +5,11 @@
 package datadogV1
 
 import (
+	"bytes"
 	_context "context"
+	_fmt "fmt"
+	_io "io"
+	_log "log"
 	_nethttp "net/http"
 	_neturl "net/url"
 

api/datadogV1/api_dashboard_lists.go

@@ -5,7 +5,11 @@
 package datadogV1
 
 import (
+	"bytes"
 	_context "context"
+	_fmt "fmt"
+	_io "io"
+	_log "log"
 	_nethttp "net/http"
 	_neturl "net/url"
 

api/datadogV1/api_dashboards.go

@@ -5,7 +5,11 @@
 package datadogV1
 
 import (
+	"bytes"
 	_context "context"
+	_fmt "fmt"
+	_io "io"
+	_log "log"
 	_nethttp "net/http"
 	_neturl "net/url"