coder
diff --git a/‎coderd/provisionerdaemons.go
Lines changed: 2 additions & 2 deletions b/‎coderd/provisionerdaemons.go
Lines changed: 2 additions & 2 deletions
diff --git a/‎provisioner/appname.go
Lines changed: 0 additions & 14 deletions b/‎provisioner/appname.go
Lines changed: 0 additions & 14 deletions
diff --git a/‎provisioner/appslug.go
Lines changed: 15 additions & 0 deletions b/‎provisioner/appslug.go
Lines changed: 15 additions & 0 deletions
diff --git a/‎provisioner/appname_test.go renamed to ‎provisioner/appslug_test.go
Lines changed: 3 additions & 3 deletions b/‎provisioner/appname_test.go renamed to ‎provisioner/appslug_test.go
Lines changed: 3 additions & 3 deletions
diff --git a/‎provisioner/terraform/resources.go
Lines changed: 2 additions & 2 deletions b/‎provisioner/terraform/resources.go
Lines changed: 2 additions & 2 deletions
@@ -814,8 +814,8 @@ func insertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
 			if slug == "" {
 				return xerrors.Errorf("app must have a slug or name set")
 			}
-			if !provisioner.ValidAppNameRegex.MatchString(slug) {
-				return xerrors.Errorf("app slug %q does not match regex %q", slug, provisioner.ValidAppNameRegex.String())
+			if !provisioner.ValidAppSlugRegex.MatchString(slug) {
+				return xerrors.Errorf("app slug %q does not match regex %q", slug, provisioner.ValidAppSlugRegex.String())
 			}
 
 			health := database.WorkspaceAppHealthDisabled
 
@@ -0,0 +1,15 @@
+package provisioner
+
+import "regexp"
+
+var (
+	// ValidAppSlugRegex is the regex used to validate the slug of a coder_app
+	// resource. It must be a valid hostname and cannot contain two consecutive
+	// hyphens or start/end with a hyphen.
+	//
+	// This regex is duplicated in the terraform provider code, so make sure to
+	// update it there as well.
+	//
+	// There are test cases for this regex in appslug_test.go.
+	ValidAppSlugRegex = regexp.MustCompile(`^[a-z0-9](-?[a-z0-9])*$`)
+)
@@ -8,7 +8,7 @@ import (
 	"github.com/coder/coder/provisioner"
 )
 
-func TestValidAppNameRegex(t *testing.T) {
+func TestValidAppSlugRegex(t *testing.T) {
 	t.Parallel()
 
 	t.Run("Valid", func(t *testing.T) {
@@ -32,7 +32,7 @@ func TestValidAppNameRegex(t *testing.T) {
 		}
 
 		for _, s := range validStrings {
-			require.True(t, provisioner.ValidAppNameRegex.MatchString(s), s)
+			require.True(t, provisioner.ValidAppSlugRegex.MatchString(s), s)
 		}
 	})
 
@@ -58,7 +58,7 @@ func TestValidAppNameRegex(t *testing.T) {
 		}
 
 		for _, s := range invalidStrings {
-			require.False(t, provisioner.ValidAppNameRegex.MatchString(s), s)
+			require.False(t, provisioner.ValidAppSlugRegex.MatchString(s), s)
 		}
 	})
 }
@@ -221,8 +221,8 @@ func ConvertResources(module *tfjson.StateModule, rawGraph string) ([]*proto.Res
 		}
 
 		slug := resource.Name
-		if !provisioner.ValidAppNameRegex.MatchString(slug) {
-			return nil, xerrors.Errorf("invalid app name, must be a valid hostname (%q, cannot contain two consecutive hyphens or start/end with a hyphen): %q", provisioner.ValidAppNameRegex.String(), slug)
+		if !provisioner.ValidAppSlugRegex.MatchString(slug) {
+			return nil, xerrors.Errorf("invalid app slug, must be a valid hostname (%q, cannot contain two consecutive hyphens or start/end with a hyphen): %q", provisioner.ValidAppSlugRegex.String(), slug)
 		}
 
 		var attrs agentAppAttributes
Original file line number	Diff line number	Diff line change
`@@ -814,8 +814,8 @@ func insertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.`
`814`	`814`	`if slug == "" {`
`815`	`815`	`return xerrors.Errorf("app must have a slug or name set")`
`816`	`816`	`}`
`817`		`- if !provisioner.ValidAppNameRegex.MatchString(slug) {`
`818`		`- return xerrors.Errorf("app slug %q does not match regex %q", slug, provisioner.ValidAppNameRegex.String())`
	`817`	`+ if !provisioner.ValidAppSlugRegex.MatchString(slug) {`
	`818`	`+ return xerrors.Errorf("app slug %q does not match regex %q", slug, provisioner.ValidAppSlugRegex.String())`
`819`	`819`	`}`
`820`	`820`
`821`	`821`	`health := database.WorkspaceAppHealthDisabled`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"github.com/coder/coder/provisioner"`
`9`	`9`	`)`
`10`	`10`
`11`		`-func TestValidAppNameRegex(t *testing.T) {`
	`11`	`+func TestValidAppSlugRegex(t *testing.T) {`
`12`	`12`	`t.Parallel()`
`13`	`13`
`14`	`14`	`t.Run("Valid", func(t *testing.T) {`
`@@ -32,7 +32,7 @@ func TestValidAppNameRegex(t *testing.T) {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`for _, s := range validStrings {`
`35`		`- require.True(t, provisioner.ValidAppNameRegex.MatchString(s), s)`
	`35`	`+ require.True(t, provisioner.ValidAppSlugRegex.MatchString(s), s)`
`36`	`36`	`}`
`37`	`37`	`})`
`38`	`38`
`@@ -58,7 +58,7 @@ func TestValidAppNameRegex(t *testing.T) {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`for _, s := range invalidStrings {`
`61`		`- require.False(t, provisioner.ValidAppNameRegex.MatchString(s), s)`
	`61`	`+ require.False(t, provisioner.ValidAppSlugRegex.MatchString(s), s)`
`62`	`62`	`}`
`63`	`63`	`})`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -221,8 +221,8 @@ func ConvertResources(module tfjson.StateModule, rawGraph string) ([]proto.Res`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`slug := resource.Name`
`224`		`- if !provisioner.ValidAppNameRegex.MatchString(slug) {`
`225`		`- return nil, xerrors.Errorf("invalid app name, must be a valid hostname (%q, cannot contain two consecutive hyphens or start/end with a hyphen): %q", provisioner.ValidAppNameRegex.String(), slug)`
	`224`	`+ if !provisioner.ValidAppSlugRegex.MatchString(slug) {`
	`225`	`+ return nil, xerrors.Errorf("invalid app slug, must be a valid hostname (%q, cannot contain two consecutive hyphens or start/end with a hyphen): %q", provisioner.ValidAppSlugRegex.String(), slug)`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`var attrs agentAppAttributes`