From 562c47427599287931c610c230f9495e1ffbef68 Mon Sep 17 00:00:00 2001
From: Alex Crawford <alex.crawford@coreos.com>
Date: Thu, 23 Oct 2014 11:44:15 -0700
Subject: [PATCH] system: embed config within EtcHosts and Update

---
 system/etc_hosts.go   |  6 +++---
 system/update.go      | 16 ++++++++--------
 system/update_test.go |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/system/etc_hosts.go b/system/etc_hosts.go
index 6a3e3df..1995c8d 100644
--- a/system/etc_hosts.go
+++ b/system/etc_hosts.go
@@ -28,11 +28,11 @@ import (
 const DefaultIpv4Address = "127.0.0.1"
 
 type EtcHosts struct {
-	Config config.EtcHosts
+	config.EtcHosts
 }
 
 func (eh EtcHosts) generateEtcHosts() (out string, err error) {
-	if eh.Config != "localhost" {
+	if eh.EtcHosts != "localhost" {
 		return "", errors.New("Invalid option to manage_etc_hosts")
 	}
 
@@ -47,7 +47,7 @@ func (eh EtcHosts) generateEtcHosts() (out string, err error) {
 }
 
 func (eh EtcHosts) File() (*File, error) {
-	if eh.Config == "" {
+	if eh.EtcHosts == "" {
 		return nil, nil
 	}
 
diff --git a/system/update.go b/system/update.go
index 7225c84..ced1133 100644
--- a/system/update.go
+++ b/system/update.go
@@ -39,8 +39,8 @@ const (
 // implementation reading from the filesystem), and provides the system-specific
 // File() and Unit().
 type Update struct {
-	Config     config.Update
 	ReadConfig func() (io.Reader, error)
+	config.Update
 }
 
 func DefaultReadConfig() (io.Reader, error) {
@@ -58,17 +58,17 @@ func DefaultReadConfig() (io.Reader, error) {
 // configuration options are set in cloud-config) by either rewriting the
 // existing file on disk, or starting from `/usr/share/coreos/update.conf`
 func (uc Update) File() (*File, error) {
-	if config.IsZero(uc.Config) {
+	if config.IsZero(uc.Update) {
 		return nil, nil
 	}
-	if err := config.AssertValid(uc.Config); err != nil {
+	if err := config.AssertValid(uc.Update); err != nil {
 		return nil, err
 	}
 
 	// Generate the list of possible substitutions to be performed based on the options that are configured
 	subs := map[string]string{}
-	uct := reflect.TypeOf(uc.Config)
-	ucv := reflect.ValueOf(uc.Config)
+	uct := reflect.TypeOf(uc.Update)
+	ucv := reflect.ValueOf(uc.Update)
 	for i := 0; i < uct.NumField(); i++ {
 		val := ucv.Field(i).String()
 		if val == "" {
@@ -118,7 +118,7 @@ func (uc Update) File() (*File, error) {
 // - an update_engine Unit, if "group" or "server" was set in cloud-config
 func (uc Update) Units() []Unit {
 	var units []Unit
-	if uc.Config.RebootStrategy != "" {
+	if uc.Update.RebootStrategy != "" {
 		ls := &Unit{config.Unit{
 			Name:    locksmithUnit,
 			Command: "restart",
@@ -126,14 +126,14 @@ func (uc Update) Units() []Unit {
 			Runtime: true,
 		}}
 
-		if uc.Config.RebootStrategy == "off" {
+		if uc.Update.RebootStrategy == "off" {
 			ls.Command = "stop"
 			ls.Mask = true
 		}
 		units = append(units, *ls)
 	}
 
-	if uc.Config.Group != "" || uc.Config.Server != "" {
+	if uc.Update.Group != "" || uc.Update.Server != "" {
 		ue := Unit{config.Unit{
 			Name:    updateEngineUnit,
 			Command: "restart",
diff --git a/system/update_test.go b/system/update_test.go
index bd34e95..02dead4 100644
--- a/system/update_test.go
+++ b/system/update_test.go
@@ -82,7 +82,7 @@ func TestUpdateUnits(t *testing.T) {
 			}}},
 		},
 	} {
-		units := Update{tt.config, testReadConfig("")}.Units()
+		units := Update{Update: tt.config, ReadConfig: testReadConfig("")}.Units()
 		if !reflect.DeepEqual(tt.units, units) {
 			t.Errorf("bad units (%q): want %#v, got %#v", tt.config, tt.units, units)
 		}
@@ -153,7 +153,7 @@ func TestUpdateFile(t *testing.T) {
 			}},
 		},
 	} {
-		file, err := Update{tt.config, testReadConfig(tt.orig)}.File()
+		file, err := Update{Update: tt.config, ReadConfig: testReadConfig(tt.orig)}.File()
 		if !reflect.DeepEqual(tt.err, err) {
 			t.Errorf("bad error (%q): want %q, got %q", tt.config, tt.err, err)
 		}