Add tests

hashicorp · Aug 2, 2023 · 0ad2ed2 · 0ad2ed2
1 parent f038a50
commit 0ad2ed2
Show file tree

Hide file tree

Showing 3 changed files with 205 additions and 76 deletions.
diff --git a/config/nomad_test.go b/config/nomad_test.go
@@ -228,13 +228,14 @@ func TestNomadConfig_Finalize(t *testing.T) {
 				Enabled:   Bool(false),
 				Namespace: String(""),
 				SSL: &SSLConfig{
-					CaCert:     String(""),
-					CaPath:     String(""),
-					Cert:       String(""),
-					Enabled:    Bool(false),
-					Key:        String(""),
-					ServerName: String(""),
-					Verify:     Bool(true),
+					CaCert:      String(""),
+					CaCertBytes: String(""),
+					CaPath:      String(""),
+					Cert:        String(""),
+					Enabled:     Bool(false),
+					Key:         String(""),
+					ServerName:  String(""),
+					Verify:      Bool(true),
 				},
 				Token:        String(""),
 				AuthUsername: String(""),

diff --git a/config/ssl_test.go b/config/ssl_test.go
@@ -25,13 +25,14 @@ func TestSSLConfig_Copy(t *testing.T) {
 		{
 			"same_enabled",
 			&SSLConfig{
-				Enabled:    Bool(true),
-				Verify:     Bool(true),
-				CaCert:     String("ca_cert"),
-				CaPath:     String("ca_path"),
-				Cert:       String("cert"),
-				Key:        String("key"),
-				ServerName: String("server_name"),
+				Enabled:     Bool(true),
+				Verify:      Bool(true),
+				CaCert:      String("ca_cert"),
+				CaCertBytes: String("ca_cert_bytes"),
+				CaPath:      String("ca_path"),
+				Cert:        String("cert"),
+				Key:         String("key"),
+				ServerName:  String("server_name"),
 			},
 		},
 	}
@@ -197,6 +198,30 @@ func TestSSLConfig_Merge(t *testing.T) {
 			&SSLConfig{CaCert: String("ca_cert")},
 			&SSLConfig{CaCert: String("ca_cert")},
 		},
+		{
+			"ca_cert_bytes_overrides",
+			&SSLConfig{CaCertBytes: String("ca_cert_bytes")},
+			&SSLConfig{CaCertBytes: String("")},
+			&SSLConfig{CaCertBytes: String("")},
+		},
+		{
+			"ca_cert_bytes_empty_one",
+			&SSLConfig{CaCertBytes: String("ca_cert_bytes")},
+			&SSLConfig{},
+			&SSLConfig{CaCertBytes: String("ca_cert_bytes")},
+		},
+		{
+			"ca_cert_bytes_empty_two",
+			&SSLConfig{},
+			&SSLConfig{CaCertBytes: String("ca_cert_bytes")},
+			&SSLConfig{CaCertBytes: String("ca_cert_bytes")},
+		},
+		{
+			"ca_cert_bytes_same",
+			&SSLConfig{CaCertBytes: String("ca_cert_bytes")},
+			&SSLConfig{CaCertBytes: String("ca_cert_bytes")},
+			&SSLConfig{CaCertBytes: String("ca_cert_bytes")},
+		},
 		{
 			"ca_path_overrides",
 			&SSLConfig{CaPath: String("ca_path")},
@@ -267,13 +292,14 @@ func TestSSLConfig_Finalize(t *testing.T) {
 			"empty",
 			&SSLConfig{},
 			&SSLConfig{
-				Enabled:    Bool(false),
-				Cert:       String(""),
-				CaCert:     String(""),
-				CaPath:     String(""),
-				Key:        String(""),
-				ServerName: String(""),
-				Verify:     Bool(true),
+				Enabled:     Bool(false),
+				Cert:        String(""),
+				CaCert:      String(""),
+				CaCertBytes: String(""),
+				CaPath:      String(""),
+				Key:         String(""),
+				ServerName:  String(""),
+				Verify:      Bool(true),
 			},
 		},
 		{
@@ -282,13 +308,14 @@ func TestSSLConfig_Finalize(t *testing.T) {
 				Cert: String("cert"),
 			},
 			&SSLConfig{
-				Enabled:    Bool(true),
-				Cert:       String("cert"),
-				CaCert:     String(""),
-				CaPath:     String(""),
-				Key:        String(""),
-				ServerName: String(""),
-				Verify:     Bool(true),
+				Enabled:     Bool(true),
+				Cert:        String("cert"),
+				CaCert:      String(""),
+				CaCertBytes: String(""),
+				CaPath:      String(""),
+				Key:         String(""),
+				ServerName:  String(""),
+				Verify:      Bool(true),
 			},
 		},
 		{
@@ -297,13 +324,30 @@ func TestSSLConfig_Finalize(t *testing.T) {
 				CaCert: String("ca_cert"),
 			},
 			&SSLConfig{
-				Enabled:    Bool(true),
-				Cert:       String(""),
-				CaCert:     String("ca_cert"),
-				CaPath:     String(""),
-				Key:        String(""),
-				ServerName: String(""),
-				Verify:     Bool(true),
+				Enabled:     Bool(true),
+				Cert:        String(""),
+				CaCert:      String("ca_cert"),
+				CaCertBytes: String(""),
+				CaPath:      String(""),
+				Key:         String(""),
+				ServerName:  String(""),
+				Verify:      Bool(true),
+			},
+		},
+		{
+			"with_ca_cert_bytes",
+			&SSLConfig{
+				CaCertBytes: String("ca_cert_bytes"),
+			},
+			&SSLConfig{
+				Enabled:     Bool(true),
+				Cert:        String(""),
+				CaCert:      String(""),
+				CaCertBytes: String("ca_cert_bytes"),
+				CaPath:      String(""),
+				Key:         String(""),
+				ServerName:  String(""),
+				Verify:      Bool(true),
 			},
 		},
 		{