refactor: use switch-based onboarding step factory

Author: binarylogic

internal/app/onboarding/gate_definitions.go

@@ -16,71 +16,89 @@ type gateDefinition struct {
 	newStep func(m *Model) Step
 }
 
-var gateDefinitions = defaultGateDefinitions()
-
-func gateDef(newStep func(m *Model) Step, opts ...func(*gateDefinition)) gateDefinition {
-	def := gateDefinition{
-		newStep: newStep,
-	}
-	for _, opt := range opts {
-		opt(&def)
-	}
-	return def
-}
-
-func (m *Model) definitionForGate(gate Gate) gateDefinition {
-	if def, ok := gateDefinitions[gate]; ok {
-		return def
+func (m *Model) newStepForGate(gate Gate) Step {
+	switch gate {
+	case GatePreflight:
+		return preflight.New(m.ctx, m.theme, m.services, m.auth, m.userPrefs, m.orgPrefs, m.scope)
+	case GateAuthenticate:
+		return auth.NewAuthenticate(m.ctx, m.theme, m.auth, m.scope)
+	case GateRoleSelect:
+		return role.New(m.theme, m.userPrefs, m.scope)
+	case GateOrgSelect:
+		return organizations.NewSelect(m.ctx, m.theme, m.services, m.userPrefs, m.auth, m.scope)
+	case GateOrgCreate:
+		return organizations.NewCreate(m.ctx, m.theme, m.services, m.userPrefs, m.scope)
+	case GateAccountSelect:
+		return accounts.NewSelect(m.ctx, m.theme, *m.state.Org, m.services, m.orgPrefs, m.scope)
+	case GateAccountCreate:
+		return accounts.NewCreate(m.ctx, m.theme, *m.state.Org, m.services, m.orgPrefs, m.scope)
+	case GateRuntimeInit:
+		return runtimeinit.New(m.theme, *m.state.Org, *m.state.Account, m.scope)
+	case GateDatadogCheck:
+		return datadog.NewCheck(m.ctx, m.theme, *m.state.Account, m.services, m.scope)
+	case GateDatadogRegion:
+		return datadog.NewRegion(m.theme, m.scope)
+	case GateDatadogAPIKey:
+		return datadog.NewAPIKey(m.ctx, m.theme, *m.state.Account, m.state.DDSite, m.services, m.scope)
+	case GateDatadogAppKey:
+		return datadog.NewAppKey(m.ctx, m.theme, *m.state.Account, m.state.DDSite, m.state.DDAPIKey, m.services, m.scope)
+	case GateDatadogDiscovery:
+		return datadog.NewDiscovery(m.ctx, m.theme, m.state.DDAccount, m.services, m.scope)
+	case GateWorkspaceSelect:
+		return workspaces.NewSelect(m.ctx, m.theme, *m.state.Account, m.services, m.orgPrefs, m.scope)
+	case GateSync:
+		return sync.New(m.theme, m.syncer, m.scope)
+	default:
+		panic("unsupported onboarding gate: " + gate.String())
 	}
-	panic("unsupported onboarding gate: " + gate.String())
 }
 
 func defaultGateDefinitions() map[Gate]gateDefinition {
 	return map[Gate]gateDefinition{
-		GatePreflight: gateDef(func(m *Model) Step {
+		GatePreflight: {newStep: func(m *Model) Step {
 			return preflight.New(m.ctx, m.theme, m.services, m.auth, m.userPrefs, m.orgPrefs, m.scope)
-		}),
-		GateAuthenticate: gateDef(func(m *Model) Step {
+		}},
+		GateAuthenticate: {newStep: func(m *Model) Step {
 			return auth.NewAuthenticate(m.ctx, m.theme, m.auth, m.scope)
-		}),
-		GateRoleSelect: gateDef(func(m *Model) Step {
+		}},
+		GateRoleSelect: {newStep: func(m *Model) Step {
 			return role.New(m.theme, m.userPrefs, m.scope)
-		}),
-		GateOrgSelect: gateDef(func(m *Model) Step {
+		}},
+		GateOrgSelect: {newStep: func(m *Model) Step {
 			return organizations.NewSelect(m.ctx, m.theme, m.services, m.userPrefs, m.auth, m.scope)
-		}),
-		GateOrgCreate: gateDef(func(m *Model) Step {
+		}},
+		GateOrgCreate: {newStep: func(m *Model) Step {
 			return organizations.NewCreate(m.ctx, m.theme, m.services, m.userPrefs, m.scope)
-		}),
-		GateAccountSelect: gateDef(func(m *Model) Step {
+		}},
+		GateAccountSelect: {newStep: func(m *Model) Step {
 			return accounts.NewSelect(m.ctx, m.theme, *m.state.Org, m.services, m.orgPrefs, m.scope)
-		}),
-		GateAccountCreate: gateDef(func(m *Model) Step {
+		}},
+		GateAccountCreate: {newStep: func(m *Model) Step {
 			return accounts.NewCreate(m.ctx, m.theme, *m.state.Org, m.services, m.orgPrefs, m.scope)
-		}),
-		GateRuntimeInit: gateDef(func(m *Model) Step {
+		}},
+		GateRuntimeInit: {newStep: func(m *Model) Step {
 			return runtimeinit.New(m.theme, *m.state.Org, *m.state.Account, m.scope)
-		}),
-		GateDatadogCheck: gateDef(func(m *Model) Step {
+		}},
+		GateDatadogCheck: {newStep: func(m *Model) Step {
 			return datadog.NewCheck(m.ctx, m.theme, *m.state.Account, m.services, m.scope)
-		}),
-		GateDatadogRegion: gateDef(func(m *Model) Step {
+		}},
+		GateDatadogRegion: {newStep: func(m *Model) Step {
 			return datadog.NewRegion(m.theme, m.scope)
-		}),
-		GateDatadogAPIKey: gateDef(func(m *Model) Step {
+		}},
+		GateDatadogAPIKey: {newStep: func(m *Model) Step {
 			return datadog.NewAPIKey(m.ctx, m.theme, *m.state.Account, m.state.DDSite, m.services, m.scope)
-		}),
-		GateDatadogAppKey: gateDef(func(m *Model) Step {
+		}},
+		GateDatadogAppKey: {newStep: func(m *Model) Step {
 			return datadog.NewAppKey(m.ctx, m.theme, *m.state.Account, m.state.DDSite, m.state.DDAPIKey, m.services, m.scope)
-		}),
-		GateDatadogDiscovery: gateDef(func(m *Model) Step {
+		}},
+		GateDatadogDiscovery: {newStep: func(m *Model) Step {
 			return datadog.NewDiscovery(m.ctx, m.theme, m.state.DDAccount, m.services, m.scope)
-		}),
-		GateWorkspaceSelect: gateDef(func(m *Model) Step {
+		}},
+		GateWorkspaceSelect: {newStep: func(m *Model) Step {
 			return workspaces.NewSelect(m.ctx, m.theme, *m.state.Account, m.services, m.orgPrefs, m.scope)
-		}),
-		GateSync: gateDef(func(m *Model) Step {
+		}},
+		GateSync: {newStep: func(m *Model) Step {
 			return sync.New(m.theme, m.syncer, m.scope)
-		}),
+		}},
 	}
 }

internal/app/onboarding/gate_definitions_test.go

@@ -38,3 +38,39 @@ func TestDefaultGateDefinitionsCoverageAndContracts(t *testing.T) {
 		}
 	}
 }
