Move names to a more appropriate package.

dnephin · dnephin · commit 22b246417f52 · 2017-09-06T12:05:16.000-04:00
Signed-off-by: Daniel Nephin &lt;dnephin@docker.com&gt;
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/daemon/names"
 )
 
 var (
-	validCheckpointNameChars   = api.RestrictedNameChars
-	validCheckpointNamePattern = api.RestrictedNamePattern
+	validCheckpointNameChars   = names.RestrictedNameChars
+	validCheckpointNamePattern = names.RestrictedNamePattern
 )
 
 // getCheckpointDir verifies checkpoint directory for create,remove, list options and checks if checkpoint already exists
diff --git a/daemon/names.go b/daemon/names.go
@@ -4,17 +4,17 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/docker/api"
 	"github.com/docker/docker/container"
+	"github.com/docker/docker/daemon/names"
 	"github.com/docker/docker/pkg/namesgenerator"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
 
 var (
-	validContainerNameChars   = api.RestrictedNameChars
-	validContainerNamePattern = api.RestrictedNamePattern
+	validContainerNameChars   = names.RestrictedNameChars
+	validContainerNamePattern = names.RestrictedNamePattern
 )
 
 func (daemon *Daemon) registerName(container *container.Container) error {
diff --git a/daemon/names/names.go b/daemon/names/names.go
@@ -1,4 +1,4 @@
-package api
+package names
 
 import "regexp"
 
diff --git a/volume/local/local.go b/volume/local/local.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/docker/docker/api"
+	"github.com/docker/docker/daemon/names"
 	"github.com/docker/docker/pkg/idtools"
 	"github.com/docker/docker/pkg/mount"
 	"github.com/docker/docker/volume"
@@ -35,7 +35,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 = api.RestrictedNamePattern
+	volumeNameRegex = names.RestrictedNamePattern
 )
 
 type activeMount struct {
@@ -298,7 +298,7 @@ func (r *Root) validateName(name string) error {
 		return validationError("volume name is too short, names should be at least two alphanumeric characters")
 	}
 	if !volumeNameRegex.MatchString(name) {
-		return validationError(fmt.Sprintf("%q includes invalid characters for a local volume name, only %q are allowed. If you intended to pass a host directory, use absolute path", name, api.RestrictedNameChars))
+		return validationError(fmt.Sprintf("%q includes invalid characters for a local volume name, only %q are allowed. If you intended to pass a host directory, use absolute path", name, names.RestrictedNameChars))
 	}
 	return nil
 }

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"`
`11`	`10`	`"github.com/docker/docker/api/types"`
	`11`	`+ "github.com/docker/docker/daemon/names"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`var (`
`15`		`- validCheckpointNameChars = api.RestrictedNameChars`
`16`		`- validCheckpointNamePattern = api.RestrictedNamePattern`
	`15`	`+ validCheckpointNameChars = names.RestrictedNameChars`
	`16`	`+ validCheckpointNamePattern = names.RestrictedNamePattern`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`// getCheckpointDir verifies checkpoint directory for create,remove, list options and checks if checkpoint already exists`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package api`
	`1`	`+package names`
`2`	`2`
`3`	`3`	`import "regexp"`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`	`"strings"`
`14`	`14`	`"sync"`
`15`	`15`
`16`		`- "github.com/docker/docker/api"`
	`16`	`+ "github.com/docker/docker/daemon/names"`
`17`	`17`	`"github.com/docker/docker/pkg/idtools"`
`18`	`18`	`"github.com/docker/docker/pkg/mount"`
`19`	`19`	`"github.com/docker/docker/volume"`
`@@ -35,7 +35,7 @@ var (`
`35`	`35`	`// volumeNameRegex ensures the name assigned for the volume is valid.`
`36`	`36`	`// This name is used to create the bind directory, so we need to avoid characters that`
`37`	`37`	`// would make the path to escape the root directory.`
`38`		`- volumeNameRegex = api.RestrictedNamePattern`
	`38`	`+ volumeNameRegex = names.RestrictedNamePattern`
`39`	`39`	`)`
`40`	`40`
`41`	`41`	`type activeMount struct {`
`@@ -298,7 +298,7 @@ func (r *Root) validateName(name string) error {`
`298`	`298`	`return validationError("volume name is too short, names should be at least two alphanumeric characters")`
`299`	`299`	`}`
`300`	`300`	`if !volumeNameRegex.MatchString(name) {`
`301`		`- return validationError(fmt.Sprintf("%q includes invalid characters for a local volume name, only %q are allowed. If you intended to pass a host directory, use absolute path", name, api.RestrictedNameChars))`
	`301`	`+ return validationError(fmt.Sprintf("%q includes invalid characters for a local volume name, only %q are allowed. If you intended to pass a host directory, use absolute path", name, names.RestrictedNameChars))`
`302`	`302`	`}`
`303`	`303`	`return nil`
`304`	`304`	`}`