Skip to content

Commit

Permalink
use pointer instead
Browse files Browse the repository at this point in the history
  • Loading branch information
@kajes
kajes committed Jun 27, 2024
1 parent 6d25dc0 commit 72aae4e
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion cmd/appliance/upgrade/complete.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ func upgradeCompleteRun(cmd *cobra.Command, args []string, opts *upgradeComplete
if err != nil {
return err
}
plan, err := appliancepkg.NewUpgradePlan(rawAppliances, *initialStats, controlHost, filter, orderBy, descending)
plan, err := appliancepkg.NewUpgradePlan(rawAppliances, initialStats, controlHost, filter, orderBy, descending)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/appliance/checks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ var (
ErrControllerVersionMismatch = errors.New("all controllers need to be prepared with the same version when doing a major or minor version upgrade.")
)

func CheckNeedsMultiControllerUpgrade(stats openapi.StatsAppliancesList, appliances []openapi.Appliance) ([]openapi.Appliance, error) {
func CheckNeedsMultiControllerUpgrade(stats *openapi.StatsAppliancesList, appliances []openapi.Appliance) ([]openapi.Appliance, error) {
var (
errs *multierror.Error
preparedControllers []openapi.Appliance
Expand Down
2 changes: 1 addition & 1 deletion pkg/appliance/checks_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@ func TestCheckNeedsMultiControllerUpgrade(t *testing.T) {
stats.Data = append(stats.Data, d.stat)
argAppliances = append(argAppliances, d.appliance)
}
got, err := CheckNeedsMultiControllerUpgrade(stats, argAppliances)
got, err := CheckNeedsMultiControllerUpgrade(&stats, argAppliances)
if (err != nil) != tt.wantErr {
t.Errorf("CheckNeedsMultiControllerUpgrade() error = %v, wantErr %v", err, tt.wantErr)
return
Expand Down
18 changes: 9 additions & 9 deletions pkg/appliance/upgrade.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ type UpgradePlan struct {
Batches [][]openapi.Appliance
Skipping []SkipUpgrade
BackupIds []string
stats openapi.StatsAppliancesList
stats *openapi.StatsAppliancesList
adminHostname string
}

func NewUpgradePlan(appliances []openapi.Appliance, stats openapi.StatsAppliancesList, adminHostname string, filter map[string]map[string]string, orderBy []string, descending bool) (*UpgradePlan, error) {
func NewUpgradePlan(appliances []openapi.Appliance, stats *openapi.StatsAppliancesList, adminHostname string, filter map[string]map[string]string, orderBy []string, descending bool) (*UpgradePlan, error) {
plan := UpgradePlan{
adminHostname: adminHostname,
stats: stats,
Expand Down Expand Up @@ -103,7 +103,7 @@ func NewUpgradePlan(appliances []openapi.Appliance, stats openapi.StatsAppliance
var errs *multierror.Error
for _, a := range finalApplianceList {
// Get current version and stats
stats, err := ApplianceStats(a, plan.stats)
stats, err := ApplianceStats(&a, plan.stats)
if err != nil {
errs = multierror.Append(errs, err)
plan.Skipping = append(plan.Skipping, SkipUpgrade{
Expand Down Expand Up @@ -330,7 +330,7 @@ func (up *UpgradePlan) PrintPreCompleteSummary(out io.Writer) error {
t.AddHeader("Appliance", "Site", "Current version", "Prepared version", "Backup")
}
if up.PrimaryController != nil {
currentVersion, targetVersion := applianceVersions(*up.PrimaryController, up.stats)
currentVersion, targetVersion := applianceVersions(*up.PrimaryController, *up.stats)
tb := &bytes.Buffer{}
t := util.NewPrinter(tb, 4)
tableHeaders(t)
Expand All @@ -349,7 +349,7 @@ func (up *UpgradePlan) PrintPreCompleteSummary(out io.Writer) error {
t := util.NewPrinter(tb, 4)
tableHeaders(t)
for _, ctrl := range up.Controllers {
current, target := applianceVersions(ctrl, up.stats)
current, target := applianceVersions(ctrl, *up.stats)
t.AddLine(ctrl.GetName(), ctrl.GetSiteName(), current, target, shouldBackup(ctrl.GetId()))
}
t.Print()
Expand All @@ -364,7 +364,7 @@ func (up *UpgradePlan) PrintPreCompleteSummary(out io.Writer) error {
t := util.NewPrinter(tb, 4)
tableHeaders(t)
for _, lfls := range up.LogForwardersAndServers {
current, target := applianceVersions(lfls, up.stats)
current, target := applianceVersions(lfls, *up.stats)
t.AddLine(lfls.GetName(), lfls.GetSiteName(), current, target, shouldBackup(lfls.GetId()))
}
t.Print()
Expand All @@ -378,7 +378,7 @@ func (up *UpgradePlan) PrintPreCompleteSummary(out io.Writer) error {
t := util.NewPrinter(tb, 4)
tableHeaders(t)
for _, a := range c {
current, target := applianceVersions(a, up.stats)
current, target := applianceVersions(a, *up.stats)
// s := fmt.Sprintf("- %s: %s -> %s", a.GetName(), current, target)
t.AddLine(a.GetName(), a.GetSiteName(), current, target, shouldBackup(a.GetId()))
}
Expand Down Expand Up @@ -447,14 +447,14 @@ func (up *UpgradePlan) PrintPostCompleteSummary(out io.Writer, stats []openapi.S
}

func applianceVersions(a openapi.Appliance, s openapi.StatsAppliancesList) (currentVersion *version.Version, targetVersion *version.Version) {
stats, _ := ApplianceStats(a, s)
stats, _ := ApplianceStats(&a, &s)
currentVersion, _ = ParseVersionString(stats.GetVersion())
us := stats.GetUpgrade()
targetVersion, _ = ParseVersionString(us.GetDetails())
return
}

func ApplianceStats(a openapi.Appliance, stats openapi.StatsAppliancesList) (*openapi.StatsAppliancesListAllOfData, error) {
func ApplianceStats(a *openapi.Appliance, stats *openapi.StatsAppliancesList) (*openapi.StatsAppliancesListAllOfData, error) {
for _, s := range stats.GetData() {
if s.GetId() == a.GetId() {
return &s, nil
Expand Down
10 changes: 5 additions & 5 deletions pkg/appliance/upgrade_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func TestMakeUpgradePlan(t *testing.T) {
{coll.Appliances["connectorA1"], coll.Appliances["gatewayA3"], coll.Appliances["logserver"], coll.Appliances["portalA1"]},
},
adminHostname: hostname,
stats: *coll.Stats,
stats: coll.Stats,
},
},
{
Expand Down Expand Up @@ -101,7 +101,7 @@ func TestMakeUpgradePlan(t *testing.T) {
{coll.Appliances["connectorA1"], coll.Appliances["gatewayA3"], coll.Appliances["logserver"], coll.Appliances["portalA1"]},
},
adminHostname: hostname,
stats: *coll.Stats,
stats: coll.Stats,
},
},
{
Expand Down Expand Up @@ -163,7 +163,7 @@ func TestMakeUpgradePlan(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got, err := NewUpgradePlan(tt.args.appliances, *tt.args.stats, tt.args.ctrlHostname, tt.args.filter, tt.args.orderBy, tt.args.descending)
got, err := NewUpgradePlan(tt.args.appliances, tt.args.stats, tt.args.ctrlHostname, tt.args.filter, tt.args.orderBy, tt.args.descending)
if tt.wantErr {
assert.Error(t, err)
}
Expand Down Expand Up @@ -342,7 +342,7 @@ Appliances that will be skipped:
for _, v := range tt.in.Appliances {
appliances = append(appliances, coll.Appliances[v])
}
up, err := NewUpgradePlan(appliances, *coll.Stats, tt.in.hostname, tt.in.filter, tt.in.orderBy, tt.in.descending)
up, err := NewUpgradePlan(appliances, coll.Stats, tt.in.hostname, tt.in.filter, tt.in.orderBy, tt.in.descending)
if err != nil {
t.Fatalf("internal test error: %v", err)
}
Expand Down Expand Up @@ -420,7 +420,7 @@ WARNING: Upgrade was completed, but not all appliances are running the same vers
for _, v := range tt.appliances {
appliances = append(appliances, coll.Appliances[v])
}
up, err := NewUpgradePlan(appliances, *coll.Stats, hostname, DefaultCommandFilter, nil, false)
up, err := NewUpgradePlan(appliances, coll.Stats, hostname, DefaultCommandFilter, nil, false)
if err != nil {
t.Fatalf("PrintPostCompleteSummary() - internal test error: %v", err)
return
Expand Down

0 comments on commit 72aae4e

Please sign in to comment.