Move ValidateName to utils.

interfaces/builtin/all.go

@@ -24,6 +24,7 @@ import (
 	"sort"
 
 	"github.com/snapcore/snapd/interfaces"
+	"github.com/snapcore/snapd/interfaces/utils"
 	"github.com/snapcore/snapd/snap"
 )
 
@@ -68,7 +69,7 @@ func SanitizePlugsSlots(snapInfo *snap.Info) {
 			continue
 		}
 		// Reject plug with invalid name
-		if err := interfaces.ValidateName(plugName); err != nil {
+		if err := utils.ValidateName(plugName); err != nil {
 			snapInfo.BadInterfaces[plugName] = err.Error()
 			badPlugs = append(badPlugs, plugName)
 			continue
@@ -88,7 +89,7 @@ func SanitizePlugsSlots(snapInfo *snap.Info) {
 			continue
 		}
 		// Reject slot with invalid name
-		if err := interfaces.ValidateName(slotName); err != nil {
+		if err := utils.ValidateName(slotName); err != nil {
 			snapInfo.BadInterfaces[slotName] = err.Error()
 			badSlots = append(badSlots, slotName)
 			continue

interfaces/core.go

@@ -216,18 +216,6 @@ const (
 	SecuritySystemd SecuritySystem = "systemd"
 )
 
-// Regular expression describing correct identifiers.
-var validName = regexp.MustCompile("^[a-z](?:-?[a-z0-9])*$")
-
-// ValidateName checks if a string can be used as a plug or slot name.
-func ValidateName(name string) error {
-	valid := validName.MatchString(name)
-	if !valid {
-		return fmt.Errorf("invalid interface name: %q", name)
-	}
-	return nil
-}
-
 // ValidateDBusBusName checks if a string conforms to
 // https://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-names
 func ValidateDBusBusName(busName string) error {

interfaces/core_test.go

@@ -27,6 +27,7 @@ import (
 
 	. "github.com/snapcore/snapd/interfaces"
 	"github.com/snapcore/snapd/interfaces/ifacetest"
+	"github.com/snapcore/snapd/interfaces/utils"
 	"github.com/snapcore/snapd/snap"
 	"github.com/snapcore/snapd/snap/snaptest"
 	"github.com/snapcore/snapd/testutil"
@@ -58,7 +59,7 @@ func (s *CoreSuite) TestValidateName(c *C) {
 		"a0", "a-0", "a-0a",
 	}
 	for _, name := range validNames {
-		err := ValidateName(name)
+		err := utils.ValidateName(name)
 		c.Assert(err, IsNil)
 	}
 	invalidNames := []string{
@@ -78,7 +79,7 @@ func (s *CoreSuite) TestValidateName(c *C) {
 		"日本語", "한글", "ру́сский язы́к",
 	}
 	for _, name := range invalidNames {
-		err := ValidateName(name)
+		err := utils.ValidateName(name)
 		c.Assert(err, ErrorMatches, `invalid interface name: ".*"`)
 	}
 }

interfaces/repo.go

@@ -25,6 +25,7 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/snapcore/snapd/interfaces/utils"
 	"github.com/snapcore/snapd/snap"
 )
 
@@ -71,7 +72,7 @@ func (r *Repository) AddInterface(i Interface) error {
 	defer r.m.Unlock()
 
 	interfaceName := i.Name()
-	if err := ValidateName(interfaceName); err != nil {
+	if err := utils.ValidateName(interfaceName); err != nil {
 		return err
 	}
 	if _, ok := r.ifaces[interfaceName]; ok {
@@ -269,7 +270,7 @@ func (r *Repository) AddPlug(plug *snap.PlugInfo) error {
 		return err
 	}
 	// Reject plug with invalid names
-	if err := ValidateName(plug.Name); err != nil {
+	if err := utils.ValidateName(plug.Name); err != nil {
 		return err
 	}
 	i := r.ifaces[plug.Interface]
@@ -364,7 +365,7 @@ func (r *Repository) AddSlot(slot *snap.SlotInfo) error {
 		return err
 	}
 	// Reject plug with invalid names
-	if err := ValidateName(slot.Name); err != nil {
+	if err := utils.ValidateName(slot.Name); err != nil {
 		return err
 	}
 	// TODO: ensure that apps are correct

interfaces/utils/utils.go

@@ -19,6 +19,11 @@
 
 package utils
 
+import (
+	"fmt"
+	"regexp"
+)
+
 // NormalizeInterfaceAttributes normalises types of an attribute values.
 // The following transformations are applied: int -> int64, float32 -> float64.
 // The normalisation proceeds recursively through maps and slices.
@@ -40,3 +45,15 @@ func NormalizeInterfaceAttributes(value interface{}) interface{} {
 	}
 	return value
 }
+
+// Regular expression describing correct identifiers.
+var validName = regexp.MustCompile("^[a-z](?:-?[a-z0-9])*$")
+
+// ValidateName checks if a string can be used as a plug or slot name.
+func ValidateName(name string) error {
+	valid := validName.MatchString(name)
+	if !valid {
+		return fmt.Errorf("invalid interface name: %q", name)
+	}
+	return nil
+}