From dcf9b04c342fe4b90b6733e3dde47ac5c580e8c9 Mon Sep 17 00:00:00 2001
From: hc-github-team-consul-core <github-team-consul-core@hashicorp.com>
Date: Thu, 8 Jun 2023 12:45:28 -0400
Subject: [PATCH] Backport of backport ent changes to oss into release/1.16.x
 (#17617)

* backport of commit dc9c08d3b8cc1eda95a05a8b041ab2a3a5248dd0

* backport of commit 1271705a5cce5fe5e9487fed2ac965ab7aac3d59

---------

Co-authored-by: Ronald Ekambi <ronekambi@gmail.com>
Co-authored-by: Ronald <roncodingenthusiast@users.noreply.github.com>
---
 .changelog/_5669.txt   |  3 +++
 api/api_test.go        | 16 ++++++++++++++++
 sdk/testutil/server.go |  6 ++++++
 3 files changed, 25 insertions(+)
 create mode 100644 .changelog/_5669.txt

diff --git a/.changelog/_5669.txt b/.changelog/_5669.txt
new file mode 100644
index 000000000..6528460e6
--- /dev/null
+++ b/.changelog/_5669.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+audit-logging: **(Enterprise only)** enable error response and request body logging
+```
\ No newline at end of file
diff --git a/api/api_test.go b/api/api_test.go
index 49670b41e..4d5dd1fda 100644
--- a/api/api_test.go
+++ b/api/api_test.go
@@ -53,6 +53,22 @@ func makeACLClient(t *testing.T) (*Client, *testutil.TestServer) {
 	})
 }
 
+// Makes a client with Audit enabled, it requires ACLs
+func makeAuditClient(t *testing.T) (*Client, *testutil.TestServer) {
+	return makeClientWithConfig(t, func(clientConfig *Config) {
+		clientConfig.Token = "root"
+	}, func(serverConfig *testutil.TestServerConfig) {
+		serverConfig.PrimaryDatacenter = "dc1"
+		serverConfig.ACL.Tokens.InitialManagement = "root"
+		serverConfig.ACL.Tokens.Agent = "root"
+		serverConfig.ACL.Enabled = true
+		serverConfig.ACL.DefaultPolicy = "deny"
+		serverConfig.Audit = &testutil.TestAuditConfig{
+			Enabled: true,
+		}
+	})
+}
+
 func makeNonBootstrappedACLClient(t *testing.T, defaultPolicy string) (*Client, *testutil.TestServer) {
 	return makeClientWithConfig(t,
 		func(clientConfig *Config) {
diff --git a/sdk/testutil/server.go b/sdk/testutil/server.go
index 1c7167d98..d00850d5e 100644
--- a/sdk/testutil/server.go
+++ b/sdk/testutil/server.go
@@ -75,6 +75,11 @@ type TestNetworkSegment struct {
 	Advertise string `json:"advertise"`
 }
 
+// TestAudigConfig contains the configuration for Audit
+type TestAuditConfig struct {
+	Enabled bool `json:"enabled,omitempty"`
+}
+
 // Locality is used as the TestServerConfig's Locality.
 type Locality struct {
 	Region string `json:"region"`
@@ -124,6 +129,7 @@ type TestServerConfig struct {
 	Stderr              io.Writer              `json:"-"`
 	Args                []string               `json:"-"`
 	ReturnPorts         func()                 `json:"-"`
+	Audit               *TestAuditConfig       `json:"audit,omitempty"`
 }
 
 type TestACLs struct {