From 5af36f33e85621b00b856a79a36c61df64a7eae1 Mon Sep 17 00:00:00 2001 From: Soulou Date: Fri, 19 Apr 2024 12:27:23 +0200 Subject: [PATCH 1/9] Bump to go-scalingo/v7 --- addons/config.go | 2 +- addons/destroy.go | 2 +- addons/info.go | 2 +- addons/provision.go | 2 +- addons/upgrade.go | 2 +- alerts/add.go | 2 +- alerts/update.go | 2 +- apps/create.go | 2 +- apps/events.go | 2 +- apps/info.go | 4 +- apps/logs.go | 4 +- apps/one_off_stop.go | 2 +- apps/operations.go | 2 +- apps/restart.go | 2 +- apps/run.go | 4 +- apps/run/run_unix.go | 4 +- apps/run/run_windows.go | 2 +- apps/scale.go | 6 +- apps/sendsignal.go | 2 +- apps/stats.go | 2 +- autoscalers/add.go | 2 +- autoscalers/get_from_container_type.go | 2 +- autoscalers/update.go | 2 +- cmd/alerts.go | 2 +- cmd/autocomplete/apps.go | 4 +- cmd/autocomplete/collaborators_add.go | 4 +- cmd/autocomplete/current_app.go | 2 +- cmd/autocomplete/flag_app.go | 2 +- cmd/autoscalers.go | 2 +- cmd/commands.go | 4 +- cmd/databases.go | 2 +- cmd/deployments.go | 4 +- cmd/error.go | 6 +- cmd/flags.go | 2 +- cmd/integration_link.go | 4 +- cmd/log_drains.go | 2 +- cmd/maintenance.go | 2 +- cmd/notifiers.go | 2 +- cmd/region_migrations.go | 2 +- cmd/scm_integrations.go | 2 +- cmd/timeline.go | 2 +- cmd/user-timeline.go | 2 +- collaborators/remove.go | 2 +- config/auth.go | 4 +- config/auth/config.go | 2 +- config/auth_test.go | 2 +- config/config.go | 2 +- config/region.go | 4 +- crontasks/list.go | 2 +- db/backup_create.go | 2 +- db/backup_download.go | 6 +- db/backups.go | 2 +- db/backups_config.go | 2 +- db/features.go | 2 +- db/maintenance/info.go | 2 +- db/maintenance/info_test.go | 2 +- db/maintenance/list.go | 2 +- db/tunnel.go | 4 +- db/users/create.go | 2 +- db/users/delete.go | 2 +- db/users/update.go | 2 +- deployments/deploy.go | 6 +- deployments/deploy_war.go | 2 +- deployments/follow.go | 4 +- deployments/list.go | 2 +- detect/app.go | 2 +- detect/region.go | 2 +- detect/region_test.go | 2 +- domains/add.go | 2 +- domains/list.go | 2 +- domains/remove.go | 2 +- env/edit.go | 2 +- events/timeline.go | 2 +- git/setup.go | 2 +- go.mod | 1 + go.sum | 2 + integrationlink/create.go | 4 +- integrationlink/params.go | 2 +- integrationlink/pull_request.go | 2 +- integrationlink/show.go | 4 +- integrationlink/update.go | 2 +- keys/remove.go | 2 +- logdrains/add.go | 2 +- logdrains/list.go | 2 +- logs/logs.go | 2 +- net/ssh/client.go | 2 +- notifiers/create.go | 4 +- notifiers/destroy.go | 2 +- notifiers/details.go | 2 +- notifiers/list.go | 2 +- regionmigrations/confirmations.go | 2 +- regionmigrations/refresher.go | 2 +- regionmigrations/run.go | 2 +- regionmigrations/status.go | 2 +- regionmigrations/utils.go | 2 +- regionmigrations/watch.go | 2 +- scalingo/main.go | 2 +- scmintegrations/create.go | 2 +- scmintegrations/delete.go | 2 +- scmintegrations/import_keys.go | 2 +- scmintegrations/list.go | 2 +- scmintegrations/utils.go | 2 +- services/github/client.go | 2 +- session/login.go | 4 +- stacks/set.go | 2 +- user/events.go | 2 +- utils/errors.go | 2 +- utils/git.go | 2 +- utils/helper.go | 4 +- utils/time.go | 2 +- utils/time_test.go | 2 +- .../Scalingo/go-scalingo/v6/version.go | 3 - .../Scalingo/go-scalingo/{v6 => v7}/.ackrc | 0 .../Scalingo/go-scalingo/{v6 => v7}/.env.test | 0 .../go-scalingo/{v6 => v7}/.gitignore | 0 .../go-scalingo/{v6 => v7}/CHANGELOG.md | 5 ++ .../go-scalingo/{v6 => v7}/Dockerfile | 0 .../Scalingo/go-scalingo/{v6 => v7}/LICENSE | 0 .../Scalingo/go-scalingo/{v6 => v7}/README.md | 6 +- .../Scalingo/go-scalingo/{v6 => v7}/addons.go | 2 +- .../{v6 => v7}/addons_providers.go | 2 +- .../Scalingo/go-scalingo/{v6 => v7}/alerts.go | 0 .../Scalingo/go-scalingo/{v6 => v7}/apps.go | 2 +- .../go-scalingo/{v6 => v7}/auth_mock.go | 4 +- .../go-scalingo/{v6 => v7}/autoscalers.go | 0 .../go-scalingo/{v6 => v7}/backups.go | 2 +- .../go-scalingo/{v6 => v7}/billing/profile.go | 0 .../Scalingo/go-scalingo/{v6 => v7}/client.go | 2 +- .../go-scalingo/{v6 => v7}/collaborators.go | 0 .../go-scalingo/{v6 => v7}/container.go | 2 +- .../go-scalingo/{v6 => v7}/container_sizes.go | 2 +- .../go-scalingo/{v6 => v7}/cron_tasks.go | 0 .../{v6 => v7}/data_access_consent.go | 0 .../{v6 => v7}/database_type_versions.go | 2 +- .../go-scalingo/{v6 => v7}/databases.go | 2 +- .../go-scalingo/{v6 => v7}/debug/log.go | 0 .../go-scalingo/{v6 => v7}/deployments.go | 2 +- .../go-scalingo/{v6 => v7}/docker-compose.yml | 0 .../go-scalingo/{v6 => v7}/domains.go | 68 ++++++++++++------- .../Scalingo/go-scalingo/{v6 => v7}/env.go | 2 +- .../Scalingo/go-scalingo/{v6 => v7}/events.go | 2 +- .../go-scalingo/{v6 => v7}/events_account.go | 0 .../go-scalingo/{v6 => v7}/events_addon.go | 0 .../go-scalingo/{v6 => v7}/events_alert.go | 0 .../go-scalingo/{v6 => v7}/events_app.go | 0 .../go-scalingo/{v6 => v7}/events_billing.go | 2 +- .../{v6 => v7}/events_boilerplate.go | 0 .../{v6 => v7}/events_specialize.go | 2 +- .../go-scalingo/{v6 => v7}/events_structs.go | 0 .../go-scalingo/{v6 => v7}/events_token.go | 0 .../go-scalingo/{v6 => v7}/events_types.go | 2 +- .../go-scalingo/{v6 => v7}/events_user.go | 0 .../{v6 => v7}/gomock_subresourceservice.go | 0 .../{v6 => v7}/http/addon_token_generator.go | 0 .../{v6 => v7}/http/api_request.go | 4 +- .../{v6 => v7}/http/api_token_generator.go | 0 .../go-scalingo/{v6 => v7}/http/client.go | 0 .../go-scalingo/{v6 => v7}/http/errors.go | 2 +- .../{v6 => v7}/http/httpmock/client_mock.go | 4 +- .../go-scalingo/{v6 => v7}/http/tokens.go | 0 .../go-scalingo/{v6 => v7}/invoices.go | 0 .../go-scalingo/{v6 => v7}/io/indent.go | 0 .../go-scalingo/{v6 => v7}/io/status.go | 0 .../Scalingo/go-scalingo/{v6 => v7}/keys.go | 0 .../go-scalingo/{v6 => v7}/log_drains.go | 2 +- .../go-scalingo/{v6 => v7}/logs-archives.go | 2 +- .../Scalingo/go-scalingo/{v6 => v7}/logs.go | 2 +- .../go-scalingo/{v6 => v7}/maintenance.go | 0 .../go-scalingo/{v6 => v7}/metrics.go | 0 .../go-scalingo/{v6 => v7}/mocks.json | 2 +- .../go-scalingo/{v6 => v7}/mocks_sig.json | 0 .../{v6 => v7}/notification_platforms.go | 4 +- .../go-scalingo/{v6 => v7}/notifier_types.go | 2 +- .../go-scalingo/{v6 => v7}/notifiers.go | 2 +- .../go-scalingo/{v6 => v7}/operations.go | 2 +- .../Scalingo/go-scalingo/{v6 => v7}/owner.go | 0 .../{v6 => v7}/pagination_options.go | 0 .../{v6 => v7}/region_migrations.go | 2 +- .../go-scalingo/{v6 => v7}/regions.go | 2 +- .../go-scalingo/{v6 => v7}/review_apps.go | 0 .../Scalingo/go-scalingo/{v6 => v7}/run.go | 2 +- .../{v6 => v7}/scm_integrations.go | 2 +- .../go-scalingo/{v6 => v7}/scm_repo_link.go | 2 +- .../Scalingo/go-scalingo/{v6 => v7}/signup.go | 2 +- .../go-scalingo/{v6 => v7}/sources.go | 0 .../Scalingo/go-scalingo/{v6 => v7}/stacks.go | 2 +- .../go-scalingo/{v6 => v7}/static_token.go | 0 .../Scalingo/go-scalingo/{v6 => v7}/tokens.go | 2 +- .../Scalingo/go-scalingo/{v6 => v7}/users.go | 2 +- .../Scalingo/go-scalingo/v7/version.go | 3 + vendor/modules.txt | 14 ++-- 191 files changed, 241 insertions(+), 211 deletions(-) delete mode 100644 vendor/github.com/Scalingo/go-scalingo/v6/version.go rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/.ackrc (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/.env.test (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/.gitignore (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/CHANGELOG.md (99%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/Dockerfile (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/LICENSE (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/README.md (96%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/addons.go (99%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/addons_providers.go (98%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/alerts.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/apps.go (99%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/auth_mock.go (88%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/autoscalers.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/backups.go (98%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/billing/profile.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/client.go (99%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/collaborators.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/container.go (96%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/container_sizes.go (95%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/cron_tasks.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/data_access_consent.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/database_type_versions.go (97%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/databases.go (99%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/debug/log.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/deployments.go (99%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/docker-compose.yml (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/domains.go (65%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/env.go (98%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/events.go (97%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/events_account.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/events_addon.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/events_alert.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/events_app.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/events_billing.go (96%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/events_boilerplate.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/events_specialize.go (99%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/events_structs.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/events_token.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/events_types.go (96%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/events_user.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/gomock_subresourceservice.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/http/addon_token_generator.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/http/api_request.go (98%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/http/api_token_generator.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/http/client.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/http/errors.go (99%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/http/httpmock/client_mock.go (98%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/http/tokens.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/invoices.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/io/indent.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/io/status.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/keys.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/log_drains.go (98%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/logs-archives.go (97%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/logs.go (95%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/maintenance.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/metrics.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/mocks.json (98%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/mocks_sig.json (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/notification_platforms.go (95%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/notifier_types.go (99%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/notifiers.go (98%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/operations.go (97%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/owner.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/pagination_options.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/region_migrations.go (99%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/regions.go (97%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/review_apps.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/run.go (96%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/scm_integrations.go (98%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/scm_repo_link.go (99%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/signup.go (93%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/sources.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/stacks.go (96%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/static_token.go (100%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/tokens.go (98%) rename vendor/github.com/Scalingo/go-scalingo/{v6 => v7}/users.go (98%) create mode 100644 vendor/github.com/Scalingo/go-scalingo/v7/version.go diff --git a/addons/config.go b/addons/config.go index 5a3ec026d..426d59f4c 100644 --- a/addons/config.go +++ b/addons/config.go @@ -8,7 +8,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/utils" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/addons/destroy.go b/addons/destroy.go index afb05ae5d..237a0e742 100644 --- a/addons/destroy.go +++ b/addons/destroy.go @@ -9,7 +9,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) func Destroy(ctx context.Context, app, addonID string) error { diff --git a/addons/info.go b/addons/info.go index 2f0224d6a..96a830216 100644 --- a/addons/info.go +++ b/addons/info.go @@ -18,7 +18,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/db" "github.com/Scalingo/cli/utils" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) // Info is the command handler displaying static information about one given addon diff --git a/addons/provision.go b/addons/provision.go index 70c997104..8fd90f713 100644 --- a/addons/provision.go +++ b/addons/provision.go @@ -9,7 +9,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" "github.com/Scalingo/cli/utils" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) func Provision(ctx context.Context, app, addon, plan string) error { diff --git a/addons/upgrade.go b/addons/upgrade.go index 1ea1c76e2..cf3fddff6 100644 --- a/addons/upgrade.go +++ b/addons/upgrade.go @@ -7,7 +7,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) func Upgrade(ctx context.Context, app, addonID, plan string) error { diff --git a/alerts/add.go b/alerts/add.go index a3f491741..02d3eb52b 100644 --- a/alerts/add.go +++ b/alerts/add.go @@ -5,7 +5,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/alerts/update.go b/alerts/update.go index 44d5ce08b..76829879c 100644 --- a/alerts/update.go +++ b/alerts/update.go @@ -5,7 +5,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/apps/create.go b/apps/create.go index eae25e221..23da19684 100644 --- a/apps/create.go +++ b/apps/create.go @@ -8,7 +8,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/utils" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) func Create(ctx context.Context, appName string, remote string, buildpack string) error { diff --git a/apps/events.go b/apps/events.go index 3f0db194f..70292afe8 100644 --- a/apps/events.go +++ b/apps/events.go @@ -7,7 +7,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/events" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) func Events(ctx context.Context, app string, paginationOpts scalingo.PaginationOpts) error { diff --git a/apps/info.go b/apps/info.go index c92892f39..b8ada85bf 100644 --- a/apps/info.go +++ b/apps/info.go @@ -8,8 +8,8 @@ import ( "github.com/olekukonko/tablewriter" "github.com/Scalingo/cli/config" - "github.com/Scalingo/go-scalingo/v6" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7/debug" "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/apps/logs.go b/apps/logs.go index 85481f004..244bf4926 100644 --- a/apps/logs.go +++ b/apps/logs.go @@ -11,8 +11,8 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/logs" - "github.com/Scalingo/go-scalingo/v6" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7/debug" ) type WSEvent struct { diff --git a/apps/one_off_stop.go b/apps/one_off_stop.go index 1e0574c00..185db4499 100644 --- a/apps/one_off_stop.go +++ b/apps/one_off_stop.go @@ -8,7 +8,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) func OneOffStop(ctx context.Context, appName, oneOffLabel string) error { diff --git a/apps/operations.go b/apps/operations.go index c76a8e4c0..c3f8e64e0 100644 --- a/apps/operations.go +++ b/apps/operations.go @@ -12,7 +12,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - scalingo "github.com/Scalingo/go-scalingo/v6" + scalingo "github.com/Scalingo/go-scalingo/v7" errors "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/apps/restart.go b/apps/restart.go index 2439df717..a816d268c 100644 --- a/apps/restart.go +++ b/apps/restart.go @@ -7,7 +7,7 @@ import ( "gopkg.in/errgo.v1" "github.com/Scalingo/cli/config" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) func Restart(ctx context.Context, app string, sync bool, args []string) error { diff --git a/apps/run.go b/apps/run.go index b58983564..fb92298a4 100644 --- a/apps/run.go +++ b/apps/run.go @@ -28,8 +28,8 @@ import ( "github.com/Scalingo/cli/io" "github.com/Scalingo/cli/signals" "github.com/Scalingo/cli/term" - "github.com/Scalingo/go-scalingo/v6" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7/debug" errors "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/apps/run/run_unix.go b/apps/run/run_unix.go index 29e000d92..93314b23c 100644 --- a/apps/run/run_unix.go +++ b/apps/run/run_unix.go @@ -18,8 +18,8 @@ import ( "gopkg.in/errgo.v1" "github.com/Scalingo/cli/httpclient" - "github.com/Scalingo/go-scalingo/v6" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7/debug" ) type UpdateTtyParams struct { diff --git a/apps/run/run_windows.go b/apps/run/run_windows.go index 10a91dfda..3f6644b6b 100644 --- a/apps/run/run_windows.go +++ b/apps/run/run_windows.go @@ -5,7 +5,7 @@ import ( "net" "os" - scalingo "github.com/Scalingo/go-scalingo/v6" + scalingo "github.com/Scalingo/go-scalingo/v7" ) func NotifiedSignals() chan os.Signal { diff --git a/apps/scale.go b/apps/scale.go index c9fa7f20d..08323adca 100644 --- a/apps/scale.go +++ b/apps/scale.go @@ -13,9 +13,9 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" "github.com/Scalingo/cli/utils" - "github.com/Scalingo/go-scalingo/v6" - "github.com/Scalingo/go-scalingo/v6/debug" - "github.com/Scalingo/go-scalingo/v6/http" + "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7/debug" + "github.com/Scalingo/go-scalingo/v7/http" "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/apps/sendsignal.go b/apps/sendsignal.go index ea89ae003..56be0192c 100644 --- a/apps/sendsignal.go +++ b/apps/sendsignal.go @@ -9,7 +9,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/apps/stats.go b/apps/stats.go index 4f639cc2e..854418afc 100644 --- a/apps/stats.go +++ b/apps/stats.go @@ -11,7 +11,7 @@ import ( "gopkg.in/errgo.v1" "github.com/Scalingo/cli/config" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) const ( diff --git a/autoscalers/add.go b/autoscalers/add.go index 3bcf259ba..56e07f0e1 100644 --- a/autoscalers/add.go +++ b/autoscalers/add.go @@ -7,7 +7,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) func Add(ctx context.Context, app string, params scalingo.AutoscalerAddParams) error { diff --git a/autoscalers/get_from_container_type.go b/autoscalers/get_from_container_type.go index 207b05cca..f9580e573 100644 --- a/autoscalers/get_from_container_type.go +++ b/autoscalers/get_from_container_type.go @@ -6,7 +6,7 @@ import ( "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) var ( diff --git a/autoscalers/update.go b/autoscalers/update.go index 7233061ff..04c7e1080 100644 --- a/autoscalers/update.go +++ b/autoscalers/update.go @@ -7,7 +7,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/cmd/alerts.go b/cmd/alerts.go index 41b48a1bc..50fbf841c 100644 --- a/cmd/alerts.go +++ b/cmd/alerts.go @@ -7,7 +7,7 @@ import ( "github.com/Scalingo/cli/cmd/autocomplete" "github.com/Scalingo/cli/detect" "github.com/Scalingo/cli/utils" - scalingo "github.com/Scalingo/go-scalingo/v6" + scalingo "github.com/Scalingo/go-scalingo/v7" ) var ( diff --git a/cmd/autocomplete/apps.go b/cmd/autocomplete/apps.go index 365f354fb..2f48255d8 100644 --- a/cmd/autocomplete/apps.go +++ b/cmd/autocomplete/apps.go @@ -10,8 +10,8 @@ import ( "gopkg.in/errgo.v1" "github.com/Scalingo/cli/config" - "github.com/Scalingo/go-scalingo/v6" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7/debug" ) type appsCache struct { diff --git a/cmd/autocomplete/collaborators_add.go b/cmd/autocomplete/collaborators_add.go index 92d9d8048..17594285a 100644 --- a/cmd/autocomplete/collaborators_add.go +++ b/cmd/autocomplete/collaborators_add.go @@ -8,8 +8,8 @@ import ( "gopkg.in/errgo.v1" "github.com/Scalingo/cli/config" - "github.com/Scalingo/go-scalingo/v6" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7/debug" ) func CollaboratorsAddAutoComplete(c *cli.Context) error { diff --git a/cmd/autocomplete/current_app.go b/cmd/autocomplete/current_app.go index ea1d0e9f3..a2c7ce2e8 100644 --- a/cmd/autocomplete/current_app.go +++ b/cmd/autocomplete/current_app.go @@ -7,7 +7,7 @@ import ( "github.com/Scalingo/cli/detect" "github.com/Scalingo/cli/utils" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7/debug" ) func CurrentAppCompletion(c *cli.Context) string { diff --git a/cmd/autocomplete/flag_app.go b/cmd/autocomplete/flag_app.go index 4ab7b8dd7..8cec776b6 100644 --- a/cmd/autocomplete/flag_app.go +++ b/cmd/autocomplete/flag_app.go @@ -5,7 +5,7 @@ import ( "github.com/urfave/cli/v2" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7/debug" ) func FlagAppAutoComplete(c *cli.Context) bool { diff --git a/cmd/autoscalers.go b/cmd/autoscalers.go index 68c1687a9..ba23f790c 100644 --- a/cmd/autoscalers.go +++ b/cmd/autoscalers.go @@ -7,7 +7,7 @@ import ( "github.com/Scalingo/cli/cmd/autocomplete" "github.com/Scalingo/cli/detect" "github.com/Scalingo/cli/utils" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) var ( diff --git a/cmd/commands.go b/cmd/commands.go index e1c43c734..1e5983e34 100644 --- a/cmd/commands.go +++ b/cmd/commands.go @@ -12,8 +12,8 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/detect" "github.com/Scalingo/cli/session" - "github.com/Scalingo/go-scalingo/v6" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7/debug" ) type AppCommands struct { diff --git a/cmd/databases.go b/cmd/databases.go index f713f0be7..f62470f7c 100644 --- a/cmd/databases.go +++ b/cmd/databases.go @@ -13,7 +13,7 @@ import ( dbUsers "github.com/Scalingo/cli/db/users" "github.com/Scalingo/cli/detect" "github.com/Scalingo/cli/utils" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) var ( diff --git a/cmd/deployments.go b/cmd/deployments.go index 2bfcf0006..7abbaf3e7 100644 --- a/cmd/deployments.go +++ b/cmd/deployments.go @@ -10,8 +10,8 @@ import ( "github.com/Scalingo/cli/deployments" "github.com/Scalingo/cli/detect" "github.com/Scalingo/cli/utils" - scalingo "github.com/Scalingo/go-scalingo/v6" - "github.com/Scalingo/go-scalingo/v6/io" + scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7/io" ) var ( diff --git a/cmd/error.go b/cmd/error.go index 36ca02f2a..bfa8b35a5 100644 --- a/cmd/error.go +++ b/cmd/error.go @@ -18,9 +18,9 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - "github.com/Scalingo/go-scalingo/v6" - "github.com/Scalingo/go-scalingo/v6/debug" - httpclient "github.com/Scalingo/go-scalingo/v6/http" + "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7/debug" + httpclient "github.com/Scalingo/go-scalingo/v7/http" "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/cmd/flags.go b/cmd/flags.go index 9bdc8d9b0..f44474908 100644 --- a/cmd/flags.go +++ b/cmd/flags.go @@ -7,7 +7,7 @@ import ( "github.com/Scalingo/cli/io" "github.com/Scalingo/cli/utils" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7/debug" ) var ( diff --git a/cmd/integration_link.go b/cmd/integration_link.go index 4c2d2b08d..b848dd17a 100644 --- a/cmd/integration_link.go +++ b/cmd/integration_link.go @@ -19,8 +19,8 @@ import ( "github.com/Scalingo/cli/io" "github.com/Scalingo/cli/scmintegrations" "github.com/Scalingo/cli/utils" - "github.com/Scalingo/go-scalingo/v6" - "github.com/Scalingo/go-scalingo/v6/http" + "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7/http" scalingoerrors "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/cmd/log_drains.go b/cmd/log_drains.go index 9a9aecb3f..50469871b 100644 --- a/cmd/log_drains.go +++ b/cmd/log_drains.go @@ -10,7 +10,7 @@ import ( "github.com/Scalingo/cli/detect" "github.com/Scalingo/cli/logdrains" "github.com/Scalingo/cli/utils" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) var ( diff --git a/cmd/maintenance.go b/cmd/maintenance.go index fd61db1a8..e5f076516 100644 --- a/cmd/maintenance.go +++ b/cmd/maintenance.go @@ -6,7 +6,7 @@ import ( "github.com/Scalingo/cli/db/maintenance" "github.com/Scalingo/cli/detect" "github.com/Scalingo/cli/utils" - scalingo "github.com/Scalingo/go-scalingo/v6" + scalingo "github.com/Scalingo/go-scalingo/v7" ) var databaseMaintenanceList = cli.Command{ diff --git a/cmd/notifiers.go b/cmd/notifiers.go index 929831d65..d28506b43 100644 --- a/cmd/notifiers.go +++ b/cmd/notifiers.go @@ -7,7 +7,7 @@ import ( "github.com/Scalingo/cli/detect" "github.com/Scalingo/cli/notifiers" "github.com/Scalingo/cli/utils" - scalingo "github.com/Scalingo/go-scalingo/v6" + scalingo "github.com/Scalingo/go-scalingo/v7" ) var ( diff --git a/cmd/region_migrations.go b/cmd/region_migrations.go index a885c0014..a292d8fef 100644 --- a/cmd/region_migrations.go +++ b/cmd/region_migrations.go @@ -7,7 +7,7 @@ import ( "github.com/Scalingo/cli/detect" "github.com/Scalingo/cli/regionmigrations" "github.com/Scalingo/cli/utils" - scalingo "github.com/Scalingo/go-scalingo/v6" + scalingo "github.com/Scalingo/go-scalingo/v7" ) var ( diff --git a/cmd/scm_integrations.go b/cmd/scm_integrations.go index af075d141..fc0687eb9 100644 --- a/cmd/scm_integrations.go +++ b/cmd/scm_integrations.go @@ -9,7 +9,7 @@ import ( "github.com/Scalingo/cli/cmd/autocomplete" "github.com/Scalingo/cli/scmintegrations" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) var ( diff --git a/cmd/timeline.go b/cmd/timeline.go index 9e96b0bc0..3665953f8 100644 --- a/cmd/timeline.go +++ b/cmd/timeline.go @@ -7,7 +7,7 @@ import ( "github.com/Scalingo/cli/cmd/autocomplete" "github.com/Scalingo/cli/detect" "github.com/Scalingo/cli/utils" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) var ( diff --git a/cmd/user-timeline.go b/cmd/user-timeline.go index 78d4dfd20..b9470f942 100644 --- a/cmd/user-timeline.go +++ b/cmd/user-timeline.go @@ -5,7 +5,7 @@ import ( "github.com/Scalingo/cli/cmd/autocomplete" "github.com/Scalingo/cli/user" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) var ( diff --git a/collaborators/remove.go b/collaborators/remove.go index df49c104d..d3aa2442a 100644 --- a/collaborators/remove.go +++ b/collaborators/remove.go @@ -8,7 +8,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) var ( diff --git a/config/auth.go b/config/auth.go index 3fc2c548d..6bdd60727 100644 --- a/config/auth.go +++ b/config/auth.go @@ -15,8 +15,8 @@ import ( "github.com/Scalingo/cli/config/auth" appio "github.com/Scalingo/cli/io" "github.com/Scalingo/cli/term" - scalingo "github.com/Scalingo/go-scalingo/v6" - scalingohttp "github.com/Scalingo/go-scalingo/v6/http" + scalingo "github.com/Scalingo/go-scalingo/v7" + scalingohttp "github.com/Scalingo/go-scalingo/v7/http" scalingoerrors "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/config/auth/config.go b/config/auth/config.go index 6217f9f1e..b4028ae59 100644 --- a/config/auth/config.go +++ b/config/auth/config.go @@ -4,7 +4,7 @@ import ( "encoding/json" "time" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) const ( diff --git a/config/auth_test.go b/config/auth_test.go index 131e7a65b..8d618443b 100644 --- a/config/auth_test.go +++ b/config/auth_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" "github.com/Scalingo/cli/config/auth" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) func TestStoreAuth(t *testing.T) { diff --git a/config/config.go b/config/config.go index 74b45734d..2902f89ee 100644 --- a/config/config.go +++ b/config/config.go @@ -14,7 +14,7 @@ import ( "github.com/stvp/rollbar" "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) type ConfigFile struct { diff --git a/config/region.go b/config/region.go index f10414810..a2f8a4f5a 100644 --- a/config/region.go +++ b/config/region.go @@ -10,8 +10,8 @@ import ( "gopkg.in/errgo.v1" "github.com/Scalingo/cli/config/auth" - "github.com/Scalingo/go-scalingo/v6" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7/debug" ) type UnknownRegionError struct { diff --git a/crontasks/list.go b/crontasks/list.go index a2ece1b1e..5516d5691 100644 --- a/crontasks/list.go +++ b/crontasks/list.go @@ -8,7 +8,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/utils" - httpclient "github.com/Scalingo/go-scalingo/v6/http" + httpclient "github.com/Scalingo/go-scalingo/v7/http" "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/db/backup_create.go b/db/backup_create.go index 2a677ed4e..ef99565c8 100644 --- a/db/backup_create.go +++ b/db/backup_create.go @@ -10,7 +10,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - scalingo "github.com/Scalingo/go-scalingo/v6" + scalingo "github.com/Scalingo/go-scalingo/v7" ) func CreateBackup(ctx context.Context, app, addon string) error { diff --git a/db/backup_download.go b/db/backup_download.go index b41e2166e..5ae08850a 100644 --- a/db/backup_download.go +++ b/db/backup_download.go @@ -13,9 +13,9 @@ import ( "gopkg.in/errgo.v1" "github.com/Scalingo/cli/config" - "github.com/Scalingo/go-scalingo/v6" - "github.com/Scalingo/go-scalingo/v6/debug" - httpclient "github.com/Scalingo/go-scalingo/v6/http" + "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7/debug" + httpclient "github.com/Scalingo/go-scalingo/v7/http" ) type DownloadBackupOpts struct { diff --git a/db/backups.go b/db/backups.go index 3d5f6bfe2..3f6273167 100644 --- a/db/backups.go +++ b/db/backups.go @@ -11,7 +11,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - scalingo "github.com/Scalingo/go-scalingo/v6" + scalingo "github.com/Scalingo/go-scalingo/v7" ) func ListBackups(ctx context.Context, app, addon string) error { diff --git a/db/backups_config.go b/db/backups_config.go index 628edc42c..413aeb44f 100644 --- a/db/backups_config.go +++ b/db/backups_config.go @@ -11,7 +11,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - scalingo "github.com/Scalingo/go-scalingo/v6" + scalingo "github.com/Scalingo/go-scalingo/v7" ) func BackupsConfiguration(ctx context.Context, app, addon string, params scalingo.DatabaseUpdatePeriodicBackupsConfigParams) error { diff --git a/db/features.go b/db/features.go index b9028e9bf..fcec947b8 100644 --- a/db/features.go +++ b/db/features.go @@ -10,7 +10,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - scalingo "github.com/Scalingo/go-scalingo/v6" + scalingo "github.com/Scalingo/go-scalingo/v7" ) // EnableFeature is the command handler to enable a database feature on a given diff --git a/db/maintenance/info.go b/db/maintenance/info.go index 5d2cf0c3d..453b0b8ed 100644 --- a/db/maintenance/info.go +++ b/db/maintenance/info.go @@ -10,7 +10,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/utils" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/db/maintenance/info_test.go b/db/maintenance/info_test.go index acb0fc188..a9b7e1400 100644 --- a/db/maintenance/info_test.go +++ b/db/maintenance/info_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) type test struct { diff --git a/db/maintenance/list.go b/db/maintenance/list.go index 3b5d37bc8..dfb08ddc5 100644 --- a/db/maintenance/list.go +++ b/db/maintenance/list.go @@ -10,7 +10,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" "github.com/Scalingo/cli/utils" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/db/tunnel.go b/db/tunnel.go index 43198dc16..9e4609431 100644 --- a/db/tunnel.go +++ b/db/tunnel.go @@ -18,8 +18,8 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" netssh "github.com/Scalingo/cli/net/ssh" - "github.com/Scalingo/go-scalingo/v6" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7/debug" ) var ( diff --git a/db/users/create.go b/db/users/create.go index 0f257b0ba..1c4550bb7 100644 --- a/db/users/create.go +++ b/db/users/create.go @@ -6,7 +6,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" "github.com/Scalingo/go-utils/errors/v2" "github.com/Scalingo/gopassword" ) diff --git a/db/users/delete.go b/db/users/delete.go index 3248c0928..ea585d397 100644 --- a/db/users/delete.go +++ b/db/users/delete.go @@ -6,7 +6,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/db/users/update.go b/db/users/update.go index bcec80267..4350a460c 100644 --- a/db/users/update.go +++ b/db/users/update.go @@ -6,7 +6,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" "github.com/Scalingo/go-utils/errors/v2" "github.com/Scalingo/gopassword" ) diff --git a/deployments/deploy.go b/deployments/deploy.go index 87601272b..989a1bb8b 100644 --- a/deployments/deploy.go +++ b/deployments/deploy.go @@ -9,9 +9,9 @@ import ( "time" "github.com/Scalingo/cli/config" - "github.com/Scalingo/go-scalingo/v6" - "github.com/Scalingo/go-scalingo/v6/debug" - scalingoio "github.com/Scalingo/go-scalingo/v6/io" + "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7/debug" + scalingoio "github.com/Scalingo/go-scalingo/v7/io" "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/deployments/deploy_war.go b/deployments/deploy_war.go index 350d2e665..fbfafdff4 100644 --- a/deployments/deploy_war.go +++ b/deployments/deploy_war.go @@ -15,7 +15,7 @@ import ( "time" "github.com/Scalingo/cli/config" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/deployments/follow.go b/deployments/follow.go index a47eded80..8dfcb952c 100644 --- a/deployments/follow.go +++ b/deployments/follow.go @@ -12,8 +12,8 @@ import ( "gopkg.in/errgo.v1" "github.com/Scalingo/cli/config" - "github.com/Scalingo/go-scalingo/v6" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7/debug" errorspkg "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/deployments/list.go b/deployments/list.go index 607647fa5..e8b41449e 100644 --- a/deployments/list.go +++ b/deployments/list.go @@ -12,7 +12,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" "github.com/Scalingo/cli/utils" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/detect/app.go b/detect/app.go index 0bf6aed87..533254719 100644 --- a/detect/app.go +++ b/detect/app.go @@ -10,7 +10,7 @@ import ( "github.com/Scalingo/cli/utils" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7/debug" ) // CurrentApp returns the app name if it has been found in one of the following: diff --git a/detect/region.go b/detect/region.go index 37e90bef5..b8ab09b7e 100644 --- a/detect/region.go +++ b/detect/region.go @@ -10,7 +10,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/utils" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7/debug" ) // GetRegionFromGitRemote returns the region name extracted from remotes URL of the current Git repository diff --git a/detect/region_test.go b/detect/region_test.go index e9792856a..022e89f72 100644 --- a/detect/region_test.go +++ b/detect/region_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/Scalingo/cli/config" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) func TestGetRegionFromGitRemote(t *testing.T) { diff --git a/domains/add.go b/domains/add.go index 1814dacf6..1f9c5f34e 100644 --- a/domains/add.go +++ b/domains/add.go @@ -7,7 +7,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) func Add(ctx context.Context, app string, domain string, cert string, key string) error { diff --git a/domains/list.go b/domains/list.go index 6e804f520..daf6fd1e2 100644 --- a/domains/list.go +++ b/domains/list.go @@ -9,7 +9,7 @@ import ( "gopkg.in/errgo.v1" "github.com/Scalingo/cli/config" - scalingo "github.com/Scalingo/go-scalingo/v6" + scalingo "github.com/Scalingo/go-scalingo/v7" ) var letsencryptStatusString = map[string]string{ diff --git a/domains/remove.go b/domains/remove.go index c732f560a..1b1a82bef 100644 --- a/domains/remove.go +++ b/domains/remove.go @@ -7,7 +7,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) func Remove(ctx context.Context, app string, domain string) error { diff --git a/env/edit.go b/env/edit.go index b7063fcc1..5148022e3 100644 --- a/env/edit.go +++ b/env/edit.go @@ -11,7 +11,7 @@ import ( "github.com/joho/godotenv" "github.com/Scalingo/cli/config" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" scalingoerrors "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/events/timeline.go b/events/timeline.go index e8208476d..916921cd1 100644 --- a/events/timeline.go +++ b/events/timeline.go @@ -5,7 +5,7 @@ import ( "os" "github.com/Scalingo/cli/io" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) type DisplayTimelineOpts struct { diff --git a/git/setup.go b/git/setup.go index c9efa0e8c..9037be401 100644 --- a/git/setup.go +++ b/git/setup.go @@ -9,7 +9,7 @@ import ( "github.com/Scalingo/cli/io" "github.com/Scalingo/cli/utils" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7/debug" ) type SetupParams struct { diff --git a/go.mod b/go.mod index c4a9e99f5..d997a70c3 100644 --- a/go.mod +++ b/go.mod @@ -35,6 +35,7 @@ require ( dario.cat/mergo v1.0.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/ProtonMail/go-crypto v1.1.0-alpha.2 // indirect + github.com/Scalingo/go-scalingo/v7 v7.0.0 // indirect github.com/VividCortex/ewma v1.2.0 // indirect github.com/cloudflare/circl v1.3.7 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect diff --git a/go.sum b/go.sum index a0ff1d7e9..54fb86540 100644 --- a/go.sum +++ b/go.sum @@ -11,6 +11,8 @@ github.com/ProtonMail/go-crypto v1.1.0-alpha.2 h1:bkyFVUP+ROOARdgCiJzNQo2V2kiB97 github.com/ProtonMail/go-crypto v1.1.0-alpha.2/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= github.com/Scalingo/go-scalingo/v6 v6.7.7 h1:pDjEtcl7z3oJ3t7s5TieWBbr5wlzF/J/7mIHzBCrRBY= github.com/Scalingo/go-scalingo/v6 v6.7.7/go.mod h1:GCQ0KuiYKWr1EXqYXolZ+j7R5+DVjKr2K2t7CrayzW0= +github.com/Scalingo/go-scalingo/v7 v7.0.0 h1:y89FfQgjl8Foxm4+hXfCyGrpmtMnsB8G6kKuijXAUKI= +github.com/Scalingo/go-scalingo/v7 v7.0.0/go.mod h1:UlRkN2cRyagSqAanCZWBgZDWsAQ/dk7xBdN51Fv6evM= github.com/Scalingo/go-utils/errors/v2 v2.4.0 h1:vKG0Js3kzWG7+03LEvH7j8fw+picEcRhbjMm3i9Xbb8= github.com/Scalingo/go-utils/errors/v2 v2.4.0/go.mod h1:WU6Kzi19AlZyUfoxFkdvEeYkIa0W0f172hKPqkOeIpU= github.com/Scalingo/go-utils/logger v1.2.0 h1:E3jtaoRxpIsFcZu/jsvWew8ttUAwKUYQufdPqGYp7EU= diff --git a/integrationlink/create.go b/integrationlink/create.go index 16f31958d..040af0c14 100644 --- a/integrationlink/create.go +++ b/integrationlink/create.go @@ -10,8 +10,8 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" "github.com/Scalingo/cli/utils" - "github.com/Scalingo/go-scalingo/v6" - "github.com/Scalingo/go-scalingo/v6/http" + "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7/http" "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/integrationlink/params.go b/integrationlink/params.go index 0c8867ccc..a88461dae 100644 --- a/integrationlink/params.go +++ b/integrationlink/params.go @@ -3,7 +3,7 @@ package integrationlink import ( "github.com/urfave/cli/v2" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) func CheckAndFillParams(c *cli.Context) *scalingo.SCMRepoLinkUpdateParams { diff --git a/integrationlink/pull_request.go b/integrationlink/pull_request.go index 73adbecab..b3943881d 100644 --- a/integrationlink/pull_request.go +++ b/integrationlink/pull_request.go @@ -6,7 +6,7 @@ import ( "gopkg.in/errgo.v1" "github.com/Scalingo/cli/config" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/integrationlink/show.go b/integrationlink/show.go index fe5df4d41..243bc85bf 100644 --- a/integrationlink/show.go +++ b/integrationlink/show.go @@ -10,8 +10,8 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" "github.com/Scalingo/cli/utils" - scalingo "github.com/Scalingo/go-scalingo/v6" - "github.com/Scalingo/go-scalingo/v6/http" + scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7/http" "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/integrationlink/update.go b/integrationlink/update.go index 74f595f25..c228be099 100644 --- a/integrationlink/update.go +++ b/integrationlink/update.go @@ -8,7 +8,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" "github.com/Scalingo/cli/utils" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/keys/remove.go b/keys/remove.go index 1b593b7c2..5bc583bfe 100644 --- a/keys/remove.go +++ b/keys/remove.go @@ -7,7 +7,7 @@ import ( "gopkg.in/errgo.v1" "github.com/Scalingo/cli/config" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) func Remove(ctx context.Context, name string) error { diff --git a/logdrains/add.go b/logdrains/add.go index 7564b4a72..a4975c11a 100644 --- a/logdrains/add.go +++ b/logdrains/add.go @@ -7,7 +7,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) type AddDrainOpts struct { diff --git a/logdrains/list.go b/logdrains/list.go index 26fbc9f7a..da24c8e3b 100644 --- a/logdrains/list.go +++ b/logdrains/list.go @@ -9,7 +9,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) type printableDrains struct { diff --git a/logs/logs.go b/logs/logs.go index 6719dfab7..39e54a566 100644 --- a/logs/logs.go +++ b/logs/logs.go @@ -22,7 +22,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" "github.com/Scalingo/cli/signals" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7/debug" ) const ( diff --git a/net/ssh/client.go b/net/ssh/client.go index 656b43e05..d430b2103 100644 --- a/net/ssh/client.go +++ b/net/ssh/client.go @@ -9,7 +9,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/crypto/sshkeys" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7/debug" ) var ( diff --git a/notifiers/create.go b/notifiers/create.go index 39e8b112f..85efd67ad 100644 --- a/notifiers/create.go +++ b/notifiers/create.go @@ -7,8 +7,8 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - scalingo "github.com/Scalingo/go-scalingo/v6" - "github.com/Scalingo/go-scalingo/v6/debug" + scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7/debug" ) type ProvisionParams struct { diff --git a/notifiers/destroy.go b/notifiers/destroy.go index 5d851ed22..d777ea052 100644 --- a/notifiers/destroy.go +++ b/notifiers/destroy.go @@ -9,7 +9,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) func Destroy(ctx context.Context, app string, ID string) error { diff --git a/notifiers/details.go b/notifiers/details.go index 207e648cc..3251924a0 100644 --- a/notifiers/details.go +++ b/notifiers/details.go @@ -12,7 +12,7 @@ import ( "gopkg.in/errgo.v1" "github.com/Scalingo/cli/config" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) func Details(ctx context.Context, app, ID string) error { diff --git a/notifiers/list.go b/notifiers/list.go index 934a1244b..114dd5766 100644 --- a/notifiers/list.go +++ b/notifiers/list.go @@ -10,7 +10,7 @@ import ( "gopkg.in/errgo.v1" "github.com/Scalingo/cli/config" - scalingo "github.com/Scalingo/go-scalingo/v6" + scalingo "github.com/Scalingo/go-scalingo/v7" ) func List(ctx context.Context, app string) error { diff --git a/regionmigrations/confirmations.go b/regionmigrations/confirmations.go index a63ae6fa0..6b93b49cf 100644 --- a/regionmigrations/confirmations.go +++ b/regionmigrations/confirmations.go @@ -5,7 +5,7 @@ import ( "github.com/AlecAivazis/survey/v2" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) func ConfirmPrepare(migration scalingo.RegionMigration) bool { diff --git a/regionmigrations/refresher.go b/regionmigrations/refresher.go index a76b7657d..8948e03fb 100644 --- a/regionmigrations/refresher.go +++ b/regionmigrations/refresher.go @@ -12,7 +12,7 @@ import ( errgo "gopkg.in/errgo.v1" "github.com/Scalingo/cli/utils" - scalingo "github.com/Scalingo/go-scalingo/v6" + scalingo "github.com/Scalingo/go-scalingo/v7" "github.com/Scalingo/go-utils/retry" ) diff --git a/regionmigrations/run.go b/regionmigrations/run.go index 0101516f2..21cd851d2 100644 --- a/regionmigrations/run.go +++ b/regionmigrations/run.go @@ -7,7 +7,7 @@ import ( errgo "gopkg.in/errgo.v1" "github.com/Scalingo/cli/config" - scalingo "github.com/Scalingo/go-scalingo/v6" + scalingo "github.com/Scalingo/go-scalingo/v7" ) func Create(ctx context.Context, app string, destination string, dstAppName string) error { diff --git a/regionmigrations/status.go b/regionmigrations/status.go index 9463f6826..9013c23f1 100644 --- a/regionmigrations/status.go +++ b/regionmigrations/status.go @@ -11,7 +11,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" "github.com/Scalingo/cli/utils" - scalingo "github.com/Scalingo/go-scalingo/v6" + scalingo "github.com/Scalingo/go-scalingo/v7" ) func showMigrationStatusSuccess(ctx context.Context, appID string, migration scalingo.RegionMigration) { diff --git a/regionmigrations/utils.go b/regionmigrations/utils.go index c3c025328..6f4df2913 100644 --- a/regionmigrations/utils.go +++ b/regionmigrations/utils.go @@ -3,7 +3,7 @@ package regionmigrations import ( "github.com/fatih/color" - scalingo "github.com/Scalingo/go-scalingo/v6" + scalingo "github.com/Scalingo/go-scalingo/v7" ) func formatMigrationStatus(status scalingo.RegionMigrationStatus) string { diff --git a/regionmigrations/watch.go b/regionmigrations/watch.go index e151c490f..16454a562 100644 --- a/regionmigrations/watch.go +++ b/regionmigrations/watch.go @@ -6,7 +6,7 @@ import ( errgo "gopkg.in/errgo.v1" - scalingo "github.com/Scalingo/go-scalingo/v6" + scalingo "github.com/Scalingo/go-scalingo/v7" ) func WatchMigration(ctx context.Context, client *scalingo.Client, appID, migrationID string, opts RefreshOpts) error { diff --git a/scalingo/main.go b/scalingo/main.go index ce10b69a0..d2dc58632 100644 --- a/scalingo/main.go +++ b/scalingo/main.go @@ -14,7 +14,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/signals" "github.com/Scalingo/cli/update" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7/debug" errors "github.com/Scalingo/go-utils/errors/v2" "github.com/Scalingo/go-utils/logger" ) diff --git a/scmintegrations/create.go b/scmintegrations/create.go index 668d9a4e1..96e0c8fca 100644 --- a/scmintegrations/create.go +++ b/scmintegrations/create.go @@ -7,7 +7,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) type CreateArgs struct { diff --git a/scmintegrations/delete.go b/scmintegrations/delete.go index 8fcca2113..ebe1a74bc 100644 --- a/scmintegrations/delete.go +++ b/scmintegrations/delete.go @@ -7,7 +7,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - scalingo "github.com/Scalingo/go-scalingo/v6" + scalingo "github.com/Scalingo/go-scalingo/v7" ) func Delete(ctx context.Context, id string) error { diff --git a/scmintegrations/import_keys.go b/scmintegrations/import_keys.go index 2dd02545b..859a7e98d 100644 --- a/scmintegrations/import_keys.go +++ b/scmintegrations/import_keys.go @@ -10,7 +10,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) func ImportKeys(ctx context.Context, id string) error { diff --git a/scmintegrations/list.go b/scmintegrations/list.go index 480a55bd3..d06a4787a 100644 --- a/scmintegrations/list.go +++ b/scmintegrations/list.go @@ -9,7 +9,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - scalingo "github.com/Scalingo/go-scalingo/v6" + scalingo "github.com/Scalingo/go-scalingo/v7" ) func List(ctx context.Context) error { diff --git a/scmintegrations/utils.go b/scmintegrations/utils.go index e6c530b56..4dfe93643 100644 --- a/scmintegrations/utils.go +++ b/scmintegrations/utils.go @@ -9,7 +9,7 @@ import ( "gopkg.in/errgo.v1" "github.com/Scalingo/cli/config" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) var ErrNotFound = errors.New("SCM integration not found") diff --git a/services/github/client.go b/services/github/client.go index 0a465ff81..e573255fb 100644 --- a/services/github/client.go +++ b/services/github/client.go @@ -8,7 +8,7 @@ import ( "github.com/google/go-github/v47/github" "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7/debug" ) type Client interface { diff --git a/session/login.go b/session/login.go index 8ca68ade3..1378f6bec 100644 --- a/session/login.go +++ b/session/login.go @@ -10,8 +10,8 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" netssh "github.com/Scalingo/cli/net/ssh" - "github.com/Scalingo/go-scalingo/v6" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7/debug" "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/stacks/set.go b/stacks/set.go index 4d7309c17..387ce4003 100644 --- a/stacks/set.go +++ b/stacks/set.go @@ -7,7 +7,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) func Set(ctx context.Context, app string, stack string) error { diff --git a/user/events.go b/user/events.go index cccb13663..d327f3e56 100644 --- a/user/events.go +++ b/user/events.go @@ -7,7 +7,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/events" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) func Events(ctx context.Context, paginationOpts scalingo.PaginationOpts) error { diff --git a/utils/errors.go b/utils/errors.go index 058554081..4ddfb08cd 100644 --- a/utils/errors.go +++ b/utils/errors.go @@ -3,7 +3,7 @@ package utils import ( "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6/http" + "github.com/Scalingo/go-scalingo/v7/http" errors "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/utils/git.go b/utils/git.go index e65eb9eea..dfc1f37c4 100644 --- a/utils/git.go +++ b/utils/git.go @@ -11,7 +11,7 @@ import ( gitconfig "github.com/go-git/go-git/v5/config" "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7/debug" ) // DetectGit detects if current directory is a Git repository diff --git a/utils/helper.go b/utils/helper.go index 3a27e2e1d..0f110fc97 100644 --- a/utils/helper.go +++ b/utils/helper.go @@ -9,8 +9,8 @@ import ( "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6" - "github.com/Scalingo/go-scalingo/v6/http" + "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7/http" errors "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/utils/time.go b/utils/time.go index 016787a8a..4c99c4396 100644 --- a/utils/time.go +++ b/utils/time.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) const ( diff --git a/utils/time_test.go b/utils/time_test.go index ffc3f2f6d..1e370e02e 100644 --- a/utils/time_test.go +++ b/utils/time_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) func Test_beginningOfDay(t *testing.T) { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/version.go b/vendor/github.com/Scalingo/go-scalingo/v6/version.go deleted file mode 100644 index 5c10257ff..000000000 --- a/vendor/github.com/Scalingo/go-scalingo/v6/version.go +++ /dev/null @@ -1,3 +0,0 @@ -package scalingo - -var Version = "6.7.7" diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/.ackrc b/vendor/github.com/Scalingo/go-scalingo/v7/.ackrc similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/.ackrc rename to vendor/github.com/Scalingo/go-scalingo/v7/.ackrc diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/.env.test b/vendor/github.com/Scalingo/go-scalingo/v7/.env.test similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/.env.test rename to vendor/github.com/Scalingo/go-scalingo/v7/.env.test diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/.gitignore b/vendor/github.com/Scalingo/go-scalingo/v7/.gitignore similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/.gitignore rename to vendor/github.com/Scalingo/go-scalingo/v7/.gitignore diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/CHANGELOG.md b/vendor/github.com/Scalingo/go-scalingo/v7/CHANGELOG.md similarity index 99% rename from vendor/github.com/Scalingo/go-scalingo/v6/CHANGELOG.md rename to vendor/github.com/Scalingo/go-scalingo/v7/CHANGELOG.md index 4d16291aa..4763697a5 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/CHANGELOG.md +++ b/vendor/github.com/Scalingo/go-scalingo/v7/CHANGELOG.md @@ -2,6 +2,11 @@ ## To Be Released +## 7.0.0 + +* feat(domains): Add `letsencrypt_enabled` parameter +* BREAKING: api(domains): Change signature of `DomainsAdd`, add method `DomainsUpdate` + ## 6.7.7 * feat(databases): add databases user update diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/Dockerfile b/vendor/github.com/Scalingo/go-scalingo/v7/Dockerfile similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/Dockerfile rename to vendor/github.com/Scalingo/go-scalingo/v7/Dockerfile diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/LICENSE b/vendor/github.com/Scalingo/go-scalingo/v7/LICENSE similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/LICENSE rename to vendor/github.com/Scalingo/go-scalingo/v7/LICENSE diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/README.md b/vendor/github.com/Scalingo/go-scalingo/v7/README.md similarity index 96% rename from vendor/github.com/Scalingo/go-scalingo/v6/README.md rename to vendor/github.com/Scalingo/go-scalingo/v7/README.md index 6a6411e6b..17a14ae1b 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/README.md +++ b/vendor/github.com/Scalingo/go-scalingo/v7/README.md @@ -1,6 +1,6 @@ [ ![Codeship Status for Scalingo/go-scalingo](https://app.codeship.com/projects/cf518dc0-0034-0136-d6b3-5a0245e77f67/status?branch=master)](https://app.codeship.com/projects/279805) -# Go client for Scalingo API v6.7.7 +# Go client for Scalingo API v7.0.0 This repository is the Go client for the [Scalingo APIs](https://developers.scalingo.com/). @@ -10,7 +10,7 @@ This repository is the Go client for the [Scalingo APIs](https://developers.scal package main import ( - "github.com/Scalingo/go-scalingo/v6" + "github.com/Scalingo/go-scalingo/v7" ) func getClient() (*scalingo.Client, error) { @@ -80,7 +80,7 @@ Bump new version number in: Commit, tag and create a new release: ```sh -version="6.7.7" +version="7.0.0" git switch --create release/${version} git add CHANGELOG.md README.md version.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/addons.go b/vendor/github.com/Scalingo/go-scalingo/v7/addons.go similarity index 99% rename from vendor/github.com/Scalingo/go-scalingo/v6/addons.go rename to vendor/github.com/Scalingo/go-scalingo/v7/addons.go index bd3d2b1e4..25e7f62e7 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/addons.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/addons.go @@ -9,7 +9,7 @@ import ( "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6/http" + "github.com/Scalingo/go-scalingo/v7/http" ) type AddonsService interface { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/addons_providers.go b/vendor/github.com/Scalingo/go-scalingo/v7/addons_providers.go similarity index 98% rename from vendor/github.com/Scalingo/go-scalingo/v6/addons_providers.go rename to vendor/github.com/Scalingo/go-scalingo/v7/addons_providers.go index f2955f03b..69940727b 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/addons_providers.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/addons_providers.go @@ -5,7 +5,7 @@ import ( "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6/http" + "github.com/Scalingo/go-scalingo/v7/http" ) type AddonProvidersService interface { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/alerts.go b/vendor/github.com/Scalingo/go-scalingo/v7/alerts.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/alerts.go rename to vendor/github.com/Scalingo/go-scalingo/v7/alerts.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/apps.go b/vendor/github.com/Scalingo/go-scalingo/v7/apps.go similarity index 99% rename from vendor/github.com/Scalingo/go-scalingo/v6/apps.go rename to vendor/github.com/Scalingo/go-scalingo/v7/apps.go index 9ac461caa..b0d4256cd 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/apps.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/apps.go @@ -7,7 +7,7 @@ import ( "gopkg.in/errgo.v1" - httpclient "github.com/Scalingo/go-scalingo/v6/http" + httpclient "github.com/Scalingo/go-scalingo/v7/http" ) type AppStatus string diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/auth_mock.go b/vendor/github.com/Scalingo/go-scalingo/v7/auth_mock.go similarity index 88% rename from vendor/github.com/Scalingo/go-scalingo/v6/auth_mock.go rename to vendor/github.com/Scalingo/go-scalingo/v7/auth_mock.go index 899d120ff..41ac9e552 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/auth_mock.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/auth_mock.go @@ -11,8 +11,8 @@ import ( "github.com/golang-jwt/jwt/v4" "github.com/golang/mock/gomock" - httpclient "github.com/Scalingo/go-scalingo/v6/http" - "github.com/Scalingo/go-scalingo/v6/http/httpmock" + httpclient "github.com/Scalingo/go-scalingo/v7/http" + "github.com/Scalingo/go-scalingo/v7/http/httpmock" ) func MockAuth(ctrl *gomock.Controller) *httpmock.MockClient { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/autoscalers.go b/vendor/github.com/Scalingo/go-scalingo/v7/autoscalers.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/autoscalers.go rename to vendor/github.com/Scalingo/go-scalingo/v7/autoscalers.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/backups.go b/vendor/github.com/Scalingo/go-scalingo/v7/backups.go similarity index 98% rename from vendor/github.com/Scalingo/go-scalingo/v6/backups.go rename to vendor/github.com/Scalingo/go-scalingo/v7/backups.go index 766205de5..5d9badc62 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/backups.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/backups.go @@ -7,7 +7,7 @@ import ( "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6/http" + "github.com/Scalingo/go-scalingo/v7/http" ) type BackupsService interface { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/billing/profile.go b/vendor/github.com/Scalingo/go-scalingo/v7/billing/profile.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/billing/profile.go rename to vendor/github.com/Scalingo/go-scalingo/v7/billing/profile.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/client.go b/vendor/github.com/Scalingo/go-scalingo/v7/client.go similarity index 99% rename from vendor/github.com/Scalingo/go-scalingo/v6/client.go rename to vendor/github.com/Scalingo/go-scalingo/v7/client.go index ba3c87fa9..f57a4fd0c 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/client.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/client.go @@ -7,7 +7,7 @@ import ( "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6/http" + "github.com/Scalingo/go-scalingo/v7/http" ) type API interface { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/collaborators.go b/vendor/github.com/Scalingo/go-scalingo/v7/collaborators.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/collaborators.go rename to vendor/github.com/Scalingo/go-scalingo/v7/collaborators.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/container.go b/vendor/github.com/Scalingo/go-scalingo/v7/container.go similarity index 96% rename from vendor/github.com/Scalingo/go-scalingo/v6/container.go rename to vendor/github.com/Scalingo/go-scalingo/v7/container.go index 43dafff1e..f89d813d4 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/container.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/container.go @@ -7,7 +7,7 @@ import ( "gopkg.in/errgo.v1" - httpclient "github.com/Scalingo/go-scalingo/v6/http" + httpclient "github.com/Scalingo/go-scalingo/v7/http" ) type ContainersService interface { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/container_sizes.go b/vendor/github.com/Scalingo/go-scalingo/v7/container_sizes.go similarity index 95% rename from vendor/github.com/Scalingo/go-scalingo/v6/container_sizes.go rename to vendor/github.com/Scalingo/go-scalingo/v7/container_sizes.go index f9e5208e8..3c3e316fe 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/container_sizes.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/container_sizes.go @@ -5,7 +5,7 @@ import ( "gopkg.in/errgo.v1" - httpclient "github.com/Scalingo/go-scalingo/v6/http" + httpclient "github.com/Scalingo/go-scalingo/v7/http" ) type ContainerSize struct { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/cron_tasks.go b/vendor/github.com/Scalingo/go-scalingo/v7/cron_tasks.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/cron_tasks.go rename to vendor/github.com/Scalingo/go-scalingo/v7/cron_tasks.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/data_access_consent.go b/vendor/github.com/Scalingo/go-scalingo/v7/data_access_consent.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/data_access_consent.go rename to vendor/github.com/Scalingo/go-scalingo/v7/data_access_consent.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/database_type_versions.go b/vendor/github.com/Scalingo/go-scalingo/v7/database_type_versions.go similarity index 97% rename from vendor/github.com/Scalingo/go-scalingo/v6/database_type_versions.go rename to vendor/github.com/Scalingo/go-scalingo/v7/database_type_versions.go index 2be8efa66..6ea24b622 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/database_type_versions.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/database_type_versions.go @@ -7,7 +7,7 @@ import ( "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6/http" + "github.com/Scalingo/go-scalingo/v7/http" ) type DatabaseTypeVersionPlugin struct { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/databases.go b/vendor/github.com/Scalingo/go-scalingo/v7/databases.go similarity index 99% rename from vendor/github.com/Scalingo/go-scalingo/v6/databases.go rename to vendor/github.com/Scalingo/go-scalingo/v7/databases.go index a151f108a..cde5591e4 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/databases.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/databases.go @@ -7,7 +7,7 @@ import ( "gopkg.in/errgo.v1" - httpclient "github.com/Scalingo/go-scalingo/v6/http" + httpclient "github.com/Scalingo/go-scalingo/v7/http" "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/debug/log.go b/vendor/github.com/Scalingo/go-scalingo/v7/debug/log.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/debug/log.go rename to vendor/github.com/Scalingo/go-scalingo/v7/debug/log.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/deployments.go b/vendor/github.com/Scalingo/go-scalingo/v7/deployments.go similarity index 99% rename from vendor/github.com/Scalingo/go-scalingo/v6/deployments.go rename to vendor/github.com/Scalingo/go-scalingo/v7/deployments.go index 9a7a5e32f..439c8948e 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/deployments.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/deployments.go @@ -10,7 +10,7 @@ import ( "github.com/gorilla/websocket" "gopkg.in/errgo.v1" - httpclient "github.com/Scalingo/go-scalingo/v6/http" + httpclient "github.com/Scalingo/go-scalingo/v7/http" ) type DeploymentsService interface { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/docker-compose.yml b/vendor/github.com/Scalingo/go-scalingo/v7/docker-compose.yml similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/docker-compose.yml rename to vendor/github.com/Scalingo/go-scalingo/v7/docker-compose.yml diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/domains.go b/vendor/github.com/Scalingo/go-scalingo/v7/domains.go similarity index 65% rename from vendor/github.com/Scalingo/go-scalingo/v6/domains.go rename to vendor/github.com/Scalingo/go-scalingo/v7/domains.go index 2458c657f..c9f9a0e62 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/domains.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/domains.go @@ -10,8 +10,10 @@ import ( type DomainsService interface { DomainsList(ctx context.Context, app string) ([]Domain, error) - DomainsAdd(ctx context.Context, app string, d Domain) (Domain, error) + DomainsAdd(ctx context.Context, app string, d DomainsAddParams) (Domain, error) + DomainsUpdate(ctx context.Context, app string, id string, d DomainsUpdateParams) (Domain, error) DomainsRemove(ctx context.Context, app string, id string) error + // DomainsUpdate helpers DomainSetCanonical(ctx context.Context, app, id string) (Domain, error) DomainUnsetCanonical(ctx context.Context, app string) (Domain, error) DomainSetCertificate(ctx context.Context, app, id, tlsCert, tlsKey string) (Domain, error) @@ -44,15 +46,20 @@ type ACMEErrorVariables struct { } type Domain struct { - ID string `json:"id"` - AppID string `json:"app_id"` - Name string `json:"name"` - TLSCert string `json:"tlscert,omitempty"` - TLSKey string `json:"tlskey,omitempty"` - SSL bool `json:"ssl"` - Validity time.Time `json:"validity"` - Canonical bool `json:"canonical"` - LetsEncrypt bool `json:"letsencrypt"` + ID string `json:"id"` + AppID string `json:"app_id"` + Name string `json:"name"` + TLSCert string `json:"tlscert,omitempty"` + TLSKey string `json:"tlskey,omitempty"` + // LetsEncryptEnabled is true (default) if automatic certificate generation + // is enabled + LetsEncryptEnabled bool `json:"letsencrypt_enabled"` + SSL bool `json:"ssl"` + Validity time.Time `json:"validity"` + Canonical bool `json:"canonical"` + // LetsEncrypt is true if the certificate is generated by LetsEncrypt + LetsEncrypt bool `json:"letsencrypt"` + // LetsEncryptStatus is the status of the LetsEncrypt certificate generation LetsEncryptStatus LetsEncryptStatus `json:"letsencrypt_status"` SslStatus SslStatus `json:"ssl_status"` AcmeDNSFqdn string `json:"acme_dns_fqdn"` @@ -84,9 +91,17 @@ func (c *Client) DomainsList(ctx context.Context, app string) ([]Domain, error) return domainRes.Domains, nil } -func (c *Client) DomainsAdd(ctx context.Context, app string, d Domain) (Domain, error) { +type DomainsAddParams struct { + Name string `json:"name"` + Canonical *bool `json:"canonical,omitempty"` + TLSCert *string `json:"tlscert,omitempty"` + TLSKey *string `json:"tlskey,omitempty"` + LetsEncryptEnabled *bool `json:"letsencrypt_enabled,omitempty"` +} + +func (c *Client) DomainsAdd(ctx context.Context, app string, params DomainsAddParams) (Domain, error) { var domainRes DomainRes - err := c.ScalingoAPI().SubresourceAdd(ctx, "apps", app, "domains", DomainRes{d}, &domainRes) + err := c.ScalingoAPI().SubresourceAdd(ctx, "apps", app, "domains", map[string]DomainsAddParams{"domain": params}, &domainRes) if err != nil { return Domain{}, errgo.Notef(err, "fail to add a domain") } @@ -108,9 +123,16 @@ func (c *Client) DomainsShow(ctx context.Context, app, id string) (Domain, error return domainRes.Domain, nil } -func (c *Client) domainsUpdate(ctx context.Context, app, id string, domain Domain) (Domain, error) { +type DomainsUpdateParams struct { + Canonical *bool `json:"canonical,omitempty"` + TLSCert *string `json:"tlscert,omitempty"` + TLSKey *string `json:"tlskey,omitempty"` + LetsEncryptEnabled *bool `json:"letsencrypt_enabled,omitempty"` +} + +func (c *Client) DomainsUpdate(ctx context.Context, app, id string, params DomainsUpdateParams) (Domain, error) { var domainRes DomainRes - err := c.ScalingoAPI().SubresourceUpdate(ctx, "apps", app, "domains", id, DomainRes{Domain: domain}, &domainRes) + err := c.ScalingoAPI().SubresourceUpdate(ctx, "apps", app, "domains", id, map[string]DomainsUpdateParams{"domain": params}, &domainRes) if err != nil { return Domain{}, errgo.Notef(err, "fail to update the domain") } @@ -118,7 +140,7 @@ func (c *Client) domainsUpdate(ctx context.Context, app, id string, domain Domai } func (c *Client) DomainSetCertificate(ctx context.Context, app, id, tlsCert, tlsKey string) (Domain, error) { - domain, err := c.domainsUpdate(ctx, app, id, Domain{TLSCert: tlsCert, TLSKey: tlsKey}) + domain, err := c.DomainsUpdate(ctx, app, id, DomainsUpdateParams{TLSCert: &tlsCert, TLSKey: &tlsKey}) if err != nil { return Domain{}, errgo.Notef(err, "fail to set the domain certificate") } @@ -126,20 +148,17 @@ func (c *Client) DomainSetCertificate(ctx context.Context, app, id, tlsCert, tls } func (c *Client) DomainUnsetCertificate(ctx context.Context, app, id string) (Domain, error) { - var domainRes DomainRes - err := c.ScalingoAPI().SubresourceUpdate( - ctx, "apps", app, "domains", id, map[string]domainUnsetCertificateParams{ - "domain": {TLSCert: "", TLSKey: ""}, - }, &domainRes, - ) + empty := "" + domain, err := c.DomainsUpdate(ctx, app, id, DomainsUpdateParams{TLSCert: &empty, TLSKey: &empty}) if err != nil { return Domain{}, errgo.Notef(err, "fail to unset the domain certificate") } - return domainRes.Domain, nil + return domain, nil } func (c *Client) DomainSetCanonical(ctx context.Context, app, id string) (Domain, error) { - domain, err := c.domainsUpdate(ctx, app, id, Domain{Canonical: true}) + value := true + domain, err := c.DomainsUpdate(ctx, app, id, DomainsUpdateParams{Canonical: &value}) if err != nil { return Domain{}, errgo.Notef(err, "fail to set the domain as canonical") } @@ -154,7 +173,8 @@ func (c *Client) DomainUnsetCanonical(ctx context.Context, app string) (Domain, for _, domain := range domains { if domain.Canonical { - domain, err := c.domainsUpdate(ctx, app, domain.ID, Domain{Canonical: false}) + value := false + domain, err := c.DomainsUpdate(ctx, app, domain.ID, DomainsUpdateParams{Canonical: &value}) if err != nil { return Domain{}, errgo.Notef(err, "fail to unset the domain as canonical") } diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/env.go b/vendor/github.com/Scalingo/go-scalingo/v7/env.go similarity index 98% rename from vendor/github.com/Scalingo/go-scalingo/v6/env.go rename to vendor/github.com/Scalingo/go-scalingo/v7/env.go index d2af5cef5..9481471d1 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/env.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/env.go @@ -6,7 +6,7 @@ import ( "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6/http" + "github.com/Scalingo/go-scalingo/v7/http" ) type VariablesService interface { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/events.go b/vendor/github.com/Scalingo/go-scalingo/v7/events.go similarity index 97% rename from vendor/github.com/Scalingo/go-scalingo/v6/events.go rename to vendor/github.com/Scalingo/go-scalingo/v7/events.go index 781e802d6..4dedea19e 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/events.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/events.go @@ -9,7 +9,7 @@ import ( "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6/http" + "github.com/Scalingo/go-scalingo/v7/http" ) type EventsService interface { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/events_account.go b/vendor/github.com/Scalingo/go-scalingo/v7/events_account.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/events_account.go rename to vendor/github.com/Scalingo/go-scalingo/v7/events_account.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/events_addon.go b/vendor/github.com/Scalingo/go-scalingo/v7/events_addon.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/events_addon.go rename to vendor/github.com/Scalingo/go-scalingo/v7/events_addon.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/events_alert.go b/vendor/github.com/Scalingo/go-scalingo/v7/events_alert.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/events_alert.go rename to vendor/github.com/Scalingo/go-scalingo/v7/events_alert.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/events_app.go b/vendor/github.com/Scalingo/go-scalingo/v7/events_app.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/events_app.go rename to vendor/github.com/Scalingo/go-scalingo/v7/events_app.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/events_billing.go b/vendor/github.com/Scalingo/go-scalingo/v7/events_billing.go similarity index 96% rename from vendor/github.com/Scalingo/go-scalingo/v6/events_billing.go rename to vendor/github.com/Scalingo/go-scalingo/v7/events_billing.go index ee87f7a66..9329b824a 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/events_billing.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/events_billing.go @@ -3,7 +3,7 @@ package scalingo import ( "fmt" - "github.com/Scalingo/go-scalingo/v6/billing" + "github.com/Scalingo/go-scalingo/v7/billing" ) type EventAddCreditType struct { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/events_boilerplate.go b/vendor/github.com/Scalingo/go-scalingo/v7/events_boilerplate.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/events_boilerplate.go rename to vendor/github.com/Scalingo/go-scalingo/v7/events_boilerplate.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/events_specialize.go b/vendor/github.com/Scalingo/go-scalingo/v7/events_specialize.go similarity index 99% rename from vendor/github.com/Scalingo/go-scalingo/v6/events_specialize.go rename to vendor/github.com/Scalingo/go-scalingo/v7/events_specialize.go index 972269cd8..d445815e6 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/events_specialize.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/events_specialize.go @@ -5,7 +5,7 @@ package scalingo import ( "encoding/json" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7/debug" ) func (pev *Event) Specialize() DetailedEvent { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/events_structs.go b/vendor/github.com/Scalingo/go-scalingo/v7/events_structs.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/events_structs.go rename to vendor/github.com/Scalingo/go-scalingo/v7/events_structs.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/events_token.go b/vendor/github.com/Scalingo/go-scalingo/v7/events_token.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/events_token.go rename to vendor/github.com/Scalingo/go-scalingo/v7/events_token.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/events_types.go b/vendor/github.com/Scalingo/go-scalingo/v7/events_types.go similarity index 96% rename from vendor/github.com/Scalingo/go-scalingo/v6/events_types.go rename to vendor/github.com/Scalingo/go-scalingo/v7/events_types.go index 3fdb40665..1da9e8aef 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/events_types.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/events_types.go @@ -5,7 +5,7 @@ import ( "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6/http" + "github.com/Scalingo/go-scalingo/v7/http" ) type EventCategory struct { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/events_user.go b/vendor/github.com/Scalingo/go-scalingo/v7/events_user.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/events_user.go rename to vendor/github.com/Scalingo/go-scalingo/v7/events_user.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/gomock_subresourceservice.go b/vendor/github.com/Scalingo/go-scalingo/v7/gomock_subresourceservice.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/gomock_subresourceservice.go rename to vendor/github.com/Scalingo/go-scalingo/v7/gomock_subresourceservice.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/http/addon_token_generator.go b/vendor/github.com/Scalingo/go-scalingo/v7/http/addon_token_generator.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/http/addon_token_generator.go rename to vendor/github.com/Scalingo/go-scalingo/v7/http/addon_token_generator.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/http/api_request.go b/vendor/github.com/Scalingo/go-scalingo/v7/http/api_request.go similarity index 98% rename from vendor/github.com/Scalingo/go-scalingo/v6/http/api_request.go rename to vendor/github.com/Scalingo/go-scalingo/v7/http/api_request.go index 5078d08ff..f50f049a4 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/http/api_request.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/http/api_request.go @@ -13,8 +13,8 @@ import ( "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6/debug" - pkgio "github.com/Scalingo/go-scalingo/v6/io" + "github.com/Scalingo/go-scalingo/v7/debug" + pkgio "github.com/Scalingo/go-scalingo/v7/io" ) type APIRequest struct { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/http/api_token_generator.go b/vendor/github.com/Scalingo/go-scalingo/v7/http/api_token_generator.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/http/api_token_generator.go rename to vendor/github.com/Scalingo/go-scalingo/v7/http/api_token_generator.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/http/client.go b/vendor/github.com/Scalingo/go-scalingo/v7/http/client.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/http/client.go rename to vendor/github.com/Scalingo/go-scalingo/v7/http/client.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/http/errors.go b/vendor/github.com/Scalingo/go-scalingo/v7/http/errors.go similarity index 99% rename from vendor/github.com/Scalingo/go-scalingo/v6/http/errors.go rename to vendor/github.com/Scalingo/go-scalingo/v7/http/errors.go index 024242441..73a48d292 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/http/errors.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/http/errors.go @@ -8,7 +8,7 @@ import ( "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7/debug" errorspkg "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/http/httpmock/client_mock.go b/vendor/github.com/Scalingo/go-scalingo/v7/http/httpmock/client_mock.go similarity index 98% rename from vendor/github.com/Scalingo/go-scalingo/v6/http/httpmock/client_mock.go rename to vendor/github.com/Scalingo/go-scalingo/v7/http/httpmock/client_mock.go index 63e23c2bc..e07e30646 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/http/httpmock/client_mock.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/http/httpmock/client_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/Scalingo/go-scalingo/v6/http (interfaces: Client) +// Source: github.com/Scalingo/go-scalingo/v7/http (interfaces: Client) // Package httpmock is a generated GoMock package. package httpmock @@ -9,7 +9,7 @@ import ( http0 "net/http" reflect "reflect" - http "github.com/Scalingo/go-scalingo/v6/http" + http "github.com/Scalingo/go-scalingo/v7/http" gomock "github.com/golang/mock/gomock" ) diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/http/tokens.go b/vendor/github.com/Scalingo/go-scalingo/v7/http/tokens.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/http/tokens.go rename to vendor/github.com/Scalingo/go-scalingo/v7/http/tokens.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/invoices.go b/vendor/github.com/Scalingo/go-scalingo/v7/invoices.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/invoices.go rename to vendor/github.com/Scalingo/go-scalingo/v7/invoices.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/io/indent.go b/vendor/github.com/Scalingo/go-scalingo/v7/io/indent.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/io/indent.go rename to vendor/github.com/Scalingo/go-scalingo/v7/io/indent.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/io/status.go b/vendor/github.com/Scalingo/go-scalingo/v7/io/status.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/io/status.go rename to vendor/github.com/Scalingo/go-scalingo/v7/io/status.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/keys.go b/vendor/github.com/Scalingo/go-scalingo/v7/keys.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/keys.go rename to vendor/github.com/Scalingo/go-scalingo/v7/keys.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/log_drains.go b/vendor/github.com/Scalingo/go-scalingo/v7/log_drains.go similarity index 98% rename from vendor/github.com/Scalingo/go-scalingo/v6/log_drains.go rename to vendor/github.com/Scalingo/go-scalingo/v7/log_drains.go index cbaeae9ae..1c593eaf8 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/log_drains.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/log_drains.go @@ -6,7 +6,7 @@ import ( "gopkg.in/errgo.v1" - httpclient "github.com/Scalingo/go-scalingo/v6/http" + httpclient "github.com/Scalingo/go-scalingo/v7/http" ) type LogDrainsService interface { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/logs-archives.go b/vendor/github.com/Scalingo/go-scalingo/v7/logs-archives.go similarity index 97% rename from vendor/github.com/Scalingo/go-scalingo/v6/logs-archives.go rename to vendor/github.com/Scalingo/go-scalingo/v7/logs-archives.go index 479d40772..37055680a 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/logs-archives.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/logs-archives.go @@ -8,7 +8,7 @@ import ( "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6/http" + "github.com/Scalingo/go-scalingo/v7/http" ) type LogsArchivesService interface { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/logs.go b/vendor/github.com/Scalingo/go-scalingo/v7/logs.go similarity index 95% rename from vendor/github.com/Scalingo/go-scalingo/v6/logs.go rename to vendor/github.com/Scalingo/go-scalingo/v7/logs.go index 55750f2bc..c0dd64e7f 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/logs.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/logs.go @@ -7,7 +7,7 @@ import ( "gopkg.in/errgo.v1" - httpclient "github.com/Scalingo/go-scalingo/v6/http" + httpclient "github.com/Scalingo/go-scalingo/v7/http" ) type LogsService interface { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/maintenance.go b/vendor/github.com/Scalingo/go-scalingo/v7/maintenance.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/maintenance.go rename to vendor/github.com/Scalingo/go-scalingo/v7/maintenance.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/metrics.go b/vendor/github.com/Scalingo/go-scalingo/v7/metrics.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/metrics.go rename to vendor/github.com/Scalingo/go-scalingo/v7/metrics.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/mocks.json b/vendor/github.com/Scalingo/go-scalingo/v7/mocks.json similarity index 98% rename from vendor/github.com/Scalingo/go-scalingo/v6/mocks.json rename to vendor/github.com/Scalingo/go-scalingo/v7/mocks.json index e4fa58e7c..6cfe45b04 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/mocks.json +++ b/vendor/github.com/Scalingo/go-scalingo/v7/mocks.json @@ -1,6 +1,6 @@ { "base_directory": "github.com/Scalingo/go-scalingo", - "base_package": "github.com/Scalingo/go-scalingo/v6", + "base_package": "github.com/Scalingo/go-scalingo/v7", "mocks": [ { "interface": "Client", diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/mocks_sig.json b/vendor/github.com/Scalingo/go-scalingo/v7/mocks_sig.json similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/mocks_sig.json rename to vendor/github.com/Scalingo/go-scalingo/v7/mocks_sig.json diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/notification_platforms.go b/vendor/github.com/Scalingo/go-scalingo/v7/notification_platforms.go similarity index 95% rename from vendor/github.com/Scalingo/go-scalingo/v6/notification_platforms.go rename to vendor/github.com/Scalingo/go-scalingo/v7/notification_platforms.go index dbabaf82d..1ff7780d7 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/notification_platforms.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/notification_platforms.go @@ -6,8 +6,8 @@ import ( "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6/debug" - "github.com/Scalingo/go-scalingo/v6/http" + "github.com/Scalingo/go-scalingo/v7/debug" + "github.com/Scalingo/go-scalingo/v7/http" ) type NotificationPlatformsService interface { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/notifier_types.go b/vendor/github.com/Scalingo/go-scalingo/v7/notifier_types.go similarity index 99% rename from vendor/github.com/Scalingo/go-scalingo/v6/notifier_types.go rename to vendor/github.com/Scalingo/go-scalingo/v7/notifier_types.go index 7c2dbcd01..f288f007a 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/notifier_types.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/notifier_types.go @@ -3,7 +3,7 @@ package scalingo import ( "encoding/json" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7/debug" ) // Used to omit attributes diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/notifiers.go b/vendor/github.com/Scalingo/go-scalingo/v7/notifiers.go similarity index 98% rename from vendor/github.com/Scalingo/go-scalingo/v6/notifiers.go rename to vendor/github.com/Scalingo/go-scalingo/v7/notifiers.go index 65d570ef8..542836a3d 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/notifiers.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/notifiers.go @@ -7,7 +7,7 @@ import ( "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6/debug" + "github.com/Scalingo/go-scalingo/v7/debug" ) type NotifiersService interface { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/operations.go b/vendor/github.com/Scalingo/go-scalingo/v7/operations.go similarity index 97% rename from vendor/github.com/Scalingo/go-scalingo/v6/operations.go rename to vendor/github.com/Scalingo/go-scalingo/v7/operations.go index e9141f89f..70e53b1c2 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/operations.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/operations.go @@ -6,7 +6,7 @@ import ( "gopkg.in/errgo.v1" - httpclient "github.com/Scalingo/go-scalingo/v6/http" + httpclient "github.com/Scalingo/go-scalingo/v7/http" ) type OperationsService interface { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/owner.go b/vendor/github.com/Scalingo/go-scalingo/v7/owner.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/owner.go rename to vendor/github.com/Scalingo/go-scalingo/v7/owner.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/pagination_options.go b/vendor/github.com/Scalingo/go-scalingo/v7/pagination_options.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/pagination_options.go rename to vendor/github.com/Scalingo/go-scalingo/v7/pagination_options.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/region_migrations.go b/vendor/github.com/Scalingo/go-scalingo/v7/region_migrations.go similarity index 99% rename from vendor/github.com/Scalingo/go-scalingo/v6/region_migrations.go rename to vendor/github.com/Scalingo/go-scalingo/v7/region_migrations.go index 4f868eea7..f858d943f 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/region_migrations.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/region_migrations.go @@ -6,7 +6,7 @@ import ( "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6/http" + "github.com/Scalingo/go-scalingo/v7/http" ) const ( diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/regions.go b/vendor/github.com/Scalingo/go-scalingo/v7/regions.go similarity index 97% rename from vendor/github.com/Scalingo/go-scalingo/v6/regions.go rename to vendor/github.com/Scalingo/go-scalingo/v7/regions.go index c7e2dcdd3..942e3f496 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/regions.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/regions.go @@ -6,7 +6,7 @@ import ( "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6/http" + "github.com/Scalingo/go-scalingo/v7/http" ) var ( diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/review_apps.go b/vendor/github.com/Scalingo/go-scalingo/v7/review_apps.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/review_apps.go rename to vendor/github.com/Scalingo/go-scalingo/v7/review_apps.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/run.go b/vendor/github.com/Scalingo/go-scalingo/v7/run.go similarity index 96% rename from vendor/github.com/Scalingo/go-scalingo/v6/run.go rename to vendor/github.com/Scalingo/go-scalingo/v7/run.go index 59549c9ef..fdfdfcd97 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/run.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/run.go @@ -5,7 +5,7 @@ import ( "encoding/json" "strings" - "github.com/Scalingo/go-scalingo/v6/http" + "github.com/Scalingo/go-scalingo/v7/http" errors "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/scm_integrations.go b/vendor/github.com/Scalingo/go-scalingo/v7/scm_integrations.go similarity index 98% rename from vendor/github.com/Scalingo/go-scalingo/v6/scm_integrations.go rename to vendor/github.com/Scalingo/go-scalingo/v7/scm_integrations.go index ef29ba9b2..e55d2a19e 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/scm_integrations.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/scm_integrations.go @@ -6,7 +6,7 @@ import ( "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6/http" + "github.com/Scalingo/go-scalingo/v7/http" ) type SCMType string diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/scm_repo_link.go b/vendor/github.com/Scalingo/go-scalingo/v7/scm_repo_link.go similarity index 99% rename from vendor/github.com/Scalingo/go-scalingo/v6/scm_repo_link.go rename to vendor/github.com/Scalingo/go-scalingo/v7/scm_repo_link.go index bb567416f..b025d0ce7 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/scm_repo_link.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/scm_repo_link.go @@ -7,7 +7,7 @@ import ( "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6/http" + "github.com/Scalingo/go-scalingo/v7/http" ) type SCMRepoLinkService interface { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/signup.go b/vendor/github.com/Scalingo/go-scalingo/v7/signup.go similarity index 93% rename from vendor/github.com/Scalingo/go-scalingo/v6/signup.go rename to vendor/github.com/Scalingo/go-scalingo/v7/signup.go index a74c1ca9b..4b6c1dfc7 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/signup.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/signup.go @@ -5,7 +5,7 @@ import ( "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6/http" + "github.com/Scalingo/go-scalingo/v7/http" ) type SignUpService interface { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/sources.go b/vendor/github.com/Scalingo/go-scalingo/v7/sources.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/sources.go rename to vendor/github.com/Scalingo/go-scalingo/v7/sources.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/stacks.go b/vendor/github.com/Scalingo/go-scalingo/v7/stacks.go similarity index 96% rename from vendor/github.com/Scalingo/go-scalingo/v6/stacks.go rename to vendor/github.com/Scalingo/go-scalingo/v7/stacks.go index 67efbe801..552da6746 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/stacks.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/stacks.go @@ -6,7 +6,7 @@ import ( "gopkg.in/errgo.v1" - httpclient "github.com/Scalingo/go-scalingo/v6/http" + httpclient "github.com/Scalingo/go-scalingo/v7/http" ) type DeprecationDate struct { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/static_token.go b/vendor/github.com/Scalingo/go-scalingo/v7/static_token.go similarity index 100% rename from vendor/github.com/Scalingo/go-scalingo/v6/static_token.go rename to vendor/github.com/Scalingo/go-scalingo/v7/static_token.go diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/tokens.go b/vendor/github.com/Scalingo/go-scalingo/v7/tokens.go similarity index 98% rename from vendor/github.com/Scalingo/go-scalingo/v6/tokens.go rename to vendor/github.com/Scalingo/go-scalingo/v7/tokens.go index 591c21469..8952d7f0c 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/tokens.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/tokens.go @@ -8,7 +8,7 @@ import ( "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6/http" + "github.com/Scalingo/go-scalingo/v7/http" ) type TokensService interface { diff --git a/vendor/github.com/Scalingo/go-scalingo/v6/users.go b/vendor/github.com/Scalingo/go-scalingo/v7/users.go similarity index 98% rename from vendor/github.com/Scalingo/go-scalingo/v6/users.go rename to vendor/github.com/Scalingo/go-scalingo/v7/users.go index 027159216..954ee1622 100644 --- a/vendor/github.com/Scalingo/go-scalingo/v6/users.go +++ b/vendor/github.com/Scalingo/go-scalingo/v7/users.go @@ -6,7 +6,7 @@ import ( "gopkg.in/errgo.v1" - "github.com/Scalingo/go-scalingo/v6/http" + "github.com/Scalingo/go-scalingo/v7/http" ) type UsersService interface { diff --git a/vendor/github.com/Scalingo/go-scalingo/v7/version.go b/vendor/github.com/Scalingo/go-scalingo/v7/version.go new file mode 100644 index 000000000..fd5c9f492 --- /dev/null +++ b/vendor/github.com/Scalingo/go-scalingo/v7/version.go @@ -0,0 +1,3 @@ +package scalingo + +var Version = "7.0.0" diff --git a/vendor/modules.txt b/vendor/modules.txt index 6e100ca1b..d69c6d3ae 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -39,12 +39,14 @@ github.com/ProtonMail/go-crypto/openpgp/x25519 github.com/ProtonMail/go-crypto/openpgp/x448 # github.com/Scalingo/go-scalingo/v6 v6.7.7 ## explicit; go 1.20 -github.com/Scalingo/go-scalingo/v6 -github.com/Scalingo/go-scalingo/v6/billing -github.com/Scalingo/go-scalingo/v6/debug -github.com/Scalingo/go-scalingo/v6/http -github.com/Scalingo/go-scalingo/v6/http/httpmock -github.com/Scalingo/go-scalingo/v6/io +# github.com/Scalingo/go-scalingo/v7 v7.0.0 +## explicit; go 1.20 +github.com/Scalingo/go-scalingo/v7 +github.com/Scalingo/go-scalingo/v7/billing +github.com/Scalingo/go-scalingo/v7/debug +github.com/Scalingo/go-scalingo/v7/http +github.com/Scalingo/go-scalingo/v7/http/httpmock +github.com/Scalingo/go-scalingo/v7/io # github.com/Scalingo/go-utils/errors/v2 v2.4.0 ## explicit; go 1.20 github.com/Scalingo/go-utils/errors/v2 From 61fe6571736120dc5f23153d963cf49ee9769539 Mon Sep 17 00:00:00 2001 From: Soulou Date: Fri, 19 Apr 2024 12:27:48 +0200 Subject: [PATCH 2/9] [STORY-443] Add flag --no-letsencrypt when creating a domain --- cmd/domains.go | 85 ++++++++++++++++++++++++++++++++++++++++---------- domains/add.go | 21 +++---------- domains/ssl.go | 34 ++------------------ 3 files changed, 76 insertions(+), 64 deletions(-) diff --git a/cmd/domains.go b/cmd/domains.go index fb727b964..9b5f2e133 100644 --- a/cmd/domains.go +++ b/cmd/domains.go @@ -1,12 +1,16 @@ package cmd import ( + "os" + "github.com/urfave/cli/v2" + "gopkg.in/errgo.v1" "github.com/Scalingo/cli/cmd/autocomplete" "github.com/Scalingo/cli/detect" "github.com/Scalingo/cli/domains" "github.com/Scalingo/cli/utils" + scalingo "github.com/Scalingo/go-scalingo/v7" ) var ( @@ -46,29 +50,48 @@ var ( Usage: "Add a custom domain to an application", ArgsUsage: "domain", Flags: []cli.Flag{&appFlag, - &cli.StringFlag{Name: "cert", Usage: "SSL Signed Certificate", Value: "domain.crt"}, - &cli.StringFlag{Name: "key", Usage: "SSL Keypair", Value: "domain.key"}, + &cli.StringFlag{Name: "cert", Usage: "SSL Signed Certificate"}, + &cli.StringFlag{Name: "key", Usage: "SSL Keypair"}, + &cli.BoolFlag{Name: "no-letsencrypt", Usage: "Disable automatic Let's Encrypt certificate generation", Value: false}, }, Description: CommandDescription{ Description: "Add a custom domain to an application", - Examples: []string{"scalingo --app my-app domains-add example.com"}, - SeeAlso: []string{"domains", "domains-remove"}, + Examples: []string{ + "scalingo --app my-app domains-add example.com", + "scalingo --app my-app domains-add --cert ./cert.pem --key ./key.pem example.com", + "scalingo --app my-app domains-add --no-letsencrypt example.com", + }, + SeeAlso: []string{"domains", "domains-remove"}, }.Render(), Action: func(c *cli.Context) error { currentApp := detect.CurrentApp(c) utils.CheckForConsent(c.Context, currentApp, utils.ConsentTypeContainers) var err error + if c.Args().Len() == 1 { cert := c.String("cert") - if cert == "domain.crt" { - cert = "" - } key := c.String("key") - if key == "domain.key" { - key = "" + certContent, keyContent, err := validateTLSParams(cert, key) + if err != nil { + errorQuit(c.Context, err) } - err = domains.Add(c.Context, currentApp, c.Args().First(), cert, key) + + params := scalingo.DomainsAddParams{ + Name: c.Args().First(), + } + if certContent != "" { + params.TLSCert = &certContent + } + if keyContent != "" { + params.TLSKey = &keyContent + } + if c.Bool("no-letsencrypt") { + letsEncryptEnabled := false + params.LetsEncryptEnabled = &letsEncryptEnabled + } + + err = domains.Add(c.Context, currentApp, params) } else { cli.ShowCommandHelp(c, "domains-add") } @@ -138,17 +161,23 @@ var ( Action: func(c *cli.Context) error { currentApp := detect.CurrentApp(c) utils.CheckForConsent(c.Context, currentApp, utils.ConsentTypeContainers) - var err error if c.Args().Len() == 2 && c.Args().Slice()[1] == "disable" { - err = domains.DisableSSL(c.Context, currentApp, c.Args().First()) + err := domains.DisableSSL(c.Context, currentApp, c.Args().First()) + if err != nil { + errorQuit(c.Context, err) + } } else if c.Args().Len() == 1 { - err = domains.EnableSSL(c.Context, currentApp, c.Args().First(), c.String("cert"), c.String("key")) + certContent, keyContent, err := validateTLSParams(c.String("cert"), c.String("key")) + if err != nil { + errorQuit(c.Context, err) + } + err = domains.EnableSSL(c.Context, currentApp, c.Args().First(), certContent, keyContent) + if err != nil { + errorQuit(c.Context, err) + } } else { cli.ShowCommandHelp(c, "domains-ssl") } - if err != nil { - errorQuit(c.Context, err) - } return nil }, BashComplete: func(c *cli.Context) { @@ -219,3 +248,27 @@ This domain is called the canonical domain. This command sets the canonical doma }, } ) + +func validateTLSParams(cert, key string) (string, string, error) { + if cert == "" && key == "" { + return "", "", nil + } + + if cert == "" && key != "" { + return "", "", errgo.New("--cert should be defined") + } + + if key == "" && cert != "" { + return "", "", errgo.New("--key should be defined") + } + + certContent, err := os.ReadFile(cert) + if err != nil { + return "", "", errgo.Notef(err, "fail to read the TLS certificate") + } + keyContent, err := os.ReadFile(key) + if err != nil { + return "", "", errgo.Notef(err, "fail to read the private key") + } + return string(certContent), string(keyContent), nil +} diff --git a/domains/add.go b/domains/add.go index 1f9c5f34e..46586feef 100644 --- a/domains/add.go +++ b/domains/add.go @@ -3,31 +3,20 @@ package domains import ( "context" - "gopkg.in/errgo.v1" - "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-utils/errors/v2" ) -func Add(ctx context.Context, app string, domain string, cert string, key string) error { - certContent, keyContent, err := validateSSL(cert, key) - if err != nil { - return errgo.Mask(err) - } - +func Add(ctx context.Context, app string, params scalingo.DomainsAddParams) error { c, err := config.ScalingoClient(ctx) if err != nil { - return errgo.Notef(err, "fail to get Scalingo client") + return errors.Wrapf(ctx, err, "get Scalingo client") } - d, err := c.DomainsAdd(ctx, app, scalingo.Domain{ - Name: domain, - TLSCert: certContent, - TLSKey: keyContent, - }) - + d, err := c.DomainsAdd(ctx, app, params) if err != nil { - return errgo.Mask(err) + return errors.Wrap(ctx, err, "add domain to application") } io.Status("Domain", d.Name, "has been created, access your app at the following URL:\n") diff --git a/domains/ssl.go b/domains/ssl.go index deddb6130..bb2aeeb59 100644 --- a/domains/ssl.go +++ b/domains/ssl.go @@ -2,7 +2,6 @@ package domains import ( "context" - "os" "gopkg.in/errgo.v1" @@ -29,7 +28,7 @@ func DisableSSL(ctx context.Context, app string, domain string) error { return nil } -func EnableSSL(ctx context.Context, app, domain, certPath, keyPath string) error { +func EnableSSL(ctx context.Context, app, domain, cert, key string) error { c, err := config.ScalingoClient(ctx) if err != nil { return errgo.Notef(err, "fail to get Scalingo client") @@ -40,12 +39,7 @@ func EnableSSL(ctx context.Context, app, domain, certPath, keyPath string) error return errgo.Notef(err, "fail to find the matching domain to enable SSL") } - certContent, keyContent, err := validateSSL(certPath, keyPath) - if err != nil { - return errgo.Notef(err, "fail to validate the given certificate and key") - } - - d, err = c.DomainSetCertificate(ctx, app, d.ID, certContent, keyContent) + d, err = c.DomainSetCertificate(ctx, app, d.ID, cert, key) if err != nil { return errgo.Notef(err, "fail to set the domain certificate") } @@ -53,27 +47,3 @@ func EnableSSL(ctx context.Context, app, domain, certPath, keyPath string) error io.Status("The certificate and key have been installed for " + d.Name + " (Validity: " + d.Validity.UTC().String() + ")") return nil } - -func validateSSL(cert, key string) (string, string, error) { - if cert == "" && key == "" { - return "", "", nil - } - - if cert == "" && key != "" { - return "", "", errgo.New("--cert should be defined") - } - - if key == "" && cert != "" { - return "", "", errgo.New("--key should be defined") - } - - certContent, err := os.ReadFile(cert) - if err != nil { - return "", "", errgo.Notef(err, "fail to read the TLS certificate") - } - keyContent, err := os.ReadFile(key) - if err != nil { - return "", "", errgo.Notef(err, "fail to read the private key") - } - return string(certContent), string(keyContent), nil -} From 8eba5f70b014e303edbf74938787f6d9c487a72a Mon Sep 17 00:00:00 2001 From: Soulou Date: Fri, 19 Apr 2024 12:28:46 +0200 Subject: [PATCH 3/9] Add Changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4bc6f43da..335736bca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,8 @@ ### To be Released -* fix(cmd): addons-info working for non-db addons ([PR#1055](https://github.com/Scalingo/cli/pull/1055)) +* feat(domains): `domains-add` now supports `--no-letsencrypt` flag to completely disable Let's Encrypt certificat generation +* fix(cmd): `addons-info` working for non-db addons ([PR#1055](https://github.com/Scalingo/cli/pull/1055)) ### 1.31.0 From f8488830a451116bd9da16f112acb610aab096b0 Mon Sep 17 00:00:00 2001 From: Soulou Date: Fri, 19 Apr 2024 16:35:48 +0200 Subject: [PATCH 4/9] feat: update output of 'domains' in order to take letsencrypt_enabled: false --- domains/list.go | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/domains/list.go b/domains/list.go index daf6fd1e2..3d6ce2dcf 100644 --- a/domains/list.go +++ b/domains/list.go @@ -15,7 +15,7 @@ import ( var letsencryptStatusString = map[string]string{ string(scalingo.LetsEncryptStatusPendingDNS): "Pending DNS", string(scalingo.LetsEncryptStatusNew): "Creating", - string(scalingo.LetsEncryptStatusCreated): "In use", + string(scalingo.LetsEncryptStatusCreated): "Created", string(scalingo.LetsEncryptStatusDNSRequired): "DNS required", string(scalingo.LetsEncryptStatusError): "Error", } @@ -31,7 +31,7 @@ func List(ctx context.Context, app string) error { } t := tablewriter.NewWriter(os.Stdout) - t.SetHeader([]string{"Domain", "TLS/SSL"}) + t.SetHeader([]string{"Domain", "TLS/SSL", "TLS Subject", "Let's Encrypt Certificate"}) hasCanonical := false for _, domain := range domains { @@ -40,18 +40,32 @@ func List(ctx context.Context, app string) error { hasCanonical = true domainName += " (*)" } - row := []string{domainName} - if !domain.SSL { - row = append(row, "-") - } else if domain.LetsEncrypt { - letsencryptStatus, ok := letsencryptStatusString[string(domain.LetsEncryptStatus)] + + tls := "-" + letsEncrypt := "Disabled" + if domain.LetsEncryptEnabled { + // If the domain is using Let's Encrypt (and not a custom cert), we mention it + if domain.LetsEncrypt { + tls = "Let's Encrypt" + } + // In any case we display the state of creation of the Let's Encrypt certificate + // So if a customer certification is used, it is still mentionned we have it + var ok bool + letsEncrypt, ok = letsencryptStatusString[string(domain.LetsEncryptStatus)] if !ok { - letsencryptStatus = string(domain.LetsEncryptStatus) + letsEncrypt = string(domain.LetsEncryptStatus) + } + + if !domain.LetsEncrypt && domain.LetsEncryptStatus == scalingo.LetsEncryptStatusCreated { + letsEncrypt = "Created, Not in use" } - row = append(row, fmt.Sprintf("Let's Encrypt: %s", letsencryptStatus)) - } else { - row = append(row, fmt.Sprintf("Valid until %v", domain.Validity)) } + + if domain.SSL && !domain.LetsEncrypt { + tls = fmt.Sprintf("Valid until %v", domain.Validity) + } + + row := []string{domainName, tls, domain.TLSCert, letsEncrypt} t.Append(row) } t.Render() From 52e9462ea8f7a59bb231747e25f1d991908a4b05 Mon Sep 17 00:00:00 2001 From: Soulou Date: Fri, 19 Apr 2024 17:51:08 +0200 Subject: [PATCH 5/9] Fix error management --- cmd/domains.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cmd/domains.go b/cmd/domains.go index 9b5f2e133..0a7cb6d87 100644 --- a/cmd/domains.go +++ b/cmd/domains.go @@ -67,7 +67,6 @@ var ( Action: func(c *cli.Context) error { currentApp := detect.CurrentApp(c) utils.CheckForConsent(c.Context, currentApp, utils.ConsentTypeContainers) - var err error if c.Args().Len() == 1 { cert := c.String("cert") @@ -92,13 +91,12 @@ var ( } err = domains.Add(c.Context, currentApp, params) + if err != nil { + errorQuit(c.Context, err) + } } else { cli.ShowCommandHelp(c, "domains-add") } - - if err != nil { - errorQuit(c.Context, err) - } return nil }, BashComplete: func(c *cli.Context) { From a68242676dfd45950b2fa81bbf0bbc6012642c28 Mon Sep 17 00:00:00 2001 From: CURZOLA Pierre Date: Thu, 25 Apr 2024 09:39:43 +0200 Subject: [PATCH 6/9] style(import): remove useless scalingo alias for go-scalingo --- apps/operations.go | 2 +- apps/run/run_windows.go | 2 +- cmd/alerts.go | 2 +- cmd/deployments.go | 2 +- cmd/domains.go | 2 +- cmd/maintenance.go | 2 +- cmd/notifiers.go | 2 +- cmd/region_migrations.go | 2 +- config/auth.go | 2 +- db/backup_create.go | 2 +- db/backups.go | 2 +- db/backups_config.go | 2 +- db/features.go | 2 +- domains/list.go | 2 +- integrationlink/show.go | 2 +- notifiers/create.go | 2 +- notifiers/list.go | 2 +- regionmigrations/refresher.go | 2 +- regionmigrations/run.go | 2 +- regionmigrations/status.go | 2 +- regionmigrations/utils.go | 2 +- regionmigrations/watch.go | 2 +- scmintegrations/delete.go | 2 +- scmintegrations/list.go | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/apps/operations.go b/apps/operations.go index c3f8e64e0..acdee1276 100644 --- a/apps/operations.go +++ b/apps/operations.go @@ -12,7 +12,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7" errors "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/apps/run/run_windows.go b/apps/run/run_windows.go index 3f6644b6b..946063ea1 100644 --- a/apps/run/run_windows.go +++ b/apps/run/run_windows.go @@ -5,7 +5,7 @@ import ( "net" "os" - scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7" ) func NotifiedSignals() chan os.Signal { diff --git a/cmd/alerts.go b/cmd/alerts.go index 50fbf841c..6225b25a9 100644 --- a/cmd/alerts.go +++ b/cmd/alerts.go @@ -7,7 +7,7 @@ import ( "github.com/Scalingo/cli/cmd/autocomplete" "github.com/Scalingo/cli/detect" "github.com/Scalingo/cli/utils" - scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7" ) var ( diff --git a/cmd/deployments.go b/cmd/deployments.go index 7abbaf3e7..e3cc6dc21 100644 --- a/cmd/deployments.go +++ b/cmd/deployments.go @@ -10,7 +10,7 @@ import ( "github.com/Scalingo/cli/deployments" "github.com/Scalingo/cli/detect" "github.com/Scalingo/cli/utils" - scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7" "github.com/Scalingo/go-scalingo/v7/io" ) diff --git a/cmd/domains.go b/cmd/domains.go index 0a7cb6d87..b4ec13429 100644 --- a/cmd/domains.go +++ b/cmd/domains.go @@ -10,7 +10,7 @@ import ( "github.com/Scalingo/cli/detect" "github.com/Scalingo/cli/domains" "github.com/Scalingo/cli/utils" - scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7" ) var ( diff --git a/cmd/maintenance.go b/cmd/maintenance.go index e5f076516..6cdfcaf4f 100644 --- a/cmd/maintenance.go +++ b/cmd/maintenance.go @@ -6,7 +6,7 @@ import ( "github.com/Scalingo/cli/db/maintenance" "github.com/Scalingo/cli/detect" "github.com/Scalingo/cli/utils" - scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7" ) var databaseMaintenanceList = cli.Command{ diff --git a/cmd/notifiers.go b/cmd/notifiers.go index d28506b43..2448a3d27 100644 --- a/cmd/notifiers.go +++ b/cmd/notifiers.go @@ -7,7 +7,7 @@ import ( "github.com/Scalingo/cli/detect" "github.com/Scalingo/cli/notifiers" "github.com/Scalingo/cli/utils" - scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7" ) var ( diff --git a/cmd/region_migrations.go b/cmd/region_migrations.go index a292d8fef..7f982aa9e 100644 --- a/cmd/region_migrations.go +++ b/cmd/region_migrations.go @@ -7,7 +7,7 @@ import ( "github.com/Scalingo/cli/detect" "github.com/Scalingo/cli/regionmigrations" "github.com/Scalingo/cli/utils" - scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7" ) var ( diff --git a/config/auth.go b/config/auth.go index 6bdd60727..8dc50a7aa 100644 --- a/config/auth.go +++ b/config/auth.go @@ -15,7 +15,7 @@ import ( "github.com/Scalingo/cli/config/auth" appio "github.com/Scalingo/cli/io" "github.com/Scalingo/cli/term" - scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7" scalingohttp "github.com/Scalingo/go-scalingo/v7/http" scalingoerrors "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/db/backup_create.go b/db/backup_create.go index ef99565c8..8ff294e85 100644 --- a/db/backup_create.go +++ b/db/backup_create.go @@ -10,7 +10,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7" ) func CreateBackup(ctx context.Context, app, addon string) error { diff --git a/db/backups.go b/db/backups.go index 3f6273167..1d46e53bd 100644 --- a/db/backups.go +++ b/db/backups.go @@ -11,7 +11,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7" ) func ListBackups(ctx context.Context, app, addon string) error { diff --git a/db/backups_config.go b/db/backups_config.go index 413aeb44f..1c2ff68b0 100644 --- a/db/backups_config.go +++ b/db/backups_config.go @@ -11,7 +11,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7" ) func BackupsConfiguration(ctx context.Context, app, addon string, params scalingo.DatabaseUpdatePeriodicBackupsConfigParams) error { diff --git a/db/features.go b/db/features.go index fcec947b8..dcc2aba14 100644 --- a/db/features.go +++ b/db/features.go @@ -10,7 +10,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7" ) // EnableFeature is the command handler to enable a database feature on a given diff --git a/domains/list.go b/domains/list.go index 3d6ce2dcf..2d5726fe0 100644 --- a/domains/list.go +++ b/domains/list.go @@ -9,7 +9,7 @@ import ( "gopkg.in/errgo.v1" "github.com/Scalingo/cli/config" - scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7" ) var letsencryptStatusString = map[string]string{ diff --git a/integrationlink/show.go b/integrationlink/show.go index 243bc85bf..5bca0c3c4 100644 --- a/integrationlink/show.go +++ b/integrationlink/show.go @@ -10,7 +10,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" "github.com/Scalingo/cli/utils" - scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7" "github.com/Scalingo/go-scalingo/v7/http" "github.com/Scalingo/go-utils/errors/v2" ) diff --git a/notifiers/create.go b/notifiers/create.go index 85efd67ad..1153a111c 100644 --- a/notifiers/create.go +++ b/notifiers/create.go @@ -7,7 +7,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7" "github.com/Scalingo/go-scalingo/v7/debug" ) diff --git a/notifiers/list.go b/notifiers/list.go index 114dd5766..eeaa2714f 100644 --- a/notifiers/list.go +++ b/notifiers/list.go @@ -10,7 +10,7 @@ import ( "gopkg.in/errgo.v1" "github.com/Scalingo/cli/config" - scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7" ) func List(ctx context.Context, app string) error { diff --git a/regionmigrations/refresher.go b/regionmigrations/refresher.go index 8948e03fb..83c6a98b8 100644 --- a/regionmigrations/refresher.go +++ b/regionmigrations/refresher.go @@ -12,7 +12,7 @@ import ( errgo "gopkg.in/errgo.v1" "github.com/Scalingo/cli/utils" - scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7" "github.com/Scalingo/go-utils/retry" ) diff --git a/regionmigrations/run.go b/regionmigrations/run.go index 21cd851d2..87f54a19a 100644 --- a/regionmigrations/run.go +++ b/regionmigrations/run.go @@ -7,7 +7,7 @@ import ( errgo "gopkg.in/errgo.v1" "github.com/Scalingo/cli/config" - scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7" ) func Create(ctx context.Context, app string, destination string, dstAppName string) error { diff --git a/regionmigrations/status.go b/regionmigrations/status.go index 9013c23f1..2a157de73 100644 --- a/regionmigrations/status.go +++ b/regionmigrations/status.go @@ -11,7 +11,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" "github.com/Scalingo/cli/utils" - scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7" ) func showMigrationStatusSuccess(ctx context.Context, appID string, migration scalingo.RegionMigration) { diff --git a/regionmigrations/utils.go b/regionmigrations/utils.go index 6f4df2913..9a4b663fa 100644 --- a/regionmigrations/utils.go +++ b/regionmigrations/utils.go @@ -3,7 +3,7 @@ package regionmigrations import ( "github.com/fatih/color" - scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7" ) func formatMigrationStatus(status scalingo.RegionMigrationStatus) string { diff --git a/regionmigrations/watch.go b/regionmigrations/watch.go index 16454a562..e91ab4d69 100644 --- a/regionmigrations/watch.go +++ b/regionmigrations/watch.go @@ -6,7 +6,7 @@ import ( errgo "gopkg.in/errgo.v1" - scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7" ) func WatchMigration(ctx context.Context, client *scalingo.Client, appID, migrationID string, opts RefreshOpts) error { diff --git a/scmintegrations/delete.go b/scmintegrations/delete.go index ebe1a74bc..883b35d2c 100644 --- a/scmintegrations/delete.go +++ b/scmintegrations/delete.go @@ -7,7 +7,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7" ) func Delete(ctx context.Context, id string) error { diff --git a/scmintegrations/list.go b/scmintegrations/list.go index d06a4787a..81f3c47a4 100644 --- a/scmintegrations/list.go +++ b/scmintegrations/list.go @@ -9,7 +9,7 @@ import ( "github.com/Scalingo/cli/config" "github.com/Scalingo/cli/io" - scalingo "github.com/Scalingo/go-scalingo/v7" + "github.com/Scalingo/go-scalingo/v7" ) func List(ctx context.Context) error { From f2478a388a6c7965ba60b94d0f4abddea7ae3adc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Unbekandt?= <159253935+leo-scalingo@users.noreply.github.com> Date: Fri, 26 Apr 2024 14:35:24 +0200 Subject: [PATCH 7/9] Update CHANGELOG.md Co-authored-by: Pierre Curzola --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 335736bca..e0295bcc0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ### To be Released -* feat(domains): `domains-add` now supports `--no-letsencrypt` flag to completely disable Let's Encrypt certificat generation +* feat(domains): `domains-add` now supports `--no-letsencrypt` flag to completely disable Let's Encrypt certificat generation ([PR#1058](https://github.com/Scalingo/cli/pull/1058)) * fix(cmd): `addons-info` working for non-db addons ([PR#1055](https://github.com/Scalingo/cli/pull/1055)) ### 1.31.0 From 115a32697f949f3d9f2bd71403f97d0a39bce512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Unbekandt?= <159253935+leo-scalingo@users.noreply.github.com> Date: Fri, 26 Apr 2024 14:37:18 +0200 Subject: [PATCH 8/9] Update domains/list.go Co-authored-by: Pierre Curzola --- domains/list.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domains/list.go b/domains/list.go index 2d5726fe0..5268ac03d 100644 --- a/domains/list.go +++ b/domains/list.go @@ -49,7 +49,7 @@ func List(ctx context.Context, app string) error { tls = "Let's Encrypt" } // In any case we display the state of creation of the Let's Encrypt certificate - // So if a customer certification is used, it is still mentionned we have it + // So if a customer certification is used, it is still mentioned we have it var ok bool letsEncrypt, ok = letsencryptStatusString[string(domain.LetsEncryptStatus)] if !ok { From c25b0be96cf083d92cd0d7359dcc538a2c1e65cf Mon Sep 17 00:00:00 2001 From: Soulou Date: Fri, 26 Apr 2024 14:37:36 +0200 Subject: [PATCH 9/9] go tidy --- go.mod | 3 +-- go.sum | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/go.mod b/go.mod index d997a70c3..f9703f212 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/AlecAivazis/survey/v2 v2.3.7 - github.com/Scalingo/go-scalingo/v6 v6.7.7 + github.com/Scalingo/go-scalingo/v7 v7.0.0 github.com/Scalingo/go-utils/errors/v2 v2.4.0 github.com/Scalingo/go-utils/logger v1.2.0 github.com/Scalingo/go-utils/retry v1.1.1 @@ -35,7 +35,6 @@ require ( dario.cat/mergo v1.0.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/ProtonMail/go-crypto v1.1.0-alpha.2 // indirect - github.com/Scalingo/go-scalingo/v7 v7.0.0 // indirect github.com/VividCortex/ewma v1.2.0 // indirect github.com/cloudflare/circl v1.3.7 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect diff --git a/go.sum b/go.sum index 54fb86540..eb7aba29d 100644 --- a/go.sum +++ b/go.sum @@ -9,8 +9,6 @@ github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63n github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w= github.com/ProtonMail/go-crypto v1.1.0-alpha.2 h1:bkyFVUP+ROOARdgCiJzNQo2V2kiB97LyUpzH9P6Hrlg= github.com/ProtonMail/go-crypto v1.1.0-alpha.2/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= -github.com/Scalingo/go-scalingo/v6 v6.7.7 h1:pDjEtcl7z3oJ3t7s5TieWBbr5wlzF/J/7mIHzBCrRBY= -github.com/Scalingo/go-scalingo/v6 v6.7.7/go.mod h1:GCQ0KuiYKWr1EXqYXolZ+j7R5+DVjKr2K2t7CrayzW0= github.com/Scalingo/go-scalingo/v7 v7.0.0 h1:y89FfQgjl8Foxm4+hXfCyGrpmtMnsB8G6kKuijXAUKI= github.com/Scalingo/go-scalingo/v7 v7.0.0/go.mod h1:UlRkN2cRyagSqAanCZWBgZDWsAQ/dk7xBdN51Fv6evM= github.com/Scalingo/go-utils/errors/v2 v2.4.0 h1:vKG0Js3kzWG7+03LEvH7j8fw+picEcRhbjMm3i9Xbb8=