Move cmd commands, allow archiuve deleted

coder · Emyrk · Oct 5, 2023 · Oct 5, 2023 · Oct 5, 2023 · Oct 5, 2023
commit b83a15e1a73458d5b92949190e3d5c76dcc05936
diff --git a/cli/templates.go b/cli/templates.go
@@ -44,7 +44,6 @@ func (r *RootCmd) templates() *clibase.Cmd {
 			r.templateDelete(),
 			r.templatePull(),
 			r.archiveTemplateVersions(),
-			r.archiveTemplateVersion(),
 		},
 	}
 

diff --git a/cli/templateversionarchive.go b/cli/templateversionarchive.go
@@ -19,7 +19,7 @@ func (r *RootCmd) archiveTemplateVersion() *clibase.Cmd {
 
 	client := new(codersdk.Client)
 	cmd := &clibase.Cmd{
-		Use:   "archive-version <template-name> [template-version-names...] ",
+		Use:   "archive <template-name> [template-version-names...] ",
 		Short: "Archive or unarchive a template version(s).",
 		Middleware: clibase.Chain(
 			r.InitClient(client),
@@ -68,17 +68,31 @@ func (r *RootCmd) archiveTemplateVersion() *clibase.Cmd {
 			if unarchive {
 				verb = "unarchived"
 			}
+			failed := 0
 			for _, version := range versions {
+				if version.Archived == !unarchive.Value() {
+					_, _ = fmt.Fprintln(
+						inv.Stdout, fmt.Sprintf("Version "+pretty.Sprint(cliui.DefaultStyles.Keyword, version.Name)+" already "+verb),
+					)
+					continue
+				}
+
 				err := client.SetArchiveTemplateVersion(ctx, version.ID, !unarchive.Value())
 				if err != nil {
-					return xerrors.Errorf("set archive to %t template versions for %q: %w", !unarchive, template.Name, err)
+					failed++
+					_, _ = fmt.Fprintln(inv.Stderr, fmt.Sprintf("Failed to archive template version %q: %s", version.Name,
+						pretty.Sprint(cliui.DefaultStyles.Error, err.Error())))
+					continue
 				}
 
 				_, _ = fmt.Fprintln(
 					inv.Stdout, fmt.Sprintf("Version "+pretty.Sprint(cliui.DefaultStyles.Keyword, version.Name)+" "+verb+" at "+cliui.Timestamp(time.Now())),
 				)
 			}
 
+			if failed > 0 {
+				return xerrors.Errorf("failed on %d template versions", failed)
+			}
 			return nil
 		},
 	}
@@ -90,7 +104,7 @@ func (r *RootCmd) archiveTemplateVersions() *clibase.Cmd {
 	var all clibase.Bool
 	client := new(codersdk.Client)
 	cmd := &clibase.Cmd{
-		Use:   "archive-template [template-name...] ",
+		Use:   "archive [template-name...] ",
 		Short: "Archive unused failed template versions from a given template(s)",
 		Middleware: clibase.Chain(
 			r.InitClient(client),
@@ -146,14 +160,18 @@ func (r *RootCmd) archiveTemplateVersions() *clibase.Cmd {
 				return err
 			}
 
+			failed := 0
 			for _, template := range templates {
 				resp, err := client.ArchiveTemplateVersions(ctx, template.ID, all.Value())
 				if err != nil {
-					return xerrors.Errorf("archive template versions for %q: %w", template.Name, err)
+					_, _ = fmt.Fprintln(inv.Stderr, fmt.Sprintf("Failed to archive template versions for %q: %s", template.Name,
+						pretty.Sprint(cliui.DefaultStyles.Error, err.Error())))
+					failed++
+					continue
 				}
 
 				_, _ = fmt.Fprintln(
-					inv.Stdout, fmt.Sprintf("Archive %s versions from "+pretty.Sprint(cliui.DefaultStyles.Keyword, template.Name)+" at "+cliui.Timestamp(time.Now()), len(resp.ArchivedIDs)),
+					inv.Stdout, fmt.Sprintf("Archived %d versions from "+pretty.Sprint(cliui.DefaultStyles.Keyword, template.Name)+" at "+cliui.Timestamp(time.Now()), len(resp.ArchivedIDs)),
 				)
 
 				if ok, _ := inv.ParsedFlags().GetBool("verbose"); err == nil && ok {
@@ -167,6 +185,9 @@ func (r *RootCmd) archiveTemplateVersions() *clibase.Cmd {
 				}
 			}
 
+			if failed > 0 {
+				return xerrors.Errorf("failed on %d templates", failed)
+			}
 			return nil
 		},
 	}

diff --git a/cli/templateversions.go b/cli/templateversions.go
@@ -5,6 +5,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/coder/pretty"
+
 	"github.com/google/uuid"
 	"golang.org/x/xerrors"
 
@@ -29,6 +31,7 @@ func (r *RootCmd) templateVersions() *clibase.Cmd {
 		},
 		Children: []*clibase.Cmd{
 			r.templateVersionsList(),
+			r.archiveTemplateVersion(),
 		},
 	}
 
@@ -42,13 +45,23 @@ func (r *RootCmd) templateVersionsList() *clibase.Cmd {
 	)
 	client := new(codersdk.Client)
 
+	var includeArchived clibase.Bool
+
 	cmd := &clibase.Cmd{
 		Use: "list <template>",
 		Middleware: clibase.Chain(
 			clibase.RequireNArgs(1),
 			r.InitClient(client),
 		),
 		Short: "List all the versions of the specified template",
+		Options: clibase.OptionSet{
+			{
+				Name:        "include-archived",
+				Description: "Include archived versions in the result list.",
+				Flag:        "include-archived",
+				Value:       &includeArchived,
+			},
+		},
 		Handler: func(inv *clibase.Invocation) error {
 			organization, err := CurrentOrganization(inv, client)
 			if err != nil {
@@ -59,7 +72,8 @@ func (r *RootCmd) templateVersionsList() *clibase.Cmd {
 				return xerrors.Errorf("get template by name: %w", err)
 			}
 			req := codersdk.TemplateVersionsByTemplateRequ
67E6
est{
-				TemplateID: template.ID,
+				TemplateID:      template.ID,
+				IncludeArchived: includeArchived.Value(),
 			}
 
 			versions, err := client.TemplateVersionsByTemplate(inv.Context(), req)
@@ -92,6 +106,7 @@ type templateVersionRow struct {
 	CreatedBy string    `json:"-" table:"created by"`
 	Status    string    `json:"-" table:"status"`
 	Active    string    `json:"-" table:"active"`
+	Archived  string    `json:"-" table:"archived"`
 }
 
 // templateVersionsToRows converts a list of template versions to a list of rows
@@ -104,13 +119,19 @@ func templateVersionsToRows(activeVersionID uuid.UUID, templateVersions ...coder
 			activeStatus = cliui.Keyword("Active")
 		}
 
+		archivedStatus := ""
+		if templateVersion.Archived {
+			archivedStatus = pretty.Sprint(cliui.DefaultStyles.Warn, "Archived")
+		}
+
 		rows[i] = templateVersionRow{
 			TemplateVersion: templateVersion,
 			Name:            templateVersion.Name,
 			CreatedAt:       templateVersion.CreatedAt,
 			CreatedBy:       templateVersion.CreatedBy.Username,
 			Status:          strings.Title(string(templateVersion.Job.Status)),
 			Active:          activeStatus,
+			Archived:        archivedStatus,
 		}
 	}
 

diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/templateversions.sql b/coderd/database/queries/templateversions.sql
@@ -204,10 +204,8 @@ FROM
 				ORDER BY workspace_id, build_number DESC
 			) AS used_versions
 			WHERE
-				-- TODO: This is an issue for "deleted workspaces", since a deleted workspace
-				-- 	has a build with the transition "delete". This will prevent that template
-				-- 	version from ever being archived. We need a method to archive deleted workspaces.
--- 				used_versions.transition != 'delete',
+				used_versions.transition != 'delete'
+				AND
 				scoped_template_versions.id = used_versions.template_version_id
 		)
 		  -- Also never archive the active template version

diff --git a/coderd/templateversions.go b/coderd/templateversions.go
@@ -1148,7 +1148,7 @@ func (api *API) setArchiveTemplateVersion(archive bool) func(rw http.ResponseWri
 				err = archiveError
 			} else {
 				if len(archived) == 0 {
-					err = sql.ErrNoRows
+					err = xerrors.New("Unable to archive specified version, the version is likely in use by a workspace or currently set to the active version")
 				}
 			}
 		} else {