Move names to package api

vdemeester · vdemeester · commit dba271a42ab4 · 2016-12-21T22:42:47.000+01:00
Signed-off-by: Vincent Demeester &lt;vincent@sbr.pm&gt;
diff --git a/api/names.go b/api/names.go
@@ -1,4 +1,4 @@
-package utils
+package api
 
 import "regexp"
 
diff --git a/daemon/checkpoint.go b/daemon/checkpoint.go
@@ -7,13 +7,13 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/docker/docker/api"
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/utils"
 )
 
 var (
-	validCheckpointNameChars   = utils.RestrictedNameChars
-	validCheckpointNamePattern = utils.RestrictedNamePattern
+	validCheckpointNameChars   = api.RestrictedNameChars
+	validCheckpointNamePattern = api.RestrictedNamePattern
 )
 
 // CheckpointCreate checkpoints the process running in a container with CRIU
diff --git a/daemon/names.go b/daemon/names.go
@@ -5,16 +5,16 @@ import (
 	"strings"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/docker/docker/api"
 	"github.com/docker/docker/container"
 	"github.com/docker/docker/pkg/namesgenerator"
 	"github.com/docker/docker/pkg/registrar"
 	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/utils"
 )
 
 var (
-	validContainerNameChars   = utils.RestrictedNameChars
-	validContainerNamePattern = utils.RestrictedNamePattern
+	validContainerNameChars   = api.RestrictedNameChars
+	validContainerNamePattern = api.RestrictedNamePattern
 )
 
 func (daemon *Daemon) registerName(container *container.Container) error {
diff --git a/volume/local/local.go b/volume/local/local.go
@@ -16,9 +16,9 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/docker/docker/api"
 	"github.com/docker/docker/pkg/idtools"
 	"github.com/docker/docker/pkg/mount"
-	"github.com/docker/docker/utils"
 	"github.com/docker/docker/volume"
 )
 
@@ -36,7 +36,7 @@ var (
 	// volumeNameRegex ensures the name assigned for the volume is valid.
 	// This name is used to create the bind directory, so we need to avoid characters that
 	// would make the path to escape the root directory.
-	volumeNameRegex = utils.RestrictedNamePattern
+	volumeNameRegex = api.RestrictedNamePattern
 )
 
 type validationError struct {
@@ -269,7 +269,7 @@ func (r *Root) validateName(name string) error {
 		return validationError{fmt.Errorf("volume name is too short, names should be at least two alphanumeric characters")}
 	}
 	if !volumeNameRegex.MatchString(name) {
-		return validationError{fmt.Errorf("%q includes invalid characters for a local volume name, only %q are allowed. If you intented to pass a host directory, use absolute path", name, utils.RestrictedNameChars)}
+		return validationError{fmt.Errorf("%q includes invalid characters for a local volume name, only %q are allowed. If you intented to pass a host directory, use absolute path", name, api.RestrictedNameChars)}
 	}
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package utils`
	`1`	`+package api`
`2`	`2`
`3`	`3`	`import "regexp"`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,13 @@ import (`
`7`	`7`	`"os"`
`8`	`8`	`"path/filepath"`
`9`	`9`
	`10`	`+ "github.com/docker/docker/api"`
`10`	`11`	`"github.com/docker/docker/api/types"`
`11`		`- "github.com/docker/docker/utils"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`var (`
`15`		`- validCheckpointNameChars = utils.RestrictedNameChars`
`16`		`- validCheckpointNamePattern = utils.RestrictedNamePattern`
	`15`	`+ validCheckpointNameChars = api.RestrictedNameChars`
	`16`	`+ validCheckpointNamePattern = api.RestrictedNamePattern`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`// CheckpointCreate checkpoints the process running in a container with CRIU`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,9 @@ import (`
`16`	`16`	`"github.com/pkg/errors"`
`17`	`17`
`18`	`18`	`"github.com/Sirupsen/logrus"`
	`19`	`+ "github.com/docker/docker/api"`
`19`	`20`	`"github.com/docker/docker/pkg/idtools"`
`20`	`21`	`"github.com/docker/docker/pkg/mount"`
`21`		`- "github.com/docker/docker/utils"`
`22`	`22`	`"github.com/docker/docker/volume"`
`23`	`23`	`)`
`24`	`24`
`@@ -36,7 +36,7 @@ var (`
`36`	`36`	`// volumeNameRegex ensures the name assigned for the volume is valid.`
`37`	`37`	`// This name is used to create the bind directory, so we need to avoid characters that`
`38`	`38`	`// would make the path to escape the root directory.`
`39`		`- volumeNameRegex = utils.RestrictedNamePattern`
	`39`	`+ volumeNameRegex = api.RestrictedNamePattern`
`40`	`40`	`)`
`41`	`41`
`42`	`42`	`type validationError struct {`
`@@ -269,7 +269,7 @@ func (r *Root) validateName(name string) error {`
`269`	`269`	`return validationError{fmt.Errorf("volume name is too short, names should be at least two alphanumeric characters")}`
`270`	`270`	`}`
`271`	`271`	`if !volumeNameRegex.MatchString(name) {`
`272`		`- return validationError{fmt.Errorf("%q includes invalid characters for a local volume name, only %q are allowed. If you intented to pass a host directory, use absolute path", name, utils.RestrictedNameChars)}`
	`272`	`+ return validationError{fmt.Errorf("%q includes invalid characters for a local volume name, only %q are allowed. If you intented to pass a host directory, use absolute path", name, api.RestrictedNameChars)}`
`273`	`273`	`}`
`274`	`274`	`return nil`
`275`	`275`	`}`