Renaming TLS related vault config

command/agent/config-test-fixtures/basic.hcl

@@ -115,10 +115,10 @@ vault {
     task_token_ttl = "1s"
     enabled = false
     token = "12345"
-    tls_ca_file = "/path/to/ca/file"
-    tls_ca_path = "/path/to/ca"
-    tls_cert_file = "/path/to/cert/file"
-    tls_key_file = "/path/to/key/file"
+    ca_file = "/path/to/ca/file"
+    ca_path = "/path/to/ca"
+    cert_file = "/path/to/cert/file"
+    key_file = "/path/to/key/file"
     tls_server_name = "foobar"
     tls_skip_verify = true
 }

command/agent/config_parse.go

@@ -704,10 +704,10 @@ func parseVaultConfig(result **config.VaultConfig, list *ast.ObjectList) error {
 		"allow_unauthenticated",
 		"enabled",
 		"task_token_ttl",
-		"tls_ca_file",
-		"tls_ca_path",
-		"tls_cert_file",
-		"tls_key_file",
+		"ca_file",
+		"ca_path",
+		"cert_file",
+		"key_file",
 		"tls_server_name",
 		"tls_skip_verify",
 		"token",

nomad/structs/config/vault.go

@@ -50,17 +50,17 @@ type VaultConfig struct {
 
 	// TLSCaFile is the path to a PEM-encoded CA cert file to use to verify the
 	// Vault server SSL certificate.
-	TLSCaFile string `mapstructure:"tls_ca_file"`
+	TLSCaFile string `mapstructure:"ca_file"`
 
 	// TLSCaFile is the path to a directory of PEM-encoded CA cert files to
 	// verify the Vault server SSL certificate.
-	TLSCaPath string `mapstructure:"tls_ca_path"`
+	TLSCaPath string `mapstructure:"ca_path"`
 
 	// TLSCertFile is the path to the certificate for Vault communication
-	TLSCertFile string `mapstructure:"tls_cert_file"`
+	TLSCertFile string `mapstructure:"cert_file"`
 
 	// TLSKeyFile is the path to the private key for Vault communication
-	TLSKeyFile string `mapstructure:"tls_key_file"`
+	TLSKeyFile string `mapstructure:"key_file"`
 
 	// TLSSkipVerify enables or disables SSL verification
 	TLSSkipVerify *bool `mapstructure:"tls_skip_verify"`