kgess-mirror/opentofu-terraform-provider-vault
1
0
Fork 0
mirror of https://github.com/opentofu/terraform-provider-vault.git synced 2026-01-11 19:46:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

add UUID at INFO (#2139)

Browse source 
* add UUID at INFO

* Updating changelog

* Removing unneeded print statement

* Modifying const content, removing standalone printf msgs

* removing blank line

* Missed a second blank line

* Updating changelog
This commit is contained in:
Conor McCullough 2024-02-24 02:37:53 +11:00 • committed by GitHub
parent 8b2ec9192b
commit fad5a4de36
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -5,6 +5,7 @@ BUGS:
FEATURES:
* Add support for `skip_import_rotation` and `skip_static_role_import_rotation` in `ldap_secret_backend_static_role` and `ldap_secret_backend` respectively. Requires Vault 1.16+ ([#2128](https://github.com/hashicorp/terraform-provider-vault/pull/2128)).
* Improve logging to track full API exchanges between the provider and Vault ([#2139](https://github.com/hashicorp/terraform-provider-vault/pull/2139))
## 3.25.0 (Feb 14, 2024)

11
helper/transport.go
View file

@ -10,6 +10,7 @@ import (
"crypto/tls"
"encoding/json"
"fmt"
"github.com/google/uuid"
"log"
"net/http"
"net/http/httputil"
@ -56,6 +57,7 @@ func DefaultTransportOptions() *TransportOptions {
if logBody, err := strconv.ParseBool(os.Getenv(EnvLogBody)); err == nil {
opts.LogRequestBody = logBody
opts.LogResponseBody = logBody
} else {
if logRequestBody, err := strconv.ParseBool(os.Getenv(EnvLogRequestBody)); err == nil {
opts.LogRequestBody = logRequestBody
@ -89,6 +91,7 @@ func (t *TransportWrapper) SetTLSConfig(c *tls.Config) error {
}
func (t *TransportWrapper) RoundTrip(req *http.Request) (*http.Response, error) {
transportID := uuid.New().String()
if logging.IsDebugOrHigher() {
var origHeaders http.Header
if len(t.options.HMACRequestHeaders) > 0 && len(req.Header) > 0 {
@ -108,7 +111,7 @@ func (t *TransportWrapper) RoundTrip(req *http.Request) (*http.Response, error)
reqData, err := httputil.DumpRequestOut(req, t.options.LogRequestBody)
if err == nil {
log.Printf("[DEBUG] "+logReqMsg, t.name, prettyPrintJsonLines(reqData))
log.Printf("[DEBUG] "+logReqMsg, transportID, t.name, prettyPrintJsonLines(reqData))
} else {
log.Printf("[ERROR] %s API Request error: %#v", t.name, err)
}
@ -126,7 +129,7 @@ func (t *TransportWrapper) RoundTrip(req *http.Request) (*http.Response, error)
if logging.IsDebugOrHigher() {
respData, err := httputil.DumpResponse(resp, t.options.LogResponseBody)
if err == nil {
log.Printf("[DEBUG] "+logRespMsg, t.name, prettyPrintJsonLines(respData))
log.Printf("[DEBUG] "+logRespMsg, transportID, t.name, prettyPrintJsonLines(respData))
} else {
log.Printf("[ERROR] %s API Response error: %#v", t.name, err)
}
@ -157,12 +160,12 @@ func prettyPrintJsonLines(b []byte) string {
return strings.Join(parts, "\n")
}
const logReqMsg = `%s API Request Details:
const logReqMsg = `[%s] %s API Request Details:
---[ REQUEST ]---------------------------------------
%s
-----------------------------------------------------`
const logRespMsg = `%s API Response Details:
const logRespMsg = `[%s] %s API Response Details:
---[ RESPONSE ]--------------------------------------
%s
-----------------------------------------------------`