Skip to content

feat: add slug property to app, use in URLs #4573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Oct 28, 2022
Merged

feat: add slug property to app, use in URLs #4573

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
6889450
feat: add slug property to app, use in URLs
deansheather Oct 16, 2022
ec5ecfe
fixup! feat: add slug property to app, use in URLs
deansheather Oct 16, 2022
e6ddf3c
fixup! feat: add slug property to app, use in URLs
deansheather Oct 17, 2022
43df27e
feat: app slugs pt.2
deansheather Oct 18, 2022
c658572
feat: app slugs pt.3
deansheather Oct 18, 2022
d174a90
Merge branch 'main' into dean/app-urls-use-slug
deansheather Oct 19, 2022
7a79f4a
fixup! Merge branch 'main' into dean/app-urls-use-slug
deansheather Oct 19, 2022
4efc389
chore: upgrade coder tf provider to 0.6.0
deansheather Oct 21, 2022
fecef1e
chore: add terraform provider test for slug validity
deansheather Oct 21, 2022
1a5eabc
chore: add app slug uniqueness check to coderd
deansheather Oct 22, 2022
4086202
Merge branch 'main' into dean/app-urls-use-slug
deansheather Oct 22, 2022
9d41a46
chore: fix and improve app slug migrations
deansheather Oct 22, 2022
5b607e8
Merge branch 'main' into dean/app-urls-use-slug
deansheather Oct 25, 2022
b53611f
fixup! Merge branch 'main' into dean/app-urls-use-slug
deansheather Oct 25, 2022
b06dcad
Merge branch 'main' into dean/app-urls-use-slug
deansheather Oct 28, 2022
3e07cf1
fixup! Merge branch 'main' into dean/app-urls-use-slug
deansheather Oct 28, 2022
6aac60a
fixup! Merge branch 'main' into dean/app-urls-use-slug
deansheather Oct 28, 2022
a423ce8
fixup! Merge branch 'main' into dean/app-urls-use-slug
deansheather Oct 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: add app slug uniqueness check to coderd
  • Loading branch information
@deansheather
deansheather committed Oct 22, 2022
commit 1a5eabcd8edb66aa317337f5a2c734891cba08cb
5 changes: 5 additions & 0 deletions coderd/provisionerdaemons.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,7 @@ func insertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
}
snapshot.WorkspaceResources = append(snapshot.WorkspaceResources, telemetry.ConvertWorkspaceResource(resource))

var appSlugs = make(map[string]struct{})
for _, prAgent := range protoResource.Agents {
var instanceID sql.NullString
if prAgent.GetInstanceId() != "" {
Expand Down Expand Up @@ -814,6 +815,10 @@ func insertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
if !provisioner.AppSlugRegex.MatchString(slug) {
return xerrors.Errorf("app slug %q does not match regex %q", slug, provisioner.AppSlugRegex.String())
}
if _, exists := appSlugs[slug]; exists {
return xerrors.Errorf("duplicate app slug, must be unique per template: %q", slug)
}
appSlugs[slug] = struct{}{}

health := database.WorkspaceAppHealthDisabled
if app.Healthcheck == nil {
Expand Down