From 55f00adaa2aafb334abafe5e474d322d7f0d6076 Mon Sep 17 00:00:00 2001
From: Chris Bednarski <banzaimonkey@gmail.com>
Date: Fri, 4 Dec 2015 16:59:04 -0800
Subject: [PATCH] Rename ConfigFiles field to Files so there's less stutter
 when used as config.Files

---
 command/agent/command.go     | 2 +-
 command/agent/config.go      | 6 +++---
 command/agent/config_test.go | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/command/agent/command.go b/command/agent/command.go
index 50fd6acea..1af7ff41a 100644
--- a/command/agent/command.go
+++ b/command/agent/command.go
@@ -334,7 +334,7 @@ func (c *Command) Run(args []string) int {
 	}
 
 	// Log config files
-	c.Ui.Info(fmt.Sprintf("Loaded configuration from %s", strings.Join(config.ConfigFiles, ", ")))
+	c.Ui.Info(fmt.Sprintf("Loaded configuration from %s", strings.Join(config.Files, ", ")))
 
 	// Initialize the telemetry
 	if err := c.setupTelementry(config); err != nil {
diff --git a/command/agent/config.go b/command/agent/config.go
index 3f48a0d4d..760030108 100644
--- a/command/agent/config.go
+++ b/command/agent/config.go
@@ -98,7 +98,7 @@ type Config struct {
 	VersionPrerelease string
 
 	// List of config files that have been loaded (in order)
-	ConfigFiles []string
+	Files []string
 }
 
 // AtlasConfig is used to enable an parameterize the Atlas integration
@@ -370,7 +370,7 @@ func (a *Config) Merge(b *Config) *Config {
 	}
 
 	// Merge config files lists
-	result.ConfigFiles = append(result.ConfigFiles, b.ConfigFiles...)
+	result.Files = append(result.Files, b.Files...)
 
 	return &result
 }
@@ -574,7 +574,7 @@ func LoadConfigFile(path string) (*Config, error) {
 
 	config, err := LoadConfigString(string(d))
 	if err == nil {
-		config.ConfigFiles = append(config.ConfigFiles, path)
+		config.Files = append(config.Files, path)
 	}
 
 	return config, err
diff --git a/command/agent/config_test.go b/command/agent/config_test.go
index 95f6ac381..1e641523e 100644
--- a/command/agent/config_test.go
+++ b/command/agent/config_test.go
@@ -267,9 +267,9 @@ func TestConfig_LoadConfig(t *testing.T) {
 	}
 
 	expectedConfigFiles := []string{fh.Name()}
-	if !reflect.DeepEqual(config.ConfigFiles, expectedConfigFiles) {
+	if !reflect.DeepEqual(config.Files, expectedConfigFiles) {
 		t.Errorf("Loaded configs don't match\nExpected\n%+vGot\n%+v\n",
-			expectedConfigFiles, config.ConfigFiles)
+			expectedConfigFiles, config.Files)
 	}
 
 	dir, err := ioutil.TempDir("", "nomad")
@@ -294,9 +294,9 @@ func TestConfig_LoadConfig(t *testing.T) {
 	}
 
 	expectedConfigFiles = []string{file1}
-	if !reflect.DeepEqual(config.ConfigFiles, expectedConfigFiles) {
+	if !reflect.DeepEqual(config.Files, expectedConfigFiles) {
 		t.Errorf("Loaded configs don't match\nExpected\n%+vGot\n%+v\n",
-			expectedConfigFiles, config.ConfigFiles)
+			expectedConfigFiles, config.Files)
 	}
 
 }