Remove diffs for the cli, moving to another branch

Emyrk · Emyrk · commit 94118d5d61f4 · 2024-05-24T08:37:01.000-10:00
diff --git a/cli/cliui/parameter.go b/cli/cliui/parameter.go
@@ -43,10 +43,7 @@ func RichParameter(inv *serpent.Invocation, templateVersionParameter codersdk.Te
 			return "", err
 		}
 
-		values, err := MultiSelect(inv, MultiSelectOptions{
-			Options:  options,
-			Defaults: options,
-		})
+		values, err := MultiSelect(inv, options)
 		if err == nil {
 			v, err := json.Marshal(&values)
 			if err != nil {
diff --git a/cli/cliui/select.go b/cli/cliui/select.go
@@ -21,7 +21,7 @@ func init() {
     {{- .CurrentOpt.Value}}
     {{- color "reset"}}
 {{end}}
-{{- if .Message }}{{- color "default+hb"}}{{ .Message }}{{ .FilterMessage }}{{color "reset"}}{{ end }}
+
 {{- if not .ShowAnswer }}
 {{- if .Config.Icons.Help.Text }}
 {{- if .FilterMessage }}{{ "Search:" }}{{ .FilterMessage }}
@@ -44,20 +44,18 @@ func init() {
     {{- " "}}{{- .CurrentOpt.Value}}
 {{end}}
 {{- if .ShowHelp }}{{- color .Config.Icons.Help.Format }}{{ .Config.Icons.Help.Text }} {{ .Help }}{{color "reset"}}{{"\n"}}{{end}}
-{{- if .Message }}{{- color "default+hb"}}{{ .Message }}{{ .FilterMessage }}{{color "reset"}}{{ end }}
 {{- if not .ShowAnswer }}
   {{- "\n"}}
   {{- range $ix, $option := .PageEntries}}
     {{- template "option" $.IterateOption $ix $option}}
   {{- end}}
-{{- end }}`
+{{- end}}`
 }
 
 type SelectOptions struct {
 	Options []string
 	// Default will be highlighted first if it's a valid option.
 	Default    string
-	Message    string
 	Size       int
 	HideSearch bool
 }
@@ -124,7 +122,6 @@ func Select(inv *serpent.Invocation, opts SelectOptions) (string, error) {
 		Options:  opts.Options,
 		Default:  defaultOption,
 		PageSize: opts.Size,
-		Message:  opts.Message,
 	}, &value, survey.WithIcons(func(is *survey.IconSet) {
 		is.Help.Text = "Type to search"
 		if opts.HideSearch {
@@ -141,22 +138,15 @@ func Select(inv *serpent.Invocation, opts SelectOptions) (string, error) {
 	return value, err
 }
 
-type MultiSelectOptions struct {
-	Message  string
-	Options  []string
-	Defaults []string
-}
-
-func MultiSelect(inv *serpent.Invocation, opts MultiSelectOptions) ([]string, error) {
+func MultiSelect(inv *serpent.Invocation, items []string) ([]string, error) {
 	// Similar hack is applied to Select()
 	if flag.Lookup("test.v") != nil {
-		return opts.Defaults, nil
+		return items, nil
 	}
 
 	prompt := &survey.MultiSelect{
-		Message: opts.Message,
-		Options: opts.Options,
-		Default: opts.Defaults,
+		Options: items,
+		Default: items,
 	}
 
 	var values []string
diff --git a/cli/cliui/select_test.go b/cli/cliui/select_test.go
@@ -107,10 +107,7 @@ func newMultiSelect(ptty *ptytest.PTY, items []string) ([]string, error) {
 	var values []string
 	cmd := &serpent.Command{
 		Handler: func(inv *serpent.Invocation) error {
-			selectedItems, err := cliui.MultiSelect(inv, cliui.MultiSelectOptions{
-				Options:  items,
-				Defaults: items,
-			})
+			selectedItems, err := cliui.MultiSelect(inv, items)
 			if err == nil {
 				values = selectedItems
 			}
diff --git a/enterprise/coderd/roles_test.go b/enterprise/coderd/roles_test.go
@@ -166,7 +166,7 @@ func TestCustomOrganizationRole(t *testing.T) {
 		newRole.SitePermissions = nil
 		newRole.OrganizationPermissions = nil
 		newRole.UserPermissions = nil
-		role, err = owner.PatchOrganizationRole(ctx, first.OrganizationID, newRole)
+		_, err = owner.PatchOrganizationRole(ctx, first.OrganizationID, newRole)
 		require.NoError(t, err, "upsert role with override")
 
 		// The role should no longer have template perms
diff --git a/scripts/rbacgen/codersdk.gotmpl b/scripts/rbacgen/codersdk.gotmpl
@@ -16,15 +16,3 @@ const (
 	{{ $element.Enum }} RBACAction = "{{ $element.Value }}"
 	{{- end }}
 )
-
-// RBACResourceActions is the mapping of resources to which actions are valid for
-// said resource type.
-var RBACResourceActions = map[RBACResource][]RBACAction{
-	{{- range $element := . }}
-    Resource{{ pascalCaseName $element.FunctionName }}: []RBACAction{
-        {{- range $actionValue, $_ := $element.Actions }}
-            {{- actionEnum $actionValue -}},
-        {{- end -}}
-    },
-    {{- end }}
-}
