set name in lower level place

common.go

@@ -152,7 +152,7 @@ type Store interface {
 	Closed() bool
 	// Type is the type of Store this is.
 	Type() string
-	// Name is the type of Store this is.
+	// Name is the name of Store this is.
 	Name() string
 }
 

consul.go

@@ -123,6 +123,12 @@ func (b *Consul) Load(key string, val interface{}) error {
 	if ro, ok := val.(ReadOnlySetter); ok {
 		ro.SetReadOnly(b.ReadOnly())
 	}
+	if bb, ok := val.(BundleSetter); ok {
+		n := b.Name()
+		if n != "" {
+			bb.SetBundle(n)
+		}
+	}
 	return nil
 }
 

directory.go

@@ -201,6 +201,12 @@ func (f *Directory) Load(key string, val interface{}) error {
 	if ro, ok := val.(ReadOnlySetter); ok {
 		ro.SetReadOnly(f.ReadOnly())
 	}
+	if bb, ok := val.(BundleSetter); ok {
+		n := f.Name()
+		if n != "" {
+			bb.SetBundle(n)
+		}
+	}
 	return nil
 }
 

file.go

@@ -178,6 +178,12 @@ func (f *File) Load(key string, val interface{}) error {
 		if ro, ok := val.(ReadOnlySetter); ok {
 			ro.SetReadOnly(f.ReadOnly())
 		}
+		if bb, ok := val.(BundleSetter); ok {
+			n := f.Name()
+			if n != "" {
+				bb.SetBundle(n)
+			}
+		}
 		return nil
 	}
 	return os.ErrNotExist

keySaver.go

@@ -117,12 +117,6 @@ func load(s Store, k KeySaver, key string, runhook bool) (bool, error) {
 	if err != nil {
 		return false, err
 	}
-	if b, ok := k.(BundleSetter); ok {
-		n := s.Name()
-		if n != "" {
-			b.SetBundle(n)
-		}
-	}
 	if h, ok := k.(LoadHooker); runhook && ok {
 		return true, h.OnLoad()
 	}

local.go

@@ -209,6 +209,12 @@ func (b *Bolt) Load(key string, val interface{}) error {
 	if ro, ok := val.(ReadOnlySetter); ok {
 		ro.SetReadOnly(b.ReadOnly())
 	}
+	if bb, ok := val.(BundleSetter); ok {
+		n := b.Name()
+		if n != "" {
+			bb.SetBundle(n)
+		}
+	}
 	return nil
 }
 

memory.go

@@ -98,6 +98,12 @@ func (m *Memory) Load(key string, val interface{}) error {
 	if ro, ok := val.(ReadOnlySetter); ok {
 		ro.SetReadOnly(m.ReadOnly())
 	}
+	if bb, ok := val.(BundleSetter); ok {
+		n := m.Name()
+		if n != "" {
+			bb.SetBundle(n)
+		}
+	}
 	return nil
 }