Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(auth): replace use of deprecated ErrOTPRequired #1009

Merged
merged 6 commits into from
Sep 22, 2023
Merged

refactor(auth): replace use of deprecated ErrOTPRequired #1009

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ef3469f
refactor(auth): replace use of deprecated ErrOTPRequired
EtienneM Sep 18, 2023
90a2fe2
chore(deps): update github.com/Scalingo/go-scalingo from 6.7.2 to 6.7.3
EtienneM Sep 18, 2023
5816a23
refactor(auth): replace use of deprecated ErrOTPRequired
EtienneM Sep 18, 2023
2e0a33b
fix: use errgo.Notef rather than errgo.Mask
EtienneM Sep 18, 2023
5dde6ad
refactor(auth): drop the use of errgo
EtienneM Sep 18, 2023
2d7ffb7
refactor(auth): drop the use of scalingoerrors.RootCause
EtienneM Sep 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func List(ctx context.Context) error {
t := tablewriter.NewWriter(os.Stdout)
t.SetHeader([]string{"Name", "Role", "Status"})

currentUser, err := config.C.CurrentUser()
currentUser, err := config.C.CurrentUser(ctx)
if err != nil {
return errgo.Notef(err, "fail to get current user")
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/addon_providers_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var (
Usage: "List all addons",
Action: func(c *cli.Context) error {
if err := addonproviders.List(c.Context); err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
},
Expand Down
20 changes: 10 additions & 10 deletions cmd/addons.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ var (

err := addons.List(c.Context, currentApp)
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}

return nil
Expand Down Expand Up @@ -60,7 +60,7 @@ var (

err := addons.Provision(c.Context, currentApp, c.Args().First(), c.Args().Slice()[1])
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}

return nil
Expand Down Expand Up @@ -92,12 +92,12 @@ var (

addonUUID, err := utils.GetAddonUUIDFromType(c.Context, currentApp, c.Args().First())
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}

err = addons.Destroy(c.Context, currentApp, addonUUID)
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}

return nil
Expand Down Expand Up @@ -127,12 +127,12 @@ var (

addonUUID, err := utils.GetAddonUUIDFromType(c.Context, currentApp, c.Args().First())
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}

err = addons.Upgrade(c.Context, currentApp, addonUUID, c.Args().Slice()[1])
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
},
Expand Down Expand Up @@ -162,12 +162,12 @@ var (

addonUUID, err := utils.GetAddonUUIDFromType(c.Context, currentApp, addonName)
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}

err = addons.Info(c.Context, currentApp, addonUUID)
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}

return nil
Expand Down Expand Up @@ -214,15 +214,15 @@ var (

err := addons.UpdateConfig(ctx, currentApp, currentAddon, config)
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}

