remove struct use for server_cert/key on root config

openziti · Jul 13, 2022 · b9b9706 · b9b9706
1 parent daf51ad
commit b9b9706
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 20 deletions.
diff --git a/chains_test.go b/chains_test.go
@@ -240,13 +240,11 @@ func Test_Assemble(t *testing.T) {
 		}))
 
 		identityCfg := Config{
-			Key:  "pem:" + keyPem,
-			Cert: "pem:" + serverPem,
-			ServerPair: ServerPair{
-				ServerCert: "pem:" + serverPem,
-				ServerKey:  "pem:" + keyPem,
-			},
-			CA: "pem:" + caPem,
+			Key:        "pem:" + keyPem,
+			Cert:       "pem:" + serverPem,
+			ServerCert: "pem:" + serverPem,
+			ServerKey:  "pem:" + keyPem,
+			CA:         "pem:" + caPem,
 		}
 
 		id, err := LoadIdentity(identityCfg)

diff --git a/config.go b/config.go
@@ -55,7 +55,8 @@ const (
 type Config struct {
 	Key            string       `json:"key" yaml:"key" mapstructure:"key"`
 	Cert           string       `json:"cert" yaml:"cert" mapstructure:"cert"`
-	ServerPair     `yaml:",inline"` //contains ServerCert & ServerKey, yaml requires `inline` JSON does not
+	ServerCert     string       `json:"server_cert,omitempty" yaml:"server_cert,omitempty" mapstructure:"server_cert,omitempty"`
+	ServerKey      string       `json:"server_key,omitempty" yaml:"server_key,omitempty" mapstructure:"server_key,omitempty"`
 	AltServerCerts []ServerPair `json:"alt_server_certs,omitempty" yaml:"alt_server_certs,omitempty" mapstructure:"alt_server_certs,omitempty"`
 	CA             string       `json:"ca,omitempty" yaml:"ca,omitempty" mapstructure:"ca"`
 }

diff --git a/identity_test.go b/identity_test.go
@@ -170,12 +170,10 @@ func TestLoadIdentityWithAltServerCerts(t *testing.T) {
 	}
 
 	cfg := Config{
-		Key:  "pem:" + string(pem.EncodeToMemory(childKey1Pem)),
-		Cert: "pem:" + string(pem.EncodeToMemory(childCert1Pem)) + string(pem.EncodeToMemory(parentPem)),
-		ServerPair: ServerPair{
-			ServerKey:  "pem:" + string(pem.EncodeToMemory(childKey2Pem)),
-			ServerCert: "pem:" + string(pem.EncodeToMemory(childCert2Pem)) + string(pem.EncodeToMemory(parentPem)),
-		},
+		Key:        "pem:" + string(pem.EncodeToMemory(childKey1Pem)),
+		Cert:       "pem:" + string(pem.EncodeToMemory(childCert1Pem)) + string(pem.EncodeToMemory(parentPem)),
+		ServerKey:  "pem:" + string(pem.EncodeToMemory(childKey2Pem)),
+		ServerCert: "pem:" + string(pem.EncodeToMemory(childCert2Pem)) + string(pem.EncodeToMemory(parentPem)),
 		AltServerCerts: []ServerPair{
 			{
 				ServerKey:  "pem:" + string(pem.EncodeToMemory(childKey3Pem)),

diff --git a/token.go b/token.go
@@ -59,12 +59,10 @@ func (i *TokenId) ShallowCloneWithNewToken(token string) *TokenId {
 
 func LoadServerIdentity(clientCertPath, serverCertPath, keyPath, caCertPath string) (*TokenId, error) {
 	idCfg := Config{
-		Key:  keyPath,
-		Cert: clientCertPath,
-		ServerPair: ServerPair{
-			ServerCert: serverCertPath,
-		},
-		CA: caCertPath,
+		Key:        keyPath,
+		Cert:       clientCertPath,
+		ServerCert: serverCertPath,
+		CA:         caCertPath,
 	}
 
 	if id, err := LoadIdentity(idCfg); err != nil {