Skip to content

feat: archive template versions to hide them from the ui #10179

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 17 commits into from
Oct 11, 2023
Merged

feat: archive template versions to hide them from the ui #10179

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
cc560ca
chore: Add archive column to template versions
Emyrk Oct 10, 2023
ba1310a
Linting
Emyrk Oct 10, 2023
b804fcf
Make gen
Emyrk Oct 10, 2023
b9160ae
Add comment on unit test
Emyrk Oct 10, 2023
49b509b
Linting
Emyrk Oct 10, 2023
7c09da2
feat: add archiving template versions to hide from ui
Emyrk Oct 10, 2023
2a2de29
Update golden files
Emyrk Oct 10, 2023
17132e6
Merge remote-tracking branch 'origin/main' into stevenmasley/archive_…
Emyrk Oct 10, 2023
105f8c8
Merge remote-tracking branch 'origin/main' into stevenmasley/archive_…
Emyrk Oct 10, 2023
e7d8359
Add unit test to prevent workspace create on archived version
Emyrk Oct 10, 2023
fee3680
fixup! Add unit test to prevent workspace create on archived version
Emyrk Oct 10, 2023
8677a79
Use templaet admin vs owner role in test
Emyrk Oct 10, 2023
61f3761
Add unit test for patch active template version
Emyrk Oct 10, 2023
6e2a520
Add cli test
Emyrk Oct 10, 2023
a01f797
Update golden files
Emyrk Oct 10, 2023
088a9a1
Make gen
Emyrk Oct 10, 2023
1000167
Import order
Emyrk Oct 11, 2023
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
Add unit test to prevent workspace create on archived version
  • Loading branch information
@Emyrk
Emyrk committed Oct 10, 2023
commit e7d8359b0801e2394238d20fd05ccb39c73ba1de
2 changes: 1 addition & 1 deletion cli/templateversionarchive.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func (r *RootCmd) archiveTemplateVersions() *clibase.Cmd {
client := new(codersdk.Client)
cmd := &clibase.Cmd{
Use: "archive [template-name...] ",
Short: "Archive unused failed template versions from a given template(s)",
Short: "Archive unused or failed template versions from a given template(s)",
Middleware: clibase.Chain(
r.InitClient(client),
),
Expand Down
28 changes: 28 additions & 0 deletions coderd/workspaces_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,34 @@ func TestWorkspace(t *testing.T) {
assert.NotEmpty(t, agent2.Health.Reason)
})
})

t.Run("Archived", func(t *testing.T) {
t.Parallel()
ownerClient := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
owner := coderdtest.CreateFirstUser(t, ownerClient)

client, _ := coderdtest.CreateAnotherUser(t, ownerClient, owner.OrganizationID, rbac.RoleTemplateAdmin())

active := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, nil)
coderdtest.AwaitTemplateVersionJobCompleted(t, client, active.ID)
template := coderdtest.CreateTemplate(t, client, owner.OrganizationID, active.ID)
// We need another version because the active template version cannot be
// archived.
version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, nil, func(request *codersdk.CreateTemplateVersionRequest) {
request.TemplateID = template.ID
})
coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)

err := client.SetArchiveTemplateVersion(ctx, version.ID, true)
require.NoError(t, err, "archive version")

_, err = client.CreateWorkspace(ctx, owner.OrganizationID, codersdk.Me, codersdk.CreateWorkspaceRequest{
TemplateVersionID: version.ID,
Name: "testworkspace",
})
require.Error(t, err, "create workspace with archived version")
require.ErrorContains(t, err, "Archived template versions cannot")
})
}

func TestAdminViewAllWorkspaces(t *testing.T) {
Expand Down