fix(openvpn): bundle provider CA certificates in one block (#3258)

internal/provider/utils/openvpn.go

@@ -175,8 +175,8 @@ func OpenVPNConfig(provider OpenVPNProviderSettings,
 		lines.add("setenv", envKey, envValue)
 	}
 
-	for _, ca := range provider.CAs {
+	if len(provider.CAs) > 0 {
-		lines.addLines(WrapOpenvpnCA(ca))
+		lines.addLines(WrapOpenvpnCAs(provider.CAs))
 	}
 	if provider.CRLVerify != "" {
 		lines.addLines(WrapOpenvpnCRLVerify(provider.CRLVerify))
@@ -268,13 +268,20 @@ func defaultStringSlice(value, defaultValue []string) (
 }
 
 func WrapOpenvpnCA(certificate string) (lines []string) {
-	return []string{
+	return WrapOpenvpnCAs([]string{certificate})
-		"<ca>",
+}
-		"-----BEGIN CERTIFICATE-----",
+
-		certificate,
+func WrapOpenvpnCAs(certificates []string) (lines []string) {
-		"-----END CERTIFICATE-----",
+	lines = append(lines, "<ca>")
-		"</ca>",
+	for _, certificate := range certificates {
+		lines = append(lines,
+			"-----BEGIN CERTIFICATE-----",
+			certificate,
+			"-----END CERTIFICATE-----",
+		)
 	}
+	lines = append(lines, "</ca>")
+	return lines
 }
 
 func WrapOpenvpnCert(clientCertificate string) (lines []string) {

internal/provider/utils/openvpn_test.go

@@ -0,0 +1,38 @@
+package utils
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestWrapOpenvpnCAs(t *testing.T) {
+	t.Parallel()
+
+	lines := WrapOpenvpnCAs([]string{"cert1", "cert2"})
+
+	assert.Equal(t, []string{
+		"<ca>",
+		"-----BEGIN CERTIFICATE-----",
+		"cert1",
+		"-----END CERTIFICATE-----",
+		"-----BEGIN CERTIFICATE-----",
+		"cert2",
+		"-----END CERTIFICATE-----",
+		"</ca>",
+	}, lines)
+}
+
+func TestWrapOpenvpnCA(t *testing.T) {
+	t.Parallel()
+
+	lines := WrapOpenvpnCA("cert1")
+
+	assert.Equal(t, []string{
+		"<ca>",
+		"-----BEGIN CERTIFICATE-----",
+		"cert1",
+		"-----END CERTIFICATE-----",
+		"</ca>",
+	}, lines)
+}