diff --git a/cmd/cli/commands/config/config.go b/cmd/cli/commands/config/config.go index b529ec2..d54aebf 100644 --- a/cmd/cli/commands/config/config.go +++ b/cmd/cli/commands/config/config.go @@ -19,20 +19,20 @@ func RegisterCommands(app *cli.App, opts *options.CommandOpts) { Action: func(c *cli.Context) error { log := opts.Logger() - sidecarConfig, err := sidecar.NewConfigService(log, c.GlobalString("config-path")) + sidecarCfg, err := sidecar.NewConfigService(log, c.GlobalString("config-path")) if err != nil { return fmt.Errorf("%serror loading config: %v%s", tui.TerminalColorRed, err, tui.TerminalColorReset) } - return configureContributoor(c, log, sidecarConfig) + return configureContributoor(c, log, sidecarCfg) }, }) } -func configureContributoor(c *cli.Context, log *logrus.Logger, sidecarConfig sidecar.ConfigManager) error { +func configureContributoor(c *cli.Context, log *logrus.Logger, sidecarCfg sidecar.ConfigManager) error { var ( app = tview.NewApplication() - display = NewConfigDisplay(log, app, sidecarConfig) + display = NewConfigDisplay(log, app, sidecarCfg) ) if err := display.Run(); err != nil { diff --git a/cmd/cli/commands/config/config_network.go b/cmd/cli/commands/config/config_network.go index 61f6cc0..2508a8e 100644 --- a/cmd/cli/commands/config/config_network.go +++ b/cmd/cli/commands/config/config_network.go @@ -70,7 +70,7 @@ func (p *NetworkConfigPage) initPage() { // Add our form fields. // Find the index of the current network (from the sidecar config) in the list. - currentNetwork := p.display.sidecarConfig.Get().NetworkName + currentNetwork := p.display.sidecarCfg.Get().NetworkName currentNetworkIndex := 0 for i, network := range networks { @@ -84,7 +84,7 @@ func (p *NetworkConfigPage) initPage() { form.AddDropDown("Network", networks, currentNetworkIndex, func(option string, index int) { p.description.SetText(networkDescriptions[option]) }) - form.AddInputField("Beacon Node Address", p.display.sidecarConfig.Get().BeaconNodeAddress, 0, nil, nil) + form.AddInputField("Beacon Node Address", p.display.sidecarCfg.Get().BeaconNodeAddress, 0, nil, nil) // Add a save button and ensure we validate the input. saveButton := tview.NewButton(tui.ButtonSaveSettings) @@ -176,7 +176,7 @@ func validateAndUpdate(p *NetworkConfigPage, input *tview.InputField) { return } - if err := p.display.sidecarConfig.Update(func(cfg *sidecar.Config) { + if err := p.display.sidecarCfg.Update(func(cfg *sidecar.Config) { cfg.BeaconNodeAddress = input.GetText() }); err != nil { p.openErrorModal(err) diff --git a/cmd/cli/commands/config/config_output_server.go b/cmd/cli/commands/config/config_output_server.go index 29dd369..afce186 100644 --- a/cmd/cli/commands/config/config_output_server.go +++ b/cmd/cli/commands/config/config_output_server.go @@ -84,7 +84,7 @@ func (p *OutputServerConfigPage) initPage() { // of the current server so we can prepopulate the form with the current // values. defaultIndex := 0 - currentAddress := p.display.sidecarConfig.Get().OutputServer.Address + currentAddress := p.display.sidecarCfg.Get().OutputServer.Address // Check if it's a custom output server address. if !strings.Contains(currentAddress, "platform.ethpandaops.io") { @@ -123,7 +123,7 @@ func (p *OutputServerConfigPage) initPage() { // Add appropriate fields based on selection. if option == "Custom" { // If it's a custom server, we need to add the server address field. - defaultAddress := p.display.sidecarConfig.Get().OutputServer.Address + defaultAddress := p.display.sidecarCfg.Get().OutputServer.Address if strings.Contains(defaultAddress, "platform.ethpandaops.io") { defaultAddress = "" } @@ -132,12 +132,12 @@ func (p *OutputServerConfigPage) initPage() { form.AddInputField("Server Address", defaultAddress, 0, nil, nil) // Add the username and password fields. - username, password := getCredentialsFromConfig(p.display.sidecarConfig.Get()) + username, password := getCredentialsFromConfig(p.display.sidecarCfg.Get()) form.AddInputField("Username", username, 0, nil, nil) form.AddPasswordField("Password", password, 0, '*', nil) } else { // Otherwise, it's an ethPandaOps server. - username, password := getCredentialsFromConfig(p.display.sidecarConfig.Get()) + username, password := getCredentialsFromConfig(p.display.sidecarCfg.Get()) form.AddInputField("Username", username, 0, nil, nil) form.AddPasswordField("Password", password, 0, '*', nil) } @@ -312,7 +312,7 @@ func validateAndUpdateOutputServer(p *OutputServerConfigPage) { } // Update config with validated values. - if err := p.display.sidecarConfig.Update(func(cfg *sidecar.Config) { + if err := p.display.sidecarCfg.Update(func(cfg *sidecar.Config) { cfg.OutputServer.Address = serverAddress if username != "" && password != "" { cfg.OutputServer.Credentials = validate.EncodeCredentials(username, password) diff --git a/cmd/cli/commands/config/display.go b/cmd/cli/commands/config/display.go index 0563491..57df897 100644 --- a/cmd/cli/commands/config/display.go +++ b/cmd/cli/commands/config/display.go @@ -14,7 +14,7 @@ type ConfigDisplay struct { pages *tview.Pages frame *tview.Frame log *logrus.Logger - sidecarConfig sidecar.ConfigManager + sidecarCfg sidecar.ConfigManager homePage *tui.Page categoryList *tview.List content tview.Primitive @@ -26,12 +26,12 @@ type ConfigDisplay struct { } // NewConfigDisplay creates a new Configtui. -func NewConfigDisplay(log *logrus.Logger, app *tview.Application, sidecarConfig sidecar.ConfigManager) *ConfigDisplay { +func NewConfigDisplay(log *logrus.Logger, app *tview.Application, sidecarCfg sidecar.ConfigManager) *ConfigDisplay { display := &ConfigDisplay{ - app: app, - pages: tview.NewPages(), - log: log, - sidecarConfig: sidecarConfig, + app: app, + pages: tview.NewPages(), + log: log, + sidecarCfg: sidecarCfg, } display.homePage = tui.NewPage(nil, "config-home", "Categories", "", nil) diff --git a/cmd/cli/commands/install/display.go b/cmd/cli/commands/install/display.go index a1edbcb..67318f7 100644 --- a/cmd/cli/commands/install/display.go +++ b/cmd/cli/commands/install/display.go @@ -13,7 +13,7 @@ type InstallDisplay struct { pages *tview.Pages frame *tview.Frame log *logrus.Logger - sidecarConfig sidecar.ConfigManager + sidecarCfg sidecar.ConfigManager installPages []tui.PageInterface welcomePage *WelcomePage networkConfigPage *NetworkConfigPage @@ -24,12 +24,12 @@ type InstallDisplay struct { } // NewInstallDisplay creates a new InstallDisplay. -func NewInstallDisplay(log *logrus.Logger, app *tview.Application, sidecarConfig sidecar.ConfigManager) *InstallDisplay { +func NewInstallDisplay(log *logrus.Logger, app *tview.Application, sidecarCfg sidecar.ConfigManager) *InstallDisplay { display := &InstallDisplay{ - app: app, - pages: tview.NewPages(), - log: log, - sidecarConfig: sidecarConfig, + app: app, + pages: tview.NewPages(), + log: log, + sidecarCfg: sidecarCfg, } // Create all of our install wizard pages. @@ -71,7 +71,7 @@ func NewInstallDisplay(log *logrus.Logger, app *tview.Application, sidecarConfig func (d *InstallDisplay) Run() error { d.setPage(d.welcomePage.GetPage()) - cfg := d.sidecarConfig.Get() + cfg := d.sidecarCfg.Get() d.log.WithFields(logrus.Fields{ "config_path": cfg.ContributoorDirectory, diff --git a/cmd/cli/commands/install/install.go b/cmd/cli/commands/install/install.go index c1c6211..a424ca1 100644 --- a/cmd/cli/commands/install/install.go +++ b/cmd/cli/commands/install/install.go @@ -21,12 +21,12 @@ func RegisterCommands(app *cli.App, opts *options.CommandOpts) { Action: func(c *cli.Context) error { log := opts.Logger() - sidecarConfig, err := sidecar.NewConfigService(log, c.GlobalString("config-path")) + sidecarCfg, err := sidecar.NewConfigService(log, c.GlobalString("config-path")) if err != nil { return fmt.Errorf("error loading config: %w", err) } - return installContributoor(c, log, sidecarConfig) + return installContributoor(c, log, sidecarCfg) }, Flags: []cli.Flag{ cli.StringFlag{ @@ -43,10 +43,10 @@ func RegisterCommands(app *cli.App, opts *options.CommandOpts) { }) } -func installContributoor(c *cli.Context, log *logrus.Logger, sidecarConfig sidecar.ConfigManager) error { +func installContributoor(c *cli.Context, log *logrus.Logger, sidecarCfg sidecar.ConfigManager) error { var ( app = tview.NewApplication() - display = NewInstallDisplay(log, app, sidecarConfig) + display = NewInstallDisplay(log, app, sidecarCfg) ) // Run the display. diff --git a/cmd/cli/commands/install/page_20_network.go b/cmd/cli/commands/install/page_20_network.go index 9263782..736af51 100644 --- a/cmd/cli/commands/install/page_20_network.go +++ b/cmd/cli/commands/install/page_20_network.go @@ -91,7 +91,7 @@ func (p *NetworkConfigPage) initPage() { // Add button to our form. form.AddButton(label, func() { - if err := p.display.sidecarConfig.Update(func(cfg *sidecar.Config) { + if err := p.display.sidecarCfg.Update(func(cfg *sidecar.Config) { cfg.NetworkName = tui.AvailableNetworks[index].Value }); err != nil { p.openErrorModal(err) diff --git a/cmd/cli/commands/install/page_20_network_test.go b/cmd/cli/commands/install/page_20_network_test.go index d81b49f..58cf48c 100644 --- a/cmd/cli/commands/install/page_20_network_test.go +++ b/cmd/cli/commands/install/page_20_network_test.go @@ -21,9 +21,9 @@ func TestNetworkConfigPage(t *testing.T) { mockConfig.EXPECT().Update(gomock.Any()).Return(nil).AnyTimes() return &InstallDisplay{ - app: tview.NewApplication(), - log: logrus.New(), - sidecarConfig: mockConfig, + app: tview.NewApplication(), + log: logrus.New(), + sidecarCfg: mockConfig, } } diff --git a/cmd/cli/commands/install/page_30_beacon_node.go b/cmd/cli/commands/install/page_30_beacon_node.go index 1446c91..a4e6b43 100644 --- a/cmd/cli/commands/install/page_30_beacon_node.go +++ b/cmd/cli/commands/install/page_30_beacon_node.go @@ -66,7 +66,7 @@ func (p *BeaconNodePage) initPage() { // Add input field to our form to capture the users beacon node address. inputField := tview.NewInputField(). SetLabel("Beacon Node Address: "). - SetText(p.display.sidecarConfig.Get().BeaconNodeAddress). + SetText(p.display.sidecarCfg.Get().BeaconNodeAddress). SetFieldBackgroundColor(tcell.ColorBlack). SetLabelColor(tcell.ColorLightGray) form.AddFormItem(inputField) @@ -133,7 +133,7 @@ func validateAndUpdate(p *BeaconNodePage, input *tview.InputField) { return } - if err := p.display.sidecarConfig.Update(func(cfg *sidecar.Config) { + if err := p.display.sidecarCfg.Update(func(cfg *sidecar.Config) { cfg.BeaconNodeAddress = input.GetText() }); err != nil { p.openErrorModal(err) diff --git a/cmd/cli/commands/install/page_30_beacon_node_test.go b/cmd/cli/commands/install/page_30_beacon_node_test.go index 59f7bf6..9a8fcae 100644 --- a/cmd/cli/commands/install/page_30_beacon_node_test.go +++ b/cmd/cli/commands/install/page_30_beacon_node_test.go @@ -20,9 +20,9 @@ func TestBeaconNodePage(t *testing.T) { mockConfig.EXPECT().Get().Return(cfg).AnyTimes() return &InstallDisplay{ - app: tview.NewApplication(), - log: logrus.New(), - sidecarConfig: mockConfig, + app: tview.NewApplication(), + log: logrus.New(), + sidecarCfg: mockConfig, networkConfigPage: &NetworkConfigPage{ page: &tui.Page{ID: "network-config"}, }, diff --git a/cmd/cli/commands/install/page_40_output_server.go b/cmd/cli/commands/install/page_40_output_server.go index 66cde05..8ecf334 100644 --- a/cmd/cli/commands/install/page_40_output_server.go +++ b/cmd/cli/commands/install/page_40_output_server.go @@ -68,8 +68,8 @@ func (p *OutputServerPage) initPage() { p.form = form // Get current selection from config - if p.display.sidecarConfig.Get().OutputServer == nil { - if err := p.display.sidecarConfig.Update(func(cfg *sidecar.Config) { + if p.display.sidecarCfg.Get().OutputServer == nil { + if err := p.display.sidecarCfg.Update(func(cfg *sidecar.Config) { cfg.OutputServer = &sidecar.OutputServerConfig{} }); err != nil { p.openErrorModal(err) @@ -78,7 +78,7 @@ func (p *OutputServerPage) initPage() { } } - currentAddress := p.display.sidecarConfig.Get().OutputServer.Address + currentAddress := p.display.sidecarCfg.Get().OutputServer.Address defaultIndex := 0 // Default to first option // Check if it's a custom server address. @@ -114,13 +114,13 @@ func (p *OutputServerPage) initPage() { } // Clear credentials when switching server types - currentAddress := p.display.sidecarConfig.Get().OutputServer.Address + currentAddress := p.display.sidecarCfg.Get().OutputServer.Address wasEthPandaOps := validate.IsEthPandaOpsServer(currentAddress) isEthPandaOps := validate.IsEthPandaOpsServer(selectedValue) if wasEthPandaOps != isEthPandaOps { // Server type changed, clear credentials - if err := p.display.sidecarConfig.Update(func(cfg *sidecar.Config) { + if err := p.display.sidecarCfg.Update(func(cfg *sidecar.Config) { cfg.OutputServer.Credentials = "" }); err != nil { p.openErrorModal(err) @@ -132,12 +132,12 @@ func (p *OutputServerPage) initPage() { // Handle custom server field. if selectedValue == "custom" { // If we're switching to custom, preserve existing custom address. - existingAddress := p.display.sidecarConfig.Get().OutputServer.Address + existingAddress := p.display.sidecarCfg.Get().OutputServer.Address if strings.Contains(existingAddress, "platform.ethpandaops.io") { existingAddress = "" } - if err := p.display.sidecarConfig.Update(func(cfg *sidecar.Config) { + if err := p.display.sidecarCfg.Update(func(cfg *sidecar.Config) { cfg.OutputServer.Address = existingAddress }); err != nil { p.openErrorModal(err) @@ -146,7 +146,7 @@ func (p *OutputServerPage) initPage() { } input := form.AddInputField("Server Address", existingAddress, 40, nil, func(address string) { - if err := p.display.sidecarConfig.Update(func(cfg *sidecar.Config) { + if err := p.display.sidecarCfg.Update(func(cfg *sidecar.Config) { cfg.OutputServer.Address = address }); err != nil { p.openErrorModal(err) @@ -157,7 +157,7 @@ func (p *OutputServerPage) initPage() { input.SetBackgroundColor(tui.ColorFormBackground) } else { // Only update config when explicitly selecting a standard server. - if err := p.display.sidecarConfig.Update(func(cfg *sidecar.Config) { + if err := p.display.sidecarCfg.Update(func(cfg *sidecar.Config) { cfg.OutputServer.Address = selectedValue }); err != nil { p.openErrorModal(err) @@ -203,7 +203,7 @@ func (p *OutputServerPage) initPage() { } // Update config with validated address - if err := p.display.sidecarConfig.Update(func(cfg *sidecar.Config) { + if err := p.display.sidecarCfg.Update(func(cfg *sidecar.Config) { cfg.OutputServer.Address = address }); err != nil { p.openErrorModal(err) diff --git a/cmd/cli/commands/install/page_40_output_server_test.go b/cmd/cli/commands/install/page_40_output_server_test.go index 87f2fbc..db76964 100644 --- a/cmd/cli/commands/install/page_40_output_server_test.go +++ b/cmd/cli/commands/install/page_40_output_server_test.go @@ -25,9 +25,9 @@ func TestOutputServerPage(t *testing.T) { mockConfig.EXPECT().Update(gomock.Any()).Return(nil).AnyTimes() return &InstallDisplay{ - app: tview.NewApplication(), - log: logrus.New(), - sidecarConfig: mockConfig, + app: tview.NewApplication(), + log: logrus.New(), + sidecarCfg: mockConfig, beaconPage: &BeaconNodePage{ page: &tui.Page{ID: "beacon-node"}, }, diff --git a/cmd/cli/commands/install/page_50_output_server_credentials.go b/cmd/cli/commands/install/page_50_output_server_credentials.go index b9e6cdc..a9a6f6d 100644 --- a/cmd/cli/commands/install/page_50_output_server_credentials.go +++ b/cmd/cli/commands/install/page_50_output_server_credentials.go @@ -63,7 +63,7 @@ func (p *OutputServerCredentialsPage) initPage() { p.form = form // Get existing credentials if any - if currentCreds := p.display.sidecarConfig.Get().OutputServer.Credentials; currentCreds != "" { + if currentCreds := p.display.sidecarCfg.Get().OutputServer.Credentials; currentCreds != "" { if decoded, err := base64.StdEncoding.DecodeString(currentCreds); err == nil { parts := strings.Split(string(decoded), ":") if len(parts) == 2 { @@ -156,7 +156,7 @@ func validateAndSaveCredentials(p *OutputServerCredentialsPage) { } } - currentAddress := p.display.sidecarConfig.Get().OutputServer.Address + currentAddress := p.display.sidecarCfg.Get().OutputServer.Address isEthPandaOps := validate.IsEthPandaOpsServer(currentAddress) if err := validate.ValidateOutputServerCredentials(username, password, isEthPandaOps); err != nil { @@ -166,7 +166,7 @@ func validateAndSaveCredentials(p *OutputServerCredentialsPage) { } // Update config with credentials - if err := p.display.sidecarConfig.Update(func(cfg *sidecar.Config) { + if err := p.display.sidecarCfg.Update(func(cfg *sidecar.Config) { // For custom servers, allow empty credentials // For ethPandaOps servers, we know credentials are valid (non-empty) due to validation. if username != "" && password != "" { diff --git a/cmd/cli/commands/install/page_50_output_server_credentials_test.go b/cmd/cli/commands/install/page_50_output_server_credentials_test.go index 11bf831..e5a0d07 100644 --- a/cmd/cli/commands/install/page_50_output_server_credentials_test.go +++ b/cmd/cli/commands/install/page_50_output_server_credentials_test.go @@ -25,9 +25,9 @@ func TestOutputServerCredentialsPage(t *testing.T) { mockConfig.EXPECT().Update(gomock.Any()).Return(nil).AnyTimes() return &InstallDisplay{ - app: tview.NewApplication(), - log: logrus.New(), - sidecarConfig: mockConfig, + app: tview.NewApplication(), + log: logrus.New(), + sidecarCfg: mockConfig, outputPage: &OutputServerPage{ page: &tui.Page{ID: "output-server"}, }, diff --git a/cmd/cli/commands/install/page_60_finished_test.go b/cmd/cli/commands/install/page_60_finished_test.go index be9076d..b7755a8 100644 --- a/cmd/cli/commands/install/page_60_finished_test.go +++ b/cmd/cli/commands/install/page_60_finished_test.go @@ -22,9 +22,9 @@ func TestFinishedPage(t *testing.T) { }).AnyTimes() display := &InstallDisplay{ - app: tview.NewApplication(), - log: logrus.New(), - sidecarConfig: mockConfig, + app: tview.NewApplication(), + log: logrus.New(), + sidecarCfg: mockConfig, } // Initialize requiredpages diff --git a/cmd/cli/commands/start/start.go b/cmd/cli/commands/start/start.go index 9b5ae3d..dc56e48 100644 --- a/cmd/cli/commands/start/start.go +++ b/cmd/cli/commands/start/start.go @@ -22,22 +22,22 @@ func RegisterCommands(app *cli.App, opts *options.CommandOpts) { installerCfg := installer.NewConfig() - sidecarConfig, err := sidecar.NewConfigService(log, c.GlobalString("config-path")) + sidecarCfg, err := sidecar.NewConfigService(log, c.GlobalString("config-path")) if err != nil { return fmt.Errorf("error loading config: %w", err) } - dockerSidecar, err := sidecar.NewDockerSidecar(log, sidecarConfig, installerCfg) + dockerSidecar, err := sidecar.NewDockerSidecar(log, sidecarCfg, installerCfg) if err != nil { return fmt.Errorf("error creating docker sidecar service: %w", err) } - binarySidecar, err := sidecar.NewBinarySidecar(log, sidecarConfig, installerCfg) + binarySidecar, err := sidecar.NewBinarySidecar(log, sidecarCfg, installerCfg) if err != nil { return fmt.Errorf("error creating binary sidecar service: %w", err) } - return startContributoor(c, log, sidecarConfig, dockerSidecar, binarySidecar) + return startContributoor(c, log, sidecarCfg, dockerSidecar, binarySidecar) }, }) } diff --git a/cmd/cli/commands/start/start_test.go b/cmd/cli/commands/start/start_test.go index a49e21c..cb7a231 100644 --- a/cmd/cli/commands/start/start_test.go +++ b/cmd/cli/commands/start/start_test.go @@ -161,7 +161,7 @@ func TestRegisterCommands(t *testing.T) { } // Now test! - err = RegisterCommands( + RegisterCommands( app, options.NewCommandOpts( options.WithName("start"), diff --git a/cmd/cli/commands/stop/stop.go b/cmd/cli/commands/stop/stop.go index 0a0f911..a5c49af 100644 --- a/cmd/cli/commands/stop/stop.go +++ b/cmd/cli/commands/stop/stop.go @@ -22,22 +22,22 @@ func RegisterCommands(app *cli.App, opts *options.CommandOpts) { installerCfg := installer.NewConfig() - sidecarConfig, err := sidecar.NewConfigService(log, c.GlobalString("config-path")) + sidecarCfg, err := sidecar.NewConfigService(log, c.GlobalString("config-path")) if err != nil { return fmt.Errorf("error loading config: %w", err) } - dockerSidecar, err := sidecar.NewDockerSidecar(log, sidecarConfig, installerCfg) + dockerSidecar, err := sidecar.NewDockerSidecar(log, sidecarCfg, installerCfg) if err != nil { return fmt.Errorf("error creating docker sidecar service: %w", err) } - binarySidecar, err := sidecar.NewBinarySidecar(log, sidecarConfig, installerCfg) + binarySidecar, err := sidecar.NewBinarySidecar(log, sidecarCfg, installerCfg) if err != nil { return fmt.Errorf("error creating binary sidecar service: %w", err) } - return stopContributoor(c, log, sidecarConfig, dockerSidecar, binarySidecar) + return stopContributoor(c, log, sidecarCfg, dockerSidecar, binarySidecar) }, }) } diff --git a/cmd/cli/commands/stop/stop_test.go b/cmd/cli/commands/stop/stop_test.go index 9860d91..40d621d 100644 --- a/cmd/cli/commands/stop/stop_test.go +++ b/cmd/cli/commands/stop/stop_test.go @@ -161,7 +161,7 @@ func TestRegisterCommands(t *testing.T) { } // Now test! - err = RegisterCommands( + RegisterCommands( app, options.NewCommandOpts( options.WithName("stop"), diff --git a/cmd/cli/commands/update/update.go b/cmd/cli/commands/update/update.go index 64d534f..b88696b 100644 --- a/cmd/cli/commands/update/update.go +++ b/cmd/cli/commands/update/update.go @@ -30,17 +30,17 @@ func RegisterCommands(app *cli.App, opts *options.CommandOpts) { installerCfg := installer.NewConfig() - sidecarConfig, err := sidecar.NewConfigService(log, c.GlobalString("config-path")) + sidecarCfg, err := sidecar.NewConfigService(log, c.GlobalString("config-path")) if err != nil { return fmt.Errorf("error loading config: %w", err) } - dockerSidecar, err := sidecar.NewDockerSidecar(log, sidecarConfig, installerCfg) + dockerSidecar, err := sidecar.NewDockerSidecar(log, sidecarCfg, installerCfg) if err != nil { return fmt.Errorf("error creating docker sidecar service: %w", err) } - binarySidecar, err := sidecar.NewBinarySidecar(log, sidecarConfig, installerCfg) + binarySidecar, err := sidecar.NewBinarySidecar(log, sidecarCfg, installerCfg) if err != nil { return fmt.Errorf("error creating binary sidecar service: %w", err) } @@ -50,7 +50,7 @@ func RegisterCommands(app *cli.App, opts *options.CommandOpts) { return fmt.Errorf("error creating github service: %w", err) } - return updateContributoor(c, log, sidecarConfig, dockerSidecar, binarySidecar, githubService) + return updateContributoor(c, log, sidecarCfg, dockerSidecar, binarySidecar, githubService) }, }) } @@ -58,7 +58,7 @@ func RegisterCommands(app *cli.App, opts *options.CommandOpts) { func updateContributoor( c *cli.Context, log *logrus.Logger, - sidecarConfig sidecar.ConfigManager, + sidecarCfg sidecar.ConfigManager, docker sidecar.DockerSidecar, binary sidecar.BinarySidecar, github service.GitHubService, @@ -66,7 +66,7 @@ func updateContributoor( var ( success bool targetVersion string - cfg = sidecarConfig.Get() + cfg = sidecarCfg.Get() currentVersion = cfg.Version ) @@ -74,7 +74,7 @@ func updateContributoor( defer func() { if !success { - if err := rollbackVersion(log, sidecarConfig, currentVersion); err != nil { + if err := rollbackVersion(log, sidecarCfg, currentVersion); err != nil { log.Error(err) } } @@ -100,12 +100,12 @@ func updateContributoor( } // Update config version. - if uerr := updateConfigVersion(sidecarConfig, targetVersion); uerr != nil { + if uerr := updateConfigVersion(sidecarCfg, targetVersion); uerr != nil { return uerr } // Refresh our config state, given it was updated above. - cfg = sidecarConfig.Get() + cfg = sidecarCfg.Get() log.WithField("version", cfg.Version).Info("Updating Contributoor") diff --git a/cmd/cli/commands/update/update_test.go b/cmd/cli/commands/update/update_test.go index 5b68e3a..8136f5f 100644 --- a/cmd/cli/commands/update/update_test.go +++ b/cmd/cli/commands/update/update_test.go @@ -277,7 +277,7 @@ func TestRegisterCommands(t *testing.T) { } // Now test! - err = RegisterCommands( + RegisterCommands( app, options.NewCommandOpts( options.WithName("update"), diff --git a/internal/sidecar/binary.go b/internal/sidecar/binary.go index db114c8..4427aff 100644 --- a/internal/sidecar/binary.go +++ b/internal/sidecar/binary.go @@ -25,15 +25,15 @@ type BinarySidecar interface { // binarySidecar is a basic service for interacting with the contributoor binary. type binarySidecar struct { logger *logrus.Logger - config ConfigManager + sidecarCfg ConfigManager installerCfg *installer.Config stdout *os.File stderr *os.File } // NewBinarySidecar creates a new BinarySidecar. -func NewBinarySidecar(logger *logrus.Logger, configService ConfigManager, installerCfg *installer.Config) (BinarySidecar, error) { - expandedDir, err := homedir.Expand(configService.Get().ContributoorDirectory) +func NewBinarySidecar(logger *logrus.Logger, sidecarCfg ConfigManager, installerCfg *installer.Config) (BinarySidecar, error) { + expandedDir, err := homedir.Expand(sidecarCfg.Get().ContributoorDirectory) if err != nil { return nil, fmt.Errorf("failed to expand config path: %w", err) } @@ -55,16 +55,16 @@ func NewBinarySidecar(logger *logrus.Logger, configService ConfigManager, instal return &binarySidecar{ logger: logger, - config: configService, stdout: stdout, stderr: stderr, + sidecarCfg: sidecarCfg, installerCfg: installerCfg, }, nil } // Start starts the binary service. func (s *binarySidecar) Start() error { - cfg := s.config.Get() + cfg := s.sidecarCfg.Get() binaryPath := filepath.Join(cfg.ContributoorDirectory, "bin", "sentry") if _, err := os.Stat(binaryPath); err != nil { @@ -112,7 +112,7 @@ func (s *binarySidecar) Start() error { // Stop stops the binary service. func (s *binarySidecar) Stop() error { - cfg := s.config.Get() + cfg := s.sidecarCfg.Get() pidFile := filepath.Join(cfg.ContributoorDirectory, "contributoor.pid") @@ -152,7 +152,7 @@ func (s *binarySidecar) Stop() error { // IsRunning checks if the binary service is running. func (s *binarySidecar) IsRunning() (bool, error) { - cfg := s.config.Get() + cfg := s.sidecarCfg.Get() pidFile := filepath.Join(cfg.ContributoorDirectory, "contributoor.pid") if _, err := os.Stat(pidFile); os.IsNotExist(err) { @@ -184,7 +184,7 @@ func (s *binarySidecar) IsRunning() (bool, error) { // Update updates the binary service. func (s *binarySidecar) Update() error { - cfg := s.config.Get() + cfg := s.sidecarCfg.Get() expandedDir, err := homedir.Expand(cfg.ContributoorDirectory) if err != nil { diff --git a/internal/sidecar/docker.go b/internal/sidecar/docker.go index 2b788b0..d4d6021 100644 --- a/internal/sidecar/docker.go +++ b/internal/sidecar/docker.go @@ -20,15 +20,15 @@ type DockerSidecar interface { // dockerSidecar is a basic service for interacting with the docker container. type dockerSidecar struct { - logger *logrus.Logger - composePath string - configPath string - configService ConfigManager - installerCfg *installer.Config + logger *logrus.Logger + composePath string + configPath string + sidecarCfg ConfigManager + installerCfg *installer.Config } // NewDockerSidecar creates a new DockerSidecar. -func NewDockerSidecar(logger *logrus.Logger, configService ConfigManager, installerCfg *installer.Config) (DockerSidecar, error) { +func NewDockerSidecar(logger *logrus.Logger, sidecarCfg ConfigManager, installerCfg *installer.Config) (DockerSidecar, error) { composePath, err := findComposeFile() if err != nil { return nil, fmt.Errorf("failed to find docker-compose.yml: %w", err) @@ -39,11 +39,11 @@ func NewDockerSidecar(logger *logrus.Logger, configService ConfigManager, instal } return &dockerSidecar{ - logger: logger, - composePath: filepath.Clean(composePath), - configPath: configService.GetConfigPath(), - configService: configService, - installerCfg: installerCfg, + logger: logger, + composePath: filepath.Clean(composePath), + configPath: sidecarCfg.GetConfigPath(), + sidecarCfg: sidecarCfg, + installerCfg: installerCfg, }, nil } @@ -105,7 +105,7 @@ func (s *dockerSidecar) IsRunning() (bool, error) { // Update pulls the latest image and restarts the container. func (s *dockerSidecar) Update() error { - cfg := s.configService.Get() + cfg := s.sidecarCfg.Get() image := fmt.Sprintf("%s:%s", s.installerCfg.DockerImage, cfg.Version) @@ -125,7 +125,7 @@ func (s *dockerSidecar) Update() error { } func (s *dockerSidecar) getComposeEnv() []string { - cfg := s.configService.Get() + cfg := s.sidecarCfg.Get() return append(os.Environ(), fmt.Sprintf("CONTRIBUTOOR_CONFIG_PATH=%s", filepath.Dir(s.configPath)),