Merge remote-tracking branch 'origin/main' into stevenmasley/template…

…_update_params
coder · Emyrk · Jun 17, 2022 · Jun 14, 2022 · Jun 15, 2022 · Jun 15, 2022
commit effbde79e507fa60893cd5c80a68301136399e56
diff --git a/cli/parameters.go b/cli/parameters.go
@@ -1,16 +1,24 @@
 package cli
 
 import (
-	"github.com/coder/coder/cli/cliui"
-	"github.com/coder/coder/codersdk"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"
+
+	"github.com/coder/coder/cli/cliui"
+	"github.com/coder/coder/codersdk"
 )
 
 func parameters() *cobra.Command {
 	cmd := &cobra.Command{
 		Short:   "List parameters for a given scope",
+		Example: "coder parameters list workspace my-workspace",
 		Use:     "parameters",
+		// Currently hidden as this shows parameter values, not parameter
+		// schemes. Until we have a good way to distinguish the two, it's better
+		// not to add confusion or lock ourselves into a certain api.
+		// This cmd is still valuable debugging tool for devs to avoid
+		// constructing curl requests.
+		Hidden:  true,
 		Aliases: []string{"params"},
 	}
 	cmd.AddCommand(
@@ -31,7 +39,6 @@ func displayParameters(filterColumns []string, params ...codersdk.Parameter) str
 		Name: "name",
 	}})
 	for _, param := range params {
-		//fmt.Println(param, filterColumns)
 		tableWriter.AppendRow(table.Row{
 			param.ID.String(),
 			param.Scope,

diff --git a/cli/parameterslist.go b/cli/parameterslist.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 
 	"github.com/google/uuid"
+	"github.com/spf13/cobra"
 	"golang.org/x/xerrors"
 
 	"github.com/coder/coder/codersdk"
-	"github.com/spf13/cobra"
 )
 
 func parameterList() *cobra.Command {
@@ -46,19 +46,19 @@ func parameterList() *cobra.Command {
 				}
 				scopeID = template.ID
 
-			case codersdk.ParameterImportJob, "template_version":
-				scope = string(codersdk.ParameterImportJob)
+			case codersdk.ParameterScopeImportJob, "template_version":
+				scope = string(codersdk.ParameterScopeImportJob)
 				scopeID, err = uuid.Parse(name)
 				if err != nil {
 					return xerrors.Errorf("%q must be a uuid for this scope type", name)
 				}
 			default:
 				return xerrors.Errorf("%q is an unsupported scope, use %v", scope, []codersdk.ParameterScope{
-					codersdk.ParameterWorkspace, codersdk.ParameterTemplate, codersdk.ParameterImportJob,
+					codersdk.ParameterWorkspace, codersdk.ParameterTemplate, codersdk.ParameterScopeImportJob,
 				})
 			}
 
-			params, err := client.Parameters(cmd.Context(), codersdk.ParameterScope(args[0]), scopeID)
+			params, err := client.Parameters(cmd.Context(), codersdk.ParameterScope(scope), scopeID)
 			if err != nil {
 				return xerrors.Errorf("fetch params: %w", err)
 			}

diff --git a/cli/templates.go b/cli/templates.go
@@ -70,8 +70,8 @@ func displayTemplates(filterColumns []string, templates ...codersdk.Template) st
 			template.Provisioner,
 			template.ActiveVersionID.String(),
 			cliui.Styles.Fuschia.Render(fmt.Sprintf("%d developer%s", template.WorkspaceOwnerCount, suffix)),
-			fmt.Sprintf("%s", time.Duration(template.MaxTTLMillis)*time.Millisecond),
-			fmt.Sprintf("%s", time.Duration(template.MinAutostartIntervalMillis)*time.Millisecond),
+			(time.Duration(template.MaxTTLMillis) * time.Millisecond).String(),
+			(time.Duration(template.MinAutostartIntervalMillis) * time.Millisecond).String(),
 		})
 	}
 	return tableWriter.Render()

diff --git a/codersdk/parameters.go b/codersdk/parameters.go
@@ -14,9 +14,9 @@ import (
 type ParameterScope string
 
 const (
-	ParameterTemplate  ParameterScope = "template"
-	ParameterWorkspace ParameterScope = "workspace"
-	ParameterImportJob ParameterScope = "import_job"
+	ParameterTemplate       ParameterScope = "template"
+	ParameterWorkspace      ParameterScope = "workspace"
+	ParameterScopeImportJob ParameterScope = "import_job"
 )
 
 type ParameterSourceScheme string

diff --git a/scripts/develop.sh b/scripts/develop.sh
@@ -20,7 +20,7 @@ echo '== Without these binaries, workspaces will fail to start!'
 
 	trap 'kill 0' SIGINT
 	CODERV2_HOST=http://127.0.0.1:3000 INSPECT_XSTATE=true yarn --cwd=./site dev &
-	CODER_PG_CONNECTION_URL=postgresql://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-postgres}@localhost:5432/${POSTGRES_DB:-postgres}?sslmode=disable go run -tags embed cmd/coder/main.go server --dev --tunnel=true &
+	go run -tags embed cmd/coder/main.go server --in-memory --tunnel &
 
 	# Just a minor sleep to ensure the first user was created to make the member.
 	sleep 2