Adjust unit tests.

hashicorp · Dec 23, 2024 · 5524f27 · 5524f27
1 parent 728af4b
commit 5524f27
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/builtin/credential/cert/backend_test.go b/builtin/credential/cert/backend_test.go
@@ -25,6 +25,7 @@ import (
 	"os"
 	"path/filepath"
 	"reflect"
+	"strings"
 	"testing"
 	"time"
 
@@ -319,7 +320,14 @@ func TestBackend_PermittedDNSDomainsIntermediateCA(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	intermediateCertPEM := secret.Data["certificate"].(string)
+	var intermediateCertPEM string
+	{
+		var certs []string
+		for _, cert := range secret.Data["ca_chain"].([]interface{}) {
+			certs = append(certs, cert.(string))
+		}
+		intermediateCertPEM = strings.Join(certs, "\n")
+	}
 
 	// Configure the intermediate cert as the CA in /pki2
 	_, err = client.Logical().Write("pki2/intermediate/set-signed", map[string]interface{}{

diff --git a/command/agent/cert_end_to_end_test.go b/command/agent/cert_end_to_end_test.go
@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"strings"
 	"testing"
 	"time"
 
@@ -373,7 +374,14 @@ func TestCertEndToEnd_CertsInConfig(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	intermediateCertPEM := secret.Data["certificate"].(string)
+	var intermediateCertPEM string
+	{
+		var certs []string
+		for _, cert := range secret.Data["ca_chain"].([]interface{}) {
+			certs = append(certs, cert.(string))
+		}
+		intermediateCertPEM = strings.Join(certs, "\n")
+	}
 
 	// Configure the intermediate cert as the CA in /pki2
 	_, err = client.Logical().Write("pki2/intermediate/set-signed", map[string]interface{}{