Merge pull request #467 from thestormforge/applications-run

Applications run

Author: jgustie

api/apps/v1alpha1/application_types.go

@@ -66,7 +66,7 @@ type Parameter struct {
 type ContainerResources struct {
 	filters.ResourceMetaFilter
 	// Label selector of Kubernetes objects to consider when generating container resources patches.
-	// Deprecated: use GenericSelector.LabelSelector instead.
+	// Deprecated: use ResourceMetaFilter.LabelSelector instead.
 	Selector string `json:"selector,omitempty"`
 	// Regular expression matching the container name.
 	ContainerName string `json:"containerName,omitempty"`
@@ -84,7 +84,7 @@ type ContainerResources struct {
 type Replicas struct {
 	filters.ResourceMetaFilter
 	// Label selector of Kubernetes objects to consider when generating replica patches.
-	// Deprecated: use GenericSelector.LabelSelector instead.
+	// Deprecated: use ResourceMetaFilter.LabelSelector instead.
 	Selector string `json:"selector,omitempty"`
 	// Path to the replica field.
 	Path string `json:"path,omitempty"`

cli/internal/commands/run/choiceinput/choiceinput.go

@@ -37,9 +37,12 @@ type Model struct {
 
 	// Spinner to use while loading.
 	LoadingSpinner spinner.Model
-	// Message to display while loading.
+	// Message to display while loading (choices is nil).
 	LoadingMessage string
 
+	// Message to display if there are no results (choices is empty).
+	NoResultsMessage string
+
 	selected int
 }
 
@@ -63,7 +66,7 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 	)
 
 	// Only update the text input if there are choices present
-	if _, isKey := msg.(tea.KeyMsg); (m.Editable && len(m.Choices) > 0) || !isKey {
+	if _, isKey := msg.(tea.KeyMsg); (m.Editable && m.Choices != nil) || !isKey {
 		m.Model, cmd = m.Model.Update(msg)
 		cmds = append(cmds, cmd)
 	}
@@ -85,6 +88,11 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 		case "down":
 			m.Select(m.selected + 1)
 
+		default:
+			if m.Editable {
+				m.selected = -1
+			}
+
 		}
 	}
 
@@ -106,7 +114,11 @@ func (m *Model) Select(i int) {
 	}
 
 	if len(m.Choices) > 0 {
-		m.Model.SetValue(m.Choices[m.selected])
+		value := m.Choices[m.selected]
+		if pos := strings.IndexRune(value, '\t'); pos >= 0 {
+			value = value[0:pos]
+		}
+		m.Model.SetValue(value)
 	} else {
 		m.Model.SetValue("")
 	}
@@ -119,19 +131,30 @@ func (m *Model) SelectOnly() {
 	}
 }
 
+func (m *Model) SelectLast() {
+	if len(m.Choices) > 0 {
+		m.Select(len(m.Choices) - 1)
+	}
+}
+
 func (m Model) View() string {
 	var lines []string
 
 	// Only render the whole text input if we allow edits
-	if m.Editable && len(m.Choices) > 0 {
+	if m.Editable && m.Choices != nil {
 		lines = append(lines, m.Model.View())
 	} else {
 		lines = append(lines, m.Model.Prompt)
 	}
 
 	// If there are no choices yet, show the loading spinner/message
-	if len(m.Choices) == 0 {
+	if m.Choices == nil {
 		lines = append(lines, "\n", m.LoadingSpinner.View(), m.LoadingMessage)
+	} else if len(m.Choices) == 0 {
+		lines = append(lines, m.NoResultsMessage)
+	} else if m.Editable && !strings.HasSuffix(m.Prompt, "\n") {
+		// TODO Normally we put the newline on the prompt, maybe it's not such a good idea
+		lines = append(lines, "\n")
 	}
 
 	// Render the list of choices
@@ -155,6 +178,9 @@ func viewChoice(value string, selected, highlighted, focused bool) string {
 		checkboxStyle = checkboxStyle.Bold()
 		choiceStyle = choiceStyle.Bold()
 	}
+	if pos := strings.IndexRune(value, '\t'); pos >= 0 {
+		value = value[pos+1:]
+	}
 
 	choice.WriteString("\n")
 	choice.WriteString(checkboxStyle.Styled("["))

cli/internal/commands/run/command.go

@@ -255,45 +255,28 @@ func (o *Options) listApplicationNames() tea.Msg {
 	l := applications.Lister{API: o.ApplicationsAPI}
 	q := applications.ApplicationListQuery{}
 	err := l.ForEachApplication(ctx, q, func(item *applications.ApplicationItem) error {
-		msg = append(msg, fmt.Sprintf("%-32s (%s)", item.Title(), item.Name))
+		switch {
+		case item.Title() != "":
+			msg = append(msg, fmt.Sprintf("%s\t%s", item.Name, item.Title()))
+		default:
+			msg = append(msg, item.Name.String())
+		}
 		return nil
 	})
 	if err != nil {
-		// TODO Temporarily return an empty list
 		return msg
 	}
 
-	sort.Strings(msg)
-
-	return msg
-}
-
-// listScenarioNames returns a list of scenarios.
-func (o *Options) listScenarioNames() tea.Msg {
-	ctx := context.TODO()
-	msg := internal.ScenarioMsg{}
-
-	// Isolate ULID from selection
-	parts := strings.Fields(o.generatorModel.ApplicationInput.Value())
-	appName := strings.Trim(parts[len(parts)-1], "()")
-
-	// Look up application to find url
-	app, err := o.ApplicationsAPI.GetApplicationByName(ctx, applications.ApplicationName(appName))
-	if err != nil {
-		return err
-	}
-
-	l := applications.Lister{API: o.ApplicationsAPI}
-	q := applications.ScenarioListQuery{}
-	err = l.ForEachScenario(ctx, &app, q, func(item *applications.ScenarioItem) error {
-		msg = append(msg, fmt.Sprintf("%-32s (%s)", item.Title(), item.Name))
-		return nil
+	sort.Slice(msg, func(i, j int) bool {
+		vi, vj := msg[i], msg[j]
+		if pos := strings.IndexRune(vi, '\t'); pos >= 0 {
+			vi = vi[pos+1:]
+		}
+		if pos := strings.IndexRune(vj, '\t'); pos >= 0 {
+			vj = vj[pos+1:]
+		}
+		return vi < vj
 	})
-	if err != nil {
-		return err
-	}
-
-	sort.Strings(msg)
 
 	return msg
 }

cli/internal/commands/run/form/validation.go

@@ -152,3 +152,26 @@ func (v *ContainerImage) ValidateTextField(value string) tea.Msg {
 
 	return ValidationMsg("")
 }
+
+var nameRegexp = regexp.MustCompile(`^[a-z\d](?:[-a-z\d]{0,61}[a-z\d])?$`)
+
+type Name struct {
+	Required string
+	Valid    string
+}
+
+func (v *Name) ValidateTextField(value string) tea.Msg {
+	if value == "" {
+		return ValidationMsg(v.Required)
+	}
+
+	if !nameRegexp.MatchString(value) {
+		return ValidationMsg(v.Valid)
+	}
+
+	return ValidationMsg("")
+}
+
+func (v *Name) ValidateChoiceField(value string) tea.Msg {
+	return v.ValidateTextField(value)
+}

cli/internal/commands/run/internal/messages.go

@@ -59,15 +59,9 @@ type KubernetesNamespacesMsg []string
 // test case names.
 type StormForgeTestCasesMsg []string
 
-// ApplicationMsg contains the application ULID if an existing application is used.
+// ApplicationMsg contains the names (and optional titles) of existing applications.
 type ApplicationMsg []string
 
-// DoScenarioLookup triggers the retrieval of scenario names for an application.
-type DoScenarioLookup struct{}
-
-// ScenarioMsg contains the scenario ULID if an existing scenario is used.
-type ScenarioMsg []string
-
 // ExperimentMsg represents the generated experiment.
 type ExperimentMsg []*yaml.RNode
 

cli/internal/commands/run/model.go

@@ -124,6 +124,9 @@ func (m initializationModel) Update(msg tea.Msg) (initializationModel, tea.Cmd)
 
 // generatorModel holds the inputs for values on the generator.
 type generatorModel struct {
+	ApplicationName form.ChoiceField
+
+	ScenarioName             form.TextField
 	ScenarioType             form.ChoiceField
 	StormForgeTestCaseInput  form.ChoiceField
 	StormForgeGettingStarted form.ExitField
@@ -141,15 +144,15 @@ type generatorModel struct {
 	ReplicasSelectorInput           form.TextField
 
 	ObjectiveInput form.MultiChoiceField
-
-	ApplicationInput form.ChoiceField
-	ScenarioInput    form.ChoiceField
 }
 
 func (m generatorModel) Update(msg tea.Msg) (generatorModel, tea.Cmd) {
 	var cmds []tea.Cmd
 	switch msg := msg.(type) {
 
+	case internal.ApplicationMsg:
+		m.ApplicationName.Choices = msg
+
 	case internal.StormForgeTestCasesMsg:
 		m.StormForgeTestCaseInput.Choices = msg
 		m.StormForgeTestCaseInput.SelectOnly()
@@ -158,24 +161,13 @@ func (m generatorModel) Update(msg tea.Msg) (generatorModel, tea.Cmd) {
 		m.NamespaceInput.Choices = msg
 		m.NamespaceInput.SelectOnly()
 
-	case internal.ApplicationMsg:
-		m.ApplicationInput.Choices = msg
-		m.ApplicationInput.SelectOnly()
-
-	case internal.ScenarioMsg:
-		m.ScenarioInput.Choices = msg
-		m.ScenarioInput.SelectOnly()
-
 	case tea.KeyMsg:
 		switch msg.Type {
 		case tea.KeyEnter:
 			// If we just completed namespace selection, create the per-namespace label selector inputs
 			if m.NamespaceInput.Focused() {
 				m.updateLabelSelectorInputs()
 			}
-			if m.ApplicationInput.Focused() {
-				cmds = append(cmds, func() tea.Msg { return internal.DoScenarioLookup{} })
-			}
 		}
 	}
 
@@ -184,6 +176,12 @@ func (m generatorModel) Update(msg tea.Msg) (generatorModel, tea.Cmd) {
 	cmd = m.form().Update(msg)
 	cmds = append(cmds, cmd)
 
+	m.ApplicationName, cmd = m.ApplicationName.Update(msg)
+	cmds = append(cmds, cmd)
+
+	m.ScenarioName, cmd = m.ScenarioName.Update(msg)
+	cmds = append(cmds, cmd)
+
 	m.ScenarioType, cmd = m.ScenarioType.Update(msg)
 	cmds = append(cmds, cmd)
 
@@ -222,18 +220,14 @@ func (m generatorModel) Update(msg tea.Msg) (generatorModel, tea.Cmd) {
 	m.ObjectiveInput, cmd = m.ObjectiveInput.Update(msg)
 	cmds = append(cmds, cmd)
 
-	m.ApplicationInput, cmd = m.ApplicationInput.Update(msg)
-	cmds = append(cmds, cmd)
-
-	m.ScenarioInput, cmd = m.ScenarioInput.Update(msg)
-	cmds = append(cmds, cmd)
-
 	return m, tea.Batch(cmds...)
 }
 
 // form returns a slice of everything on the model that implements `form.Field`.
 func (m *generatorModel) form() form.Fields {
 	var fields form.Fields
+	fields = append(fields, &m.ApplicationName)
+	fields = append(fields, &m.ScenarioName)
 	fields = append(fields, &m.ScenarioType)
 	fields = append(fields, &m.StormForgeTestCaseInput)
 	fields = append(fields, &m.StormForgeGettingStarted)
@@ -248,8 +242,6 @@ func (m *generatorModel) form() form.Fields {
 	fields = append(fields, &m.ContainerResourcesSelectorInput)
 	fields = append(fields, &m.ReplicasSelectorInput)
 	fields = append(fields, &m.ObjectiveInput)
-	fields = append(fields, &m.ApplicationInput)
-	fields = append(fields, &m.ScenarioInput)
 	return fields
 }
 

cli/internal/commands/run/run.go

@@ -28,6 +28,7 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/spf13/cobra"
 	konjurev1beta2 "github.com/thestormforge/konjure/pkg/api/core/v1beta2"
+	"github.com/thestormforge/konjure/pkg/filters"
 	"github.com/thestormforge/konjure/pkg/konjure"
 	optimizeappsv1alpha1 "github.com/thestormforge/optimize-controller/v2/api/apps/v1alpha1"
 	"github.com/thestormforge/optimize-controller/v2/cli/internal/commander"
@@ -219,9 +220,6 @@ func (o *Options) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		// Refresh the trials list
 		cmds = append(cmds, o.refreshTrials)
 
-	case internal.DoScenarioLookup:
-		cmds = append(cmds, o.listScenarioNames)
-
 	case error:
 		// Handle errors so any command returning tea.Msg can just return an error
 		o.lastErr = msg
@@ -284,19 +282,16 @@ func (o *Options) ReadApplication(args []string) error {
 
 // applyToApp takes all of the what is on the model and applies it to an application.
 func (m generatorModel) applyToApp(app *optimizeappsv1alpha1.Application) {
-	if m.ApplicationInput.Enabled() {
-		parts := strings.Fields(m.ApplicationInput.Value())
-		app.Name = strings.Trim(parts[len(parts)-1], "()")
+	if m.ApplicationName.Enabled() {
+		app.Name = m.ApplicationName.Value()
 	}
 
 	var scenarioName string
-	if m.ScenarioInput.Enabled() {
-		parts := strings.Fields(m.ScenarioInput.Value())
-		scenarioName = strings.Trim(parts[len(parts)-1], "()")
+	if m.ScenarioName.Enabled() {
+		scenarioName = m.ScenarioName.Value()
 	}
 
 	if m.NamespaceInput.Enabled() {
-
 		// TODO We need a better way to set the name/namespace of the application
 		if namespaces := m.NamespaceInput.Values(); len(namespaces) == 1 {
 			app.Namespace = namespaces[0]
@@ -365,7 +360,9 @@ func (m generatorModel) applyToApp(app *optimizeappsv1alpha1.Application) {
 		// the presence of any parameter bypasses the default inclusion of container resources.
 		app.Configuration = append(app.Configuration, optimizeappsv1alpha1.Parameter{
 			ContainerResources: &optimizeappsv1alpha1.ContainerResources{
-				Selector: m.ContainerResourcesSelectorInput.Value(),
+				ResourceMetaFilter: filters.ResourceMetaFilter{
+					LabelSelector: m.ContainerResourcesSelectorInput.Value(),
+				},
 			},
 		})
 	}
@@ -374,7 +371,9 @@ func (m generatorModel) applyToApp(app *optimizeappsv1alpha1.Application) {
 		if sel := m.ReplicasSelectorInput.Value(); sel != "" {
 			app.Configuration = append(app.Configuration, optimizeappsv1alpha1.Parameter{
 				Replicas: &optimizeappsv1alpha1.Replicas{
-					Selector: sel,
+					ResourceMetaFilter: filters.ResourceMetaFilter{
+						LabelSelector: sel,
+					},
 				},
 			})
 		}