return nil
},
BashComplete: func(c *cli.Context) {
err := autocomplete.CmdFlagsAutoComplete(c, "addons-config")
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
},
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/addons_providers_plans_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ var (
return nil
}
if err := addonproviders.Plans(c.Context, c.Args().First()); err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
},
Expand Down
20 changes: 10 additions & 10 deletions cmd/alerts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ var (

err := alerts.List(c.Context, detect.CurrentApp(c))
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
},
Expand Down Expand Up @@ -66,7 +66,7 @@ var (
if !isValidAlertAddOpts(c) {
err := cli.ShowCommandHelp(c, "alerts-add")
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
}
Expand All @@ -87,7 +87,7 @@ var (
Notifiers: c.StringSlice("n"),
})
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
},
Expand Down Expand Up @@ -125,7 +125,7 @@ var (
if c.Args().Len() != 1 {
err := cli.ShowCommandHelp(c, "alerts-update")
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
}
Expand Down Expand Up @@ -171,7 +171,7 @@ var (

err := alerts.Update(c.Context, currentApp, alertID, params)
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
},
Expand All @@ -196,7 +196,7 @@ var (
if c.Args().Len() != 1 {
err := cli.ShowCommandHelp(c, "alerts-enable")
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
}
Expand All @@ -210,7 +210,7 @@ var (
Disabled: &disabled,
})
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
},
Expand All @@ -235,7 +235,7 @@ var (
if c.Args().Len() != 1 {
err := cli.ShowCommandHelp(c, "alerts-disable")
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
}
Expand All @@ -249,7 +249,7 @@ var (
Disabled: &disabled,
})
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
},
Expand Down Expand Up @@ -281,7 +281,7 @@ var (

err := alerts.Remove(c.Context, currentApp, c.Args().First())
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
},
Expand Down
4 changes: 2 additions & 2 deletions cmd/apps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var (
Usage: "List your apps",
Action: func(c *cli.Context) error {
if err := apps.List(c.Context); err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
},
Expand All @@ -38,7 +38,7 @@ var (
Action: func(c *cli.Context) error {
currentApp := detect.CurrentApp(c)
if err := apps.Info(c.Context, currentApp); err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
},
Expand Down
20 changes: 10 additions & 10 deletions cmd/autoscalers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var (

err := autoscalers.List(c.Context, detect.CurrentApp(c))
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
},
Expand Down Expand Up @@ -57,7 +57,7 @@ var (
if !isValidAutoscalerAddOpts(c) {
err := cli.ShowCommandHelp(c, "autoscalers-add")
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
}
Expand All @@ -74,7 +74,7 @@ var (
MaxContainers: c.Int("max-containers"),
})
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
},
Expand Down Expand Up @@ -107,7 +107,7 @@ var (
if c.Args().Len() != 0 || !c.IsSet("c") {
err := cli.ShowCommandHelp(c, "autoscalers-update")
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
}
Expand Down Expand Up @@ -139,7 +139,7 @@ var (
}
err := autoscalers.Update(c.Context, currentApp, c.String("c"), params)
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
},
Expand All @@ -162,7 +162,7 @@ var (
if c.Args().Len() != 1 {
err := cli.ShowCommandHelp(c, "autoscalers-enable")
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
}
Expand All @@ -176,7 +176,7 @@ var (
Disabled: &disabled,
})
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
},
Expand All @@ -200,7 +200,7 @@ var (
if c.Args().Len() != 1 {
err := cli.ShowCommandHelp(c, "autoscalers-disable")
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
}
Expand All @@ -214,7 +214,7 @@ var (
Disabled: &disabled,
})
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
},
Expand Down Expand Up @@ -246,7 +246,7 @@ var (

err := autoscalers.Remove(c.Context, currentApp, c.Args().First())
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
},
Expand Down
6 changes: 3 additions & 3 deletions cmd/backups.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ var (

err := db.ListBackups(c.Context, currentApp, addonName)
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
},
Expand All @@ -51,7 +51,7 @@ var (

err := db.CreateBackup(c.Context, currentApp, addonName)
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
},
Expand Down Expand Up @@ -94,7 +94,7 @@ var (

err := db.DownloadBackup(c.Context, currentApp, addonName, backup, opts)
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
},
Expand Down
2 changes: 1 addition & 1 deletion cmd/changelog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ var (
Action: func(c *cli.Context) error {
err := update.ShowLastChangelog()
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
return nil
},
Expand Down
6 changes: 3 additions & 3 deletions cmd/collaborators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ var (
} else {
err := collaborators.List(c.Context, currentApp)
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
}
return nil
Expand Down Expand Up @@ -51,7 +51,7 @@ var (
utils.CheckForConsent(c.Context, currentApp, utils.ConsentTypeContainers)
err := collaborators.Add(c.Context, currentApp, c.Args().First())
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
}
return nil
Expand Down Expand Up @@ -80,7 +80,7 @@ var (
utils.CheckForConsent(c.Context, currentApp, utils.ConsentTypeContainers)
err := collaborators.Remove(c.Context, currentApp, c.Args().First())
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
}
return nil
Expand Down
6 changes: 3 additions & 3 deletions cmd/commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,19 +81,19 @@ func regionalCommandAction(action cli.ActionFunc) cli.ActionFunc {
return func(c *cli.Context) error {
token := os.Getenv("SCALINGO_API_TOKEN")

currentUser, err := config.C.CurrentUser()
currentUser, err := config.C.CurrentUser(c.Context)
if err != nil || currentUser == nil {
err := session.Login(c.Context, session.LoginOpts{APIToken: token})
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
}

regions, err := config.EnsureRegionsCache(c.Context, config.C, config.GetRegionOpts{
Token: token,
})
if err != nil {
errorQuit(err)
errorQuit(c.Context, err)
}
currentRegion := regionNameFromFlags(c)

Expand Down
Loading