Make tls.certificate-file and tls.private-key-file required fields

stellar · Feb 14, 2017 · 532ac9b · 532ac9b
1 parent 6878ff6
commit 532ac9b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/services/federation/main.go b/services/federation/main.go
@@ -30,8 +30,8 @@ type Config struct {
 		ReverseFederation string `toml:"reverse-federation" valid:"optional"`
 	} `valid:"required"`
 	TLS struct {
-		CertificateFile string `toml:"certificate-file" valid:"optional"`
-		PrivateKeyFile  string `toml:"private-key-file" valid:"optional"`
+		CertificateFile string `toml:"certificate-file" valid:"required"`
+		PrivateKeyFile  string `toml:"private-key-file" valid:"required"`
 	} `valid:"optional"`
 }
 

diff --git a/support/config/main_test.go b/support/config/main_test.go
@@ -88,8 +88,8 @@ func TestUndecoded(t *testing.T) {
 	var val struct {
 		Test string `toml:"test" valid:"optional"`
 		TLS  struct {
-			CertificateFile string `toml:"certificate-file" valid:"optional"`
-			PrivateKeyFile  string `toml:"private-key-file" valid:"optional"`
+			CertificateFile string `toml:"certificate-file" valid:"required"`
+			PrivateKeyFile  string `toml:"private-key-file" valid:"required"`
 		} `valid:"optional"`
 	}
 
@@ -108,8 +108,8 @@ func TestCorrect(t *testing.T) {
 	var val struct {
 		Test string `toml:"test" valid:"optional"`
 		TLS  struct {
-			CertificateFile string `toml:"certificate-file" valid:"optional"`
-			PrivateKeyFile  string `toml:"private-key-file" valid:"optional"`
+			CertificateFile string `toml:"certificate-file" valid:"required"`
+			PrivateKeyFile  string `toml:"private-key-file" valid:"required"`
 		} `valid:"optional"`
 	}