From 07569bffa97a4df3df8ff2473d245bf3a1e68471 Mon Sep 17 00:00:00 2001 From: Christopher Crone Date: Tue, 5 May 2020 17:55:42 +0200 Subject: [PATCH] Use friendly random name generator Signed-off-by: Christopher Crone --- cli/cmd/run/run.go | 10 ++++++++-- cli/cmd/run/run_test.go | 23 +++++++++++++++++++++++ go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 cli/cmd/run/run_test.go diff --git a/cli/cmd/run/run.go b/cli/cmd/run/run.go index b2c25c1f7..f99e9c6e1 100644 --- a/cli/cmd/run/run.go +++ b/cli/cmd/run/run.go @@ -29,8 +29,9 @@ package run import ( "context" + "strings" - "github.com/google/uuid" + "github.com/docker/docker/pkg/namesgenerator" "github.com/spf13/cobra" "github.com/docker/api/client" @@ -49,7 +50,7 @@ func Command() *cobra.Command { } cmd.Flags().StringArrayVarP(&opts.publish, "publish", "p", []string{}, "Publish a container's port(s)") - cmd.Flags().StringVar(&opts.name, "name", uuid.New().String(), "Assign a name to the container") + cmd.Flags().StringVar(&opts.name, "name", getRandomName(), "Assign a name to the container") return cmd } @@ -67,3 +68,8 @@ func runRun(ctx context.Context, image string, opts runOpts) error { return c.ContainerService().Run(ctx, project) } + +func getRandomName() string { + // Azure supports hyphen but not underscore in names + return strings.Replace(namesgenerator.GetRandomName(0), "_", "-", -1) +} diff --git a/cli/cmd/run/run_test.go b/cli/cmd/run/run_test.go new file mode 100644 index 000000000..2ef4b81f9 --- /dev/null +++ b/cli/cmd/run/run_test.go @@ -0,0 +1,23 @@ +package run + +import ( + "regexp" + "testing" + + "github.com/stretchr/testify/require" +) + +var ( + // AzureNameRegex is used to validate container names + // Regex was taken from server side error: + // The container name must contain no more than 63 characters and must match the regex '[a-z0-9]([-a-z0-9]*[a-z0-9])?' (e.g. 'my-name'). + AzureNameRegex = regexp.MustCompile("[a-z0-9]([-a-z0-9]*[a-z0-9])") +) + +// TestAzureRandomName ensures compliance with Azure naming requirements +func TestAzureRandomName(t *testing.T) { + n := getRandomName() + require.Less(t, len(n), 64) + require.Greater(t, len(n), 1) + require.Regexp(t, AzureNameRegex, n) +} diff --git a/go.mod b/go.mod index 963b42d76..76685e88e 100644 --- a/go.mod +++ b/go.mod @@ -11,11 +11,11 @@ require ( github.com/buger/goterm v0.0.0-20200322175922-2f3e71b85129 github.com/compose-spec/compose-go v0.0.0-20200423124427-63dcf8c22cae github.com/containerd/console v1.0.0 + github.com/docker/docker v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee // indirect github.com/gobwas/pool v0.2.0 // indirect github.com/gobwas/ws v1.0.3 github.com/golang/protobuf v1.4.0 - github.com/google/uuid v1.1.1 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 github.com/mitchellh/go-homedir v1.1.0 github.com/onsi/gomega v1.9.0 diff --git a/go.sum b/go.sum index 2332a0581..90e97510b 100644 --- a/go.sum +++ b/go.sum @@ -69,6 +69,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dimchansky/utfbom v1.1.0 h1:FcM3g+nofKgUteL8dm/UpdRXNC9KmADgTpLKsu0TRo4= github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= +github.com/docker/docker v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible h1:G2hY8RD7jB9QaSmcb8mYEIg8QbEvVAB7se8+lXHZHfg= +github.com/docker/docker v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= @@ -112,8 +114,6 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= -github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=