Adds tests for new conf fields.

Signed-off-by: JU4N98 <juanpablocabana2@gmail.com>

pkg/sidecar/config.go

@@ -120,6 +120,22 @@ func ValidateConfig(c *Config) error {
 		c.RenewSignal = c.RenewSignalDeprecated
 	}
 
+	if c.SvidFileName == "" && c.JWTSvidFilename == "" && c.JWTBundleFilename == "" {
+		return errors.New("svid_file_name, jwt_svid_file_name or jwt_bundle_file_name is required")
+	}
+
+	if c.SvidFileName != "" && c.SvidKeyFileName == "" {
+		return errors.New("svid_key_file_name is required when using svid_file_name")
+	}
+
+	if c.SvidFileName != "" && c.SvidBundleFileName == "" {
+		return errors.New("svid_bundle_file_name is required when using svid_file_name")
+	}
+
+	if c.JWTSvidFilename != "" && c.JWTAudience == "" {
+		return errors.New("jwt_audience is required when using jwt_svid_file_name")
+	}
+
 	return nil
 }
 

pkg/sidecar/config_test.go

@@ -22,6 +22,9 @@ func TestParseConfig(t *testing.T) {
 	expectedSvidFileName := "svid.pem"
 	expectedKeyFileName := "svid_key.pem"
 	expectedSvidBundleFileName := "svid_bundle.pem"
+	expectedJWTSVIDFileName := "jwt_svid.token"
+	expectedJWTBundleFileName := "jwt_bundle.json"
+	expectedJWTAudience := "your-audience"
 
 	assert.Equal(t, expectedAgentAddress, c.AgentAddress)
 	assert.Equal(t, expectedCmd, c.Cmd)
@@ -31,6 +34,9 @@ func TestParseConfig(t *testing.T) {
 	assert.Equal(t, expectedSvidFileName, c.SvidFileName)
 	assert.Equal(t, expectedKeyFileName, c.SvidKeyFileName)
 	assert.Equal(t, expectedSvidBundleFileName, c.SvidBundleFileName)
+	assert.Equal(t, expectedJWTSVIDFileName, c.JWTSvidFilename)
+	assert.Equal(t, expectedJWTBundleFileName, c.JWTBundleFilename)
+	assert.Equal(t, expectedJWTAudience, c.JWTAudience)
 	assert.True(t, c.AddIntermediatesToBundle)
 }
 
@@ -50,6 +56,40 @@ func TestValidateConfig(t *testing.T) {
 				SvidBundleFileName: "bundle.pem",
 			},
 		},
+		{
+			name: "no SVID or bundle",
+			config: &Config{
+				AgentAddress: "path",
+			},
+			expectError: "svid_file_name, jwt_svid_file_name or jwt_bundle_file_name is required",
+		},
+		{
+			name: "no key file",
+			config: &Config{
+				AgentAddress: "path",
+				SvidFileName: "cert.pem",
+			},
+			expectError: "svid_key_file_name is required when using svid_file_name",
+		},
+		{
+			name: "no bundle file",
+			config: &Config{
+				AgentAddress:    "path",
+				SvidFileName:    "cert.pem",
+				SvidKeyFileName: "key.pem",
+			},
+			expectError: "svid_bundle_file_name is required when using svid_file_name",
+		},
+		{
+			name: "no audience",
+			config: &Config{
+				AgentAddress:    "path",
+				SvidFileName:    "cert.pem",
+				SvidKeyFileName: "key.pem",
+				JWTSvidFilename: "jwt.token",
+			},
+			expectError: "jwt_svid_bundle_file_name is required when using jwt_svid_file_name",
+		},
 		// Duplicated field error:
 		{
 			name: "Both agent_address & agentAddress in use",

test/fixture/config/helper.conf

@@ -6,5 +6,8 @@ renew_signal = "SIGHUP"
 svid_file_name = "svid.pem"
 svid_key_file_name = "svid_key.pem"
 svid_bundle_file_name = "svid_bundle.pem"
+jwt_svid_file_name = "jwt_svid.token"
+jwt_bundle_file_name = "jwt_bundle.json"
+jwt_audience = "your-audience"
 timeout = "10s"
 add_intermediates_to_bundle = true