+
+func TestNewStepForGateCoverage(t *testing.T) {
+	t.Parallel()
+
+	m := newTestModel(t)
+	m.state.Org = ptrOrg("org-1")
+	m.state.Account = ptrAccount("acc-1")
+	m.state.DDSite = "US1"
+	m.state.DDAPIKey = "api-key"
+	m.state.DDAccount = "dd-1"
+
+	expected := []Gate{
+		GatePreflight,
+		GateAuthenticate,
+		GateRoleSelect,
+		GateOrgSelect,
+		GateOrgCreate,
+		GateAccountSelect,
+		GateAccountCreate,
+		GateRuntimeInit,
+		GateDatadogCheck,
+		GateDatadogRegion,
+		GateDatadogAPIKey,
+		GateDatadogAppKey,
+		GateDatadogDiscovery,
+		GateWorkspaceSelect,
+		GateSync,
+	}
+
+	for _, gate := range expected {
+		step := m.newStepForGate(gate)
+		if step == nil {
+			t.Fatalf("gate %s produced nil step", gate)
+		}
+	}
+}

internal/app/onboarding/gate_navigation.go

@@ -24,6 +24,5 @@ func (m *Model) goToGate(gate Gate) tea.Cmd {
 }
 
 func (m *Model) runGate(gate Gate) tea.Cmd {
-	def := m.definitionForGate(gate)
-	return m.setStep(def.newStep(m))
+	return m.setStep(m.newStepForGate(gate))
 }