Linting and gen

coder · Emyrk · Oct 5, 2023 · Oct 5, 2023 · Oct 5, 2023 · Oct 5, 2023
commit 1606b999b27baa48010c3dd96094c9bcfffdb45f
diff --git a/cli/templateversionarchive.go b/cli/templateversionarchive.go
@@ -17,10 +17,12 @@ import (
 func (r *RootCmd) unarchiveTemplateVersion() *clibase.Cmd {
 	return r.setArchiveTemplateVersion(false)
 }
+
 func (r *RootCmd) archiveTemplateVersion() *clibase.Cmd {
 	return r.setArchiveTemplateVersion(true)
 }
 
+//nolint:revive
 func (r *RootCmd) setArchiveTemplateVersion(archive bool) *clibase.Cmd {
 	presentVerb := "archive"
 	pastVerb := "archived"

diff --git a/cli/testdata/coder_templates_--help.golden b/cli/testdata/coder_templates_--help.golden
@@ -23,19 +23,17 @@ USAGE:
        $ coder templates push my-template
 
 SUBCOMMANDS:
-    archive-template    Archive unused failed template versions from a given
-                        template(s)
-    archive-version     Archive or unarchive a template version(s).
-    create              Create a template from the current directory or as
-                        specified by flag
-    delete              Delete templates
-    edit                Edit the metadata of a template by name.
-    init                Get started with a templated template.
-    list                List all the templates available for the organization
-    pull                Download the latest version of a template to a path.
-    push                Push a new template version from the current directory
-                        or as specified by flag
-    versions            Manage different versions of the specified template
+    archive     Archive unused failed template versions from a given template(s)
+    create      Create a template from the current directory or as specified by
+                flag
+    delete      Delete templates
+    edit        Edit the metadata of a template by name.
+    init        Get started with a templated template.
+    list        List all the templates available for the organization
+    pull        Download the latest version of a template to a path.
+    push        Push a new template version from the current directory or as
+                specified by flag
+    versions    Manage different versions of the specified template
 
 ———
 Run `coder --help` for a list of global options.
diff --git a/cli/testdata/coder_templates_archive_--help.golden b/cli/testdata/coder_templates_archive_--help.golden
@@ -1,7 +1,7 @@
 coder v0.0.0-devel
 
 USAGE:
-  coder templates archive [flags] [name...] 
+  coder templates archive [flags] [template-name...] 
 
   Archive unused failed template versions from a given template(s)
 

diff --git a/cli/testdata/coder_templates_versions_--help.golden b/cli/testdata/coder_templates_versions_--help.golden
@@ -12,7 +12,9 @@ USAGE:
        $ coder templates versions list my-template
 
 SUBCOMMANDS:
-    list    List all the versions of the specified template
+    archive      Archive a template version(s).
+    list         List all the versions of the specified template
+    unarchive    Unarchive a template version(s).
 
 ———
 Run `coder --help` for a list of global options.
diff --git a/cli/testdata/coder_templates_versions_archive_--help.golden b/cli/testdata/coder_templates_versions_archive_--help.golden
@@ -0,0 +1,14 @@
+coder v0.0.0-devel
+
+USAGE:
+  coder templates versions archive [flags] <template-name>
+  [template-version-names...] 
+
+  Archive a template version(s).
+
+OPTIONS:
+  -y, --yes bool
+          Bypass prompts.
+
+———
+Run `coder --help` for a list of global options.
diff --git a/cli/testdata/coder_templates_versions_list_--help.golden b/cli/testdata/coder_templates_versions_list_--help.golden
@@ -6,9 +6,12 @@ USAGE:
   List all the versions of the specified template
 
 OPTIONS:
-  -c, --column string-array (default: name,created at,created by,status,active)
+  -c, --column string-array (default: name,created at,created by,status,active,archived)
           Columns to display in table output. Available columns: name, created
-          at, created by, status, active.
+          at, created by, status, active, archived.
+
+      --include-archived bool
+          Include archived versions in the result list.
 
   -o, --output string (default: table)
           Output format. Available formats: table, json.

diff --git a/cli/testdata/coder_templates_versions_unarchive_--help.golden b/cli/testdata/coder_templates_versions_unarchive_--help.golden
@@ -0,0 +1,14 @@
+coder v0.0.0-devel
+
+USAGE:
+  coder templates versions unarchive [flags] <template-name>
+  [template-version-names...] 
+
+  Unarchive a template version(s).
+
+OPTIONS:
+  -y, --yes bool
+          Bypass prompts.
+
+———
+Run `coder --help` for a list of global options.
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go
@@ -5339,7 +5339,7 @@ func (*FakeQuerier) TryAcquireLock(_ context.Context, _ int64) (bool, error) {
 	return false, xerrors.New("TryAcquireLock must only be called within a transaction")
 }
 
-func (q *FakeQuerier) UnarchiveTemplateVersion(ctx context.Context, arg database.UnarchiveTemplateVersionParams) error {
+func (q *FakeQuerier) UnarchiveTemplateVersion(_ context.Context, arg database.UnarchiveTemplateVersionParams) error {
 	err := validateDatabaseType(arg)
 	if err != nil {
 		return err

diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/templateversions.go b/coderd/templateversions.go
@@ -1054,6 +1054,8 @@ func (api *API) postArchiveTemplateVersions(rw http.ResponseWriter, r *http.Requ
 		UpdatedAt:  dbtime.Now(),
 		TemplateID: template.ID,
 		JobStatus:  status,
+		// Archive all versions that match
+		TemplateVersionID: uuid.Nil,
 	})
 
 	if httpapi.Is404Error(err) {
@@ -1100,6 +1102,7 @@ func (api *API) postUnarchiveTemplateVersion() func(rw http.ResponseWriter, r *h
 	return api.setArchiveTemplateVersion(false)
 }
 
+//nolint:revive
 func (api *API) setArchiveTemplateVersion(archive bool) func(rw http.ResponseWriter, r *http.Request) {
 	return func(rw http.ResponseWriter, r *http.Request) {
 		var (

diff --git a/codersdk/templates.go b/codersdk/templates.go
@@ -256,6 +256,7 @@ func (c *Client) ArchiveTemplateVersions(ctx context.Context, template uuid.UUID
 	return resp, json.NewDecoder(res.Body).Decode(&resp)
 }
 
+//nolint:revive
 func (c *Client) SetArchiveTemplateVersion(ctx context.Context, templateVersion uuid.UUID, archive bool) error {
 	u := fmt.Sprintf("/api/v2/templateversions/%s", templateVersion.String())
 	if archive {

diff --git a/docs/api/templates.md b/docs/api/templates.md
diff --git a/docs/cli/templates_archive.md b/docs/cli/templates_archive.md