From 5ca164b96b62a44a08ea59baacd8fd2948cfc105 Mon Sep 17 00:00:00 2001 From: CURZOLA Pierre Date: Thu, 13 Jul 2023 15:41:23 +0200 Subject: [PATCH] deps: update go-scalingo --- .../Scalingo/go-scalingo/v6/maintenance.go | 13 ------------- vendor/modules.txt | 1 + 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/maintenance.go b/vendor/github.com/Scalingo/go-scalingo/v6/maintenance.go index ba2d84c80..4f827b3ac 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/maintenance.go +++ b/vendor/github.com/Scalingo/go-scalingo/v6/maintenance.go @@ -4,11 +4,6 @@ import ( "context" "time" -<<<<<<< HEAD -======= - "gopkg.in/errgo.v1" - ->>>>>>> c9d3d850 (feat(cmd): add maintenance info) "github.com/Scalingo/go-utils/errors/v2" ) @@ -60,11 +55,7 @@ func (c *Client) DatabaseUpdateMaintenanceWindow(ctx context.Context, app, addon }, &dbRes) if err != nil { -<<<<<<< HEAD return Database{}, errors.Notef(ctx, err, "update database '%v' maintenance window", addonID) -======= - return Database{}, errgo.Notef(err, "update database '%v' maintenance window", addonID) ->>>>>>> c9d3d850 (feat(cmd): add maintenance info) } return dbRes.Database, nil } @@ -79,11 +70,7 @@ func (c *Client) DatabaseListMaintenance(ctx context.Context, app, addonID strin var maintenanceRes ListMaintenanceResponse err := c.DBAPI(app, addonID).SubresourceList(ctx, "databases", addonID, "maintenance", opts.ToMap(), &maintenanceRes) if err != nil { -<<<<<<< HEAD return ListMaintenanceResponse{}, errors.Notef(ctx, err, "list database '%v' maintenance", addonID) -======= - return ListMaintenanceResponse{}, errgo.Notef(err, "list database '%v' maintenance", addonID) ->>>>>>> c9d3d850 (feat(cmd): add maintenance info) } return maintenanceRes, nil } diff --git a/vendor/modules.txt b/vendor/modules.txt index cab8e7bb0..e5411eae1 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -334,3 +334,4 @@ gopkg.in/warnings.v0 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 +# github.com/Scalingo/go-scalingo/v6 v6.6.0 => ../go-scalingo