From 0e8d7c49fa3997fefc2f142075b7a6bdd2b0f6f1 Mon Sep 17 00:00:00 2001 From: Qiao Han Date: Sun, 8 Dec 2024 00:23:48 +0800 Subject: [PATCH] Revert "chore: bump cli module to v2" This reverts commit e4c39e6ab3401bce21b9b6fd53ceedc29f5c993a. --- cmd/bans.go | 6 +-- cmd/bootstrap.go | 4 +- cmd/branches.go | 20 ++++---- cmd/config.go | 4 +- cmd/db.go | 32 ++++++------- cmd/domains.go | 12 ++--- cmd/encryption.go | 6 +-- cmd/functions.go | 18 ++++---- cmd/gen.go | 8 ++-- cmd/init.go | 4 +- cmd/inspect.go | 46 +++++++++---------- cmd/link.go | 6 +-- cmd/login.go | 4 +- cmd/logout.go | 2 +- cmd/migration.go | 16 +++---- cmd/orgs.go | 4 +- cmd/postgres.go | 6 +-- cmd/projects.go | 14 +++--- cmd/restrictions.go | 6 +-- cmd/root.go | 4 +- cmd/secrets.go | 8 ++-- cmd/seed.go | 6 +-- cmd/services.go | 2 +- cmd/snippets.go | 6 +-- cmd/sslEnforcement.go | 6 +-- cmd/sso.go | 16 +++---- cmd/start.go | 4 +- cmd/status.go | 4 +- cmd/stop.go | 2 +- cmd/storage.go | 12 ++--- cmd/test.go | 4 +- cmd/unlink.go | 2 +- cmd/vanitySubdomains.go | 10 ++-- docs/main.go | 4 +- examples/functions-deploy/main.go | 6 +-- examples/migrations-up/main.go | 4 +- examples/seed-buckets/main.go | 6 +-- go.mod | 21 ++++++++- go.sum | 42 +++++++++++++++++ internal/bans/get/get.go | 2 +- internal/bans/update/update.go | 4 +- internal/bootstrap/bootstrap.go | 24 +++++----- internal/bootstrap/bootstrap_test.go | 4 +- internal/branches/create/create.go | 8 ++-- internal/branches/create/create_test.go | 10 ++-- internal/branches/delete/delete.go | 2 +- internal/branches/disable/disable.go | 4 +- internal/branches/get/get.go | 4 +- internal/branches/list/list.go | 6 +-- internal/branches/update/update.go | 4 +- internal/config/push/push.go | 4 +- internal/db/branch/create/create.go | 2 +- internal/db/branch/create/create_test.go | 4 +- internal/db/branch/delete/delete.go | 2 +- internal/db/branch/delete/delete_test.go | 4 +- internal/db/branch/list/list.go | 2 +- internal/db/branch/list/list_test.go | 2 +- internal/db/branch/switch_/switch_.go | 4 +- internal/db/branch/switch_/switch__test.go | 8 ++-- internal/db/diff/diff.go | 10 ++-- internal/db/diff/diff_test.go | 16 +++---- internal/db/diff/migra.go | 4 +- internal/db/diff/pgadmin.go | 8 ++-- internal/db/dump/dump.go | 4 +- internal/db/dump/dump_test.go | 4 +- internal/db/lint/lint.go | 4 +- internal/db/lint/lint_test.go | 6 +-- internal/db/pull/pull.go | 14 +++--- internal/db/pull/pull_test.go | 10 ++-- internal/db/push/push.go | 8 ++-- internal/db/push/push_test.go | 10 ++-- internal/db/remote/changes/changes.go | 6 +-- internal/db/remote/commit/commit.go | 12 ++--- internal/db/reset/reset.go | 18 ++++---- internal/db/reset/reset_test.go | 16 +++---- internal/db/start/start.go | 8 ++-- internal/db/start/start_test.go | 10 ++-- internal/db/test/test.go | 4 +- internal/db/test/test_test.go | 8 ++-- internal/debug/postgres_test.go | 2 +- internal/encryption/get/get.go | 2 +- internal/encryption/get/get_test.go | 6 +-- internal/encryption/update/update.go | 6 +-- internal/encryption/update/update_test.go | 6 +-- internal/functions/delete/delete.go | 2 +- internal/functions/delete/delete_test.go | 4 +- internal/functions/deploy/bundle.go | 4 +- internal/functions/deploy/bundle_test.go | 4 +- internal/functions/deploy/deploy.go | 10 ++-- internal/functions/deploy/deploy_test.go | 10 ++-- internal/functions/download/download.go | 4 +- internal/functions/download/download_test.go | 6 +-- internal/functions/list/list.go | 4 +- internal/functions/list/list_test.go | 6 +-- internal/functions/new/new.go | 2 +- internal/functions/new/new_test.go | 2 +- internal/functions/serve/serve.go | 6 +-- internal/functions/serve/serve_test.go | 6 +-- internal/gen/keys/keys.go | 4 +- internal/gen/types/types.go | 4 +- internal/gen/types/types_test.go | 8 ++-- internal/hostnames/activate/activate.go | 4 +- internal/hostnames/common.go | 4 +- internal/hostnames/create/create.go | 6 +-- internal/hostnames/delete/delete.go | 2 +- internal/hostnames/get/get.go | 2 +- internal/hostnames/reverify/reverify.go | 4 +- internal/init/init.go | 2 +- internal/init/init_test.go | 6 +-- internal/inspect/bloat/bloat.go | 8 ++-- internal/inspect/bloat/bloat_test.go | 6 +-- internal/inspect/blocking/blocking.go | 6 +-- internal/inspect/blocking/blocking_test.go | 2 +- internal/inspect/cache/cache.go | 6 +-- internal/inspect/cache/cache_test.go | 2 +- internal/inspect/calls/calls.go | 6 +-- internal/inspect/calls/calls_test.go | 2 +- internal/inspect/index_sizes/index_sizes.go | 8 ++-- .../inspect/index_sizes/index_sizes_test.go | 6 +-- internal/inspect/index_usage/index_usage.go | 8 ++-- .../inspect/index_usage/index_usage_test.go | 6 +-- internal/inspect/locks/locks.go | 6 +-- internal/inspect/locks/locks_test.go | 2 +- .../long_running_queries.go | 6 +-- .../long_running_queries_test.go | 2 +- internal/inspect/outliers/outliers.go | 6 +-- internal/inspect/outliers/outliers_test.go | 2 +- .../replication_slots/replication_slots.go | 6 +-- .../replication_slots_test.go | 2 +- internal/inspect/report.go | 4 +- internal/inspect/report_test.go | 42 ++++++++--------- internal/inspect/role_configs/role_configs.go | 6 +-- .../inspect/role_configs/role_configs_test.go | 2 +- .../role_connections/role_connections.go | 6 +-- .../role_connections/role_connections_test.go | 2 +- internal/inspect/seq_scans/seq_scans.go | 8 ++-- internal/inspect/seq_scans/seq_scans_test.go | 6 +-- .../table_index_sizes/table_index_sizes.go | 8 ++-- .../table_index_sizes_test.go | 6 +-- .../table_record_counts.go | 8 ++-- .../table_record_counts_test.go | 6 +-- internal/inspect/table_sizes/table_sizes.go | 8 ++-- .../inspect/table_sizes/table_sizes_test.go | 6 +-- .../total_index_size/total_index_size.go | 8 ++-- .../total_index_size/total_index_size_test.go | 6 +-- .../total_table_sizes/total_table_sizes.go | 8 ++-- .../total_table_sizes_test.go | 6 +-- .../inspect/unused_indexes/unused_indexes.go | 8 ++-- .../unused_indexes/unused_indexes_test.go | 6 +-- internal/inspect/vacuum_stats/vacuum_stats.go | 8 ++-- .../inspect/vacuum_stats/vacuum_stats_test.go | 6 +-- internal/link/link.go | 18 ++++---- internal/link/link_test.go | 16 +++---- internal/login/login.go | 6 +-- internal/login/login_test.go | 6 +-- internal/logout/logout.go | 4 +- internal/logout/logout_test.go | 8 ++-- internal/migration/apply/apply.go | 6 +-- internal/migration/apply/apply_test.go | 10 ++-- internal/migration/fetch/fetch.go | 4 +- internal/migration/list/list.go | 4 +- internal/migration/list/list_test.go | 8 ++-- internal/migration/new/new.go | 2 +- internal/migration/new/new_test.go | 2 +- internal/migration/repair/repair.go | 6 +-- internal/migration/repair/repair_test.go | 10 ++-- internal/migration/squash/squash.go | 14 +++--- internal/migration/squash/squash_test.go | 16 +++---- internal/migration/up/up.go | 4 +- internal/migration/up/up_test.go | 8 ++-- internal/orgs/create/create.go | 4 +- internal/orgs/create/create_test.go | 6 +-- internal/orgs/list/list.go | 4 +- internal/orgs/list/list_test.go | 6 +-- internal/postgresConfig/get/get.go | 4 +- internal/postgresConfig/update/update.go | 4 +- internal/projects/apiKeys/api_keys.go | 6 +-- internal/projects/apiKeys/api_keys_test.go | 6 +-- internal/projects/create/create.go | 8 ++-- internal/projects/create/create_test.go | 6 +-- internal/projects/delete/delete.go | 6 +-- internal/projects/delete/delete_test.go | 6 +-- internal/projects/list/list.go | 8 ++-- internal/projects/list/list_test.go | 6 +-- internal/restrictions/get/get.go | 2 +- internal/restrictions/update/update.go | 4 +- internal/restrictions/update/update_test.go | 6 +-- internal/secrets/list/list.go | 6 +-- internal/secrets/list/list_test.go | 6 +-- internal/secrets/set/set.go | 4 +- internal/secrets/set/set_test.go | 6 +-- internal/secrets/unset/unset.go | 4 +- internal/secrets/unset/unset_test.go | 6 +-- internal/seed/buckets/buckets.go | 4 +- internal/seed/buckets/buckets_test.go | 6 +-- internal/services/services.go | 8 ++-- internal/snippets/download/download.go | 2 +- internal/snippets/list/list.go | 8 ++-- internal/ssl_enforcement/get/get.go | 2 +- internal/ssl_enforcement/update/update.go | 4 +- internal/sso/create/create.go | 8 ++-- internal/sso/get/get.go | 6 +-- internal/sso/get/get_test.go | 4 +- internal/sso/info/info.go | 4 +- internal/sso/internal/render/render.go | 6 +-- internal/sso/internal/saml/files.go | 4 +- internal/sso/list/list.go | 4 +- internal/sso/list/list_test.go | 4 +- internal/sso/remove/remove.go | 6 +-- internal/sso/remove/remove_test.go | 4 +- internal/sso/update/update.go | 8 ++-- internal/sso/update/update_test.go | 6 +-- internal/start/start.go | 16 +++---- internal/start/start_test.go | 10 ++-- internal/status/status.go | 4 +- internal/status/status_test.go | 4 +- internal/stop/stop.go | 2 +- internal/stop/stop_test.go | 4 +- internal/storage/client/api.go | 10 ++-- internal/storage/cp/cp.go | 12 ++--- internal/storage/cp/cp_test.go | 14 +++--- internal/storage/ls/ls.go | 6 +-- internal/storage/ls/ls_test.go | 16 +++---- internal/storage/mv/mv.go | 8 ++-- internal/storage/mv/mv_test.go | 14 +++--- internal/storage/rm/rm.go | 12 ++--- internal/storage/rm/rm_test.go | 16 +++---- internal/test/new/new.go | 2 +- internal/test/new/new_test.go | 2 +- internal/testing/helper/history.go | 4 +- internal/unlink/unlink.go | 4 +- internal/unlink/unlink_test.go | 6 +-- internal/utils/access_token.go | 2 +- internal/utils/access_token_test.go | 6 +-- internal/utils/api.go | 6 +-- internal/utils/api_test.go | 4 +- internal/utils/cloudflare/api.go | 2 +- internal/utils/cloudflare/dns.go | 2 +- internal/utils/config.go | 2 +- internal/utils/connect.go | 4 +- internal/utils/connect_test.go | 6 +-- internal/utils/console.go | 2 +- internal/utils/console_test.go | 2 +- internal/utils/docker_test.go | 2 +- internal/utils/flags/db_url.go | 6 +-- internal/utils/flags/project_ref.go | 2 +- internal/utils/flags/project_ref_test.go | 8 ++-- internal/utils/release_test.go | 4 +- internal/utils/tenant/client.go | 6 +-- internal/utils/tenant/database.go | 2 +- internal/utils/tenant/gotrue.go | 2 +- internal/utils/tenant/gotrue_test.go | 2 +- internal/utils/tenant/postgrest.go | 2 +- .../vanity_subdomains/activate/activate.go | 4 +- internal/vanity_subdomains/check/check.go | 4 +- internal/vanity_subdomains/delete/delete.go | 2 +- internal/vanity_subdomains/get/get.go | 2 +- main.go | 2 +- pkg/config/api.go | 6 +-- pkg/config/api_test.go | 2 +- pkg/config/auth.go | 6 +-- pkg/config/auth_test.go | 4 +- pkg/config/config.go | 4 +- pkg/config/db.go | 6 +-- pkg/config/db_test.go | 4 +- pkg/config/storage.go | 6 +-- pkg/config/updater.go | 2 +- pkg/config/updater_test.go | 4 +- pkg/function/api.go | 2 +- pkg/function/batch.go | 4 +- pkg/function/batch_test.go | 4 +- pkg/migration/apply_test.go | 2 +- pkg/migration/drop.go | 2 +- pkg/migration/drop_test.go | 2 +- pkg/migration/file.go | 2 +- pkg/migration/file_test.go | 4 +- pkg/migration/history.go | 2 +- pkg/migration/list.go | 2 +- pkg/migration/list_test.go | 2 +- pkg/migration/seed_test.go | 2 +- pkg/parser/token.go | 2 +- pkg/pgtest/mock.go | 2 +- pkg/storage/api.go | 2 +- pkg/storage/batch.go | 4 +- pkg/storage/buckets.go | 2 +- pkg/storage/objects.go | 2 +- tools/bumpdoc/main.go | 4 +- tools/changelog/main.go | 2 +- tools/listdep/main.go | 2 +- tools/publish/main.go | 6 +-- tools/selfhost/main.go | 6 +-- 291 files changed, 939 insertions(+), 878 deletions(-) diff --git a/cmd/bans.go b/cmd/bans.go index 6f930c042..603e2dd4d 100644 --- a/cmd/bans.go +++ b/cmd/bans.go @@ -3,9 +3,9 @@ package cmd import ( "github.com/spf13/afero" "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/bans/get" - "github.com/supabase/cli/v2/internal/bans/update" - "github.com/supabase/cli/v2/internal/utils/flags" + "github.com/supabase/cli/internal/bans/get" + "github.com/supabase/cli/internal/bans/update" + "github.com/supabase/cli/internal/utils/flags" ) var ( diff --git a/cmd/bootstrap.go b/cmd/bootstrap.go index 21d24fb1f..fd9f74912 100644 --- a/cmd/bootstrap.go +++ b/cmd/bootstrap.go @@ -11,8 +11,8 @@ import ( "github.com/spf13/afero" "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/supabase/cli/v2/internal/bootstrap" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/bootstrap" + "github.com/supabase/cli/internal/utils" ) var ( diff --git a/cmd/branches.go b/cmd/branches.go index dd0897d9f..0248e7f31 100644 --- a/cmd/branches.go +++ b/cmd/branches.go @@ -8,16 +8,16 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/branches/create" - "github.com/supabase/cli/v2/internal/branches/delete" - "github.com/supabase/cli/v2/internal/branches/disable" - "github.com/supabase/cli/v2/internal/branches/get" - "github.com/supabase/cli/v2/internal/branches/list" - "github.com/supabase/cli/v2/internal/branches/update" - "github.com/supabase/cli/v2/internal/gen/keys" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/branches/create" + "github.com/supabase/cli/internal/branches/delete" + "github.com/supabase/cli/internal/branches/disable" + "github.com/supabase/cli/internal/branches/get" + "github.com/supabase/cli/internal/branches/list" + "github.com/supabase/cli/internal/branches/update" + "github.com/supabase/cli/internal/gen/keys" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" + "github.com/supabase/cli/pkg/api" ) var ( diff --git a/cmd/config.go b/cmd/config.go index 0b0657506..1d0f60733 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -3,8 +3,8 @@ package cmd import ( "github.com/spf13/afero" "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/config/push" - "github.com/supabase/cli/v2/internal/utils/flags" + "github.com/supabase/cli/internal/config/push" + "github.com/supabase/cli/internal/utils/flags" ) var ( diff --git a/cmd/db.go b/cmd/db.go index 6737f543e..2d64edd74 100644 --- a/cmd/db.go +++ b/cmd/db.go @@ -8,22 +8,22 @@ import ( "github.com/spf13/afero" "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/supabase/cli/v2/internal/db/branch/create" - "github.com/supabase/cli/v2/internal/db/branch/delete" - "github.com/supabase/cli/v2/internal/db/branch/list" - "github.com/supabase/cli/v2/internal/db/branch/switch_" - "github.com/supabase/cli/v2/internal/db/diff" - "github.com/supabase/cli/v2/internal/db/dump" - "github.com/supabase/cli/v2/internal/db/lint" - "github.com/supabase/cli/v2/internal/db/pull" - "github.com/supabase/cli/v2/internal/db/push" - "github.com/supabase/cli/v2/internal/db/remote/changes" - "github.com/supabase/cli/v2/internal/db/remote/commit" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/db/start" - "github.com/supabase/cli/v2/internal/db/test" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" + "github.com/supabase/cli/internal/db/branch/create" + "github.com/supabase/cli/internal/db/branch/delete" + "github.com/supabase/cli/internal/db/branch/list" + "github.com/supabase/cli/internal/db/branch/switch_" + "github.com/supabase/cli/internal/db/diff" + "github.com/supabase/cli/internal/db/dump" + "github.com/supabase/cli/internal/db/lint" + "github.com/supabase/cli/internal/db/pull" + "github.com/supabase/cli/internal/db/push" + "github.com/supabase/cli/internal/db/remote/changes" + "github.com/supabase/cli/internal/db/remote/commit" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/db/start" + "github.com/supabase/cli/internal/db/test" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" ) var ( diff --git a/cmd/domains.go b/cmd/domains.go index cbc9ecb6e..9ec4a097d 100644 --- a/cmd/domains.go +++ b/cmd/domains.go @@ -3,12 +3,12 @@ package cmd import ( "github.com/spf13/afero" "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/hostnames/activate" - "github.com/supabase/cli/v2/internal/hostnames/create" - "github.com/supabase/cli/v2/internal/hostnames/delete" - "github.com/supabase/cli/v2/internal/hostnames/get" - "github.com/supabase/cli/v2/internal/hostnames/reverify" - "github.com/supabase/cli/v2/internal/utils/flags" + "github.com/supabase/cli/internal/hostnames/activate" + "github.com/supabase/cli/internal/hostnames/create" + "github.com/supabase/cli/internal/hostnames/delete" + "github.com/supabase/cli/internal/hostnames/get" + "github.com/supabase/cli/internal/hostnames/reverify" + "github.com/supabase/cli/internal/utils/flags" ) var ( diff --git a/cmd/encryption.go b/cmd/encryption.go index 5e93d432a..d3b654afc 100644 --- a/cmd/encryption.go +++ b/cmd/encryption.go @@ -4,9 +4,9 @@ import ( "os" "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/encryption/get" - "github.com/supabase/cli/v2/internal/encryption/update" - "github.com/supabase/cli/v2/internal/utils/flags" + "github.com/supabase/cli/internal/encryption/get" + "github.com/supabase/cli/internal/encryption/update" + "github.com/supabase/cli/internal/utils/flags" ) var ( diff --git a/cmd/functions.go b/cmd/functions.go index b765a41ed..36dc47f94 100644 --- a/cmd/functions.go +++ b/cmd/functions.go @@ -5,15 +5,15 @@ import ( "github.com/spf13/afero" "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/functions/delete" - "github.com/supabase/cli/v2/internal/functions/deploy" - "github.com/supabase/cli/v2/internal/functions/download" - "github.com/supabase/cli/v2/internal/functions/list" - new_ "github.com/supabase/cli/v2/internal/functions/new" - "github.com/supabase/cli/v2/internal/functions/serve" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" - "github.com/supabase/cli/v2/pkg/cast" + "github.com/supabase/cli/internal/functions/delete" + "github.com/supabase/cli/internal/functions/deploy" + "github.com/supabase/cli/internal/functions/download" + "github.com/supabase/cli/internal/functions/list" + new_ "github.com/supabase/cli/internal/functions/new" + "github.com/supabase/cli/internal/functions/serve" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" + "github.com/supabase/cli/pkg/cast" ) var ( diff --git a/cmd/gen.go b/cmd/gen.go index 9c6e66129..1789e29ca 100644 --- a/cmd/gen.go +++ b/cmd/gen.go @@ -8,10 +8,10 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/gen/keys" - "github.com/supabase/cli/v2/internal/gen/types" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" + "github.com/supabase/cli/internal/gen/keys" + "github.com/supabase/cli/internal/gen/types" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" ) var ( diff --git a/cmd/init.go b/cmd/init.go index ed9684c23..a9d2d90a8 100644 --- a/cmd/init.go +++ b/cmd/init.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/afero" "github.com/spf13/cobra" "github.com/spf13/viper" - _init "github.com/supabase/cli/v2/internal/init" - "github.com/supabase/cli/v2/internal/utils" + _init "github.com/supabase/cli/internal/init" + "github.com/supabase/cli/internal/utils" ) var ( diff --git a/cmd/inspect.go b/cmd/inspect.go index 29b69795a..2b55c3876 100644 --- a/cmd/inspect.go +++ b/cmd/inspect.go @@ -8,30 +8,30 @@ import ( "github.com/spf13/afero" "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/inspect/bloat" - "github.com/supabase/cli/v2/internal/inspect/blocking" - "github.com/supabase/cli/v2/internal/inspect/cache" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" + "github.com/supabase/cli/internal/inspect/bloat" + "github.com/supabase/cli/internal/inspect/blocking" + "github.com/supabase/cli/internal/inspect/cache" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" - "github.com/supabase/cli/v2/internal/inspect" - "github.com/supabase/cli/v2/internal/inspect/calls" - "github.com/supabase/cli/v2/internal/inspect/index_sizes" - "github.com/supabase/cli/v2/internal/inspect/index_usage" - "github.com/supabase/cli/v2/internal/inspect/locks" - "github.com/supabase/cli/v2/internal/inspect/long_running_queries" - "github.com/supabase/cli/v2/internal/inspect/outliers" - "github.com/supabase/cli/v2/internal/inspect/replication_slots" - "github.com/supabase/cli/v2/internal/inspect/role_configs" - "github.com/supabase/cli/v2/internal/inspect/role_connections" - "github.com/supabase/cli/v2/internal/inspect/seq_scans" - "github.com/supabase/cli/v2/internal/inspect/table_index_sizes" - "github.com/supabase/cli/v2/internal/inspect/table_record_counts" - "github.com/supabase/cli/v2/internal/inspect/table_sizes" - "github.com/supabase/cli/v2/internal/inspect/total_index_size" - "github.com/supabase/cli/v2/internal/inspect/total_table_sizes" - "github.com/supabase/cli/v2/internal/inspect/unused_indexes" - "github.com/supabase/cli/v2/internal/inspect/vacuum_stats" + "github.com/supabase/cli/internal/inspect" + "github.com/supabase/cli/internal/inspect/calls" + "github.com/supabase/cli/internal/inspect/index_sizes" + "github.com/supabase/cli/internal/inspect/index_usage" + "github.com/supabase/cli/internal/inspect/locks" + "github.com/supabase/cli/internal/inspect/long_running_queries" + "github.com/supabase/cli/internal/inspect/outliers" + "github.com/supabase/cli/internal/inspect/replication_slots" + "github.com/supabase/cli/internal/inspect/role_configs" + "github.com/supabase/cli/internal/inspect/role_connections" + "github.com/supabase/cli/internal/inspect/seq_scans" + "github.com/supabase/cli/internal/inspect/table_index_sizes" + "github.com/supabase/cli/internal/inspect/table_record_counts" + "github.com/supabase/cli/internal/inspect/table_sizes" + "github.com/supabase/cli/internal/inspect/total_index_size" + "github.com/supabase/cli/internal/inspect/total_table_sizes" + "github.com/supabase/cli/internal/inspect/unused_indexes" + "github.com/supabase/cli/internal/inspect/vacuum_stats" ) var ( diff --git a/cmd/link.go b/cmd/link.go index ee947c060..b1aec1d7a 100644 --- a/cmd/link.go +++ b/cmd/link.go @@ -7,9 +7,9 @@ import ( "github.com/spf13/afero" "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/supabase/cli/v2/internal/link" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" + "github.com/supabase/cli/internal/link" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" "golang.org/x/term" ) diff --git a/cmd/login.go b/cmd/login.go index e186d0d04..ca9aea666 100644 --- a/cmd/login.go +++ b/cmd/login.go @@ -6,8 +6,8 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/login" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/login" + "github.com/supabase/cli/internal/utils" "golang.org/x/term" ) diff --git a/cmd/logout.go b/cmd/logout.go index 52559d204..dda3dd4cc 100644 --- a/cmd/logout.go +++ b/cmd/logout.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/afero" "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/logout" + "github.com/supabase/cli/internal/logout" ) var ( diff --git a/cmd/migration.go b/cmd/migration.go index 1224c6659..30b7716ac 100644 --- a/cmd/migration.go +++ b/cmd/migration.go @@ -8,14 +8,14 @@ import ( "github.com/spf13/afero" "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/supabase/cli/v2/internal/migration/fetch" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/migration/new" - "github.com/supabase/cli/v2/internal/migration/repair" - "github.com/supabase/cli/v2/internal/migration/squash" - "github.com/supabase/cli/v2/internal/migration/up" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" + "github.com/supabase/cli/internal/migration/fetch" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/migration/new" + "github.com/supabase/cli/internal/migration/repair" + "github.com/supabase/cli/internal/migration/squash" + "github.com/supabase/cli/internal/migration/up" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" ) var ( diff --git a/cmd/orgs.go b/cmd/orgs.go index ace1cd960..5d0750dbb 100644 --- a/cmd/orgs.go +++ b/cmd/orgs.go @@ -2,8 +2,8 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/orgs/create" - "github.com/supabase/cli/v2/internal/orgs/list" + "github.com/supabase/cli/internal/orgs/create" + "github.com/supabase/cli/internal/orgs/list" ) var ( diff --git a/cmd/postgres.go b/cmd/postgres.go index c1e84ca72..1c2e0e127 100644 --- a/cmd/postgres.go +++ b/cmd/postgres.go @@ -3,9 +3,9 @@ package cmd import ( "github.com/spf13/afero" "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/postgresConfig/get" - "github.com/supabase/cli/v2/internal/postgresConfig/update" - "github.com/supabase/cli/v2/internal/utils/flags" + "github.com/supabase/cli/internal/postgresConfig/get" + "github.com/supabase/cli/internal/postgresConfig/update" + "github.com/supabase/cli/internal/utils/flags" ) var ( diff --git a/cmd/projects.go b/cmd/projects.go index 4b214c517..c119e7171 100644 --- a/cmd/projects.go +++ b/cmd/projects.go @@ -7,13 +7,13 @@ import ( "github.com/spf13/afero" "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/supabase/cli/v2/internal/projects/apiKeys" - "github.com/supabase/cli/v2/internal/projects/create" - "github.com/supabase/cli/v2/internal/projects/delete" - "github.com/supabase/cli/v2/internal/projects/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/projects/apiKeys" + "github.com/supabase/cli/internal/projects/create" + "github.com/supabase/cli/internal/projects/delete" + "github.com/supabase/cli/internal/projects/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" + "github.com/supabase/cli/pkg/api" "golang.org/x/term" ) diff --git a/cmd/restrictions.go b/cmd/restrictions.go index beb1bbf7d..4358d6132 100644 --- a/cmd/restrictions.go +++ b/cmd/restrictions.go @@ -2,9 +2,9 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/restrictions/get" - "github.com/supabase/cli/v2/internal/restrictions/update" - "github.com/supabase/cli/v2/internal/utils/flags" + "github.com/supabase/cli/internal/restrictions/get" + "github.com/supabase/cli/internal/restrictions/update" + "github.com/supabase/cli/internal/utils/flags" ) var ( diff --git a/cmd/root.go b/cmd/root.go index 8906ef32e..35540a897 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -15,8 +15,8 @@ import ( "github.com/spf13/afero" "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" "golang.org/x/mod/semver" ) diff --git a/cmd/secrets.go b/cmd/secrets.go index f4ee8d09e..df4084e46 100644 --- a/cmd/secrets.go +++ b/cmd/secrets.go @@ -3,10 +3,10 @@ package cmd import ( "github.com/spf13/afero" "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/secrets/list" - "github.com/supabase/cli/v2/internal/secrets/set" - "github.com/supabase/cli/v2/internal/secrets/unset" - "github.com/supabase/cli/v2/internal/utils/flags" + "github.com/supabase/cli/internal/secrets/list" + "github.com/supabase/cli/internal/secrets/set" + "github.com/supabase/cli/internal/secrets/unset" + "github.com/supabase/cli/internal/utils/flags" ) var ( diff --git a/cmd/seed.go b/cmd/seed.go index 7cac7c325..c36b70741 100644 --- a/cmd/seed.go +++ b/cmd/seed.go @@ -6,9 +6,9 @@ import ( "github.com/spf13/afero" "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/seed/buckets" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" + "github.com/supabase/cli/internal/seed/buckets" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" ) var ( diff --git a/cmd/services.go b/cmd/services.go index 2fc80e6b0..fe298cb43 100644 --- a/cmd/services.go +++ b/cmd/services.go @@ -3,7 +3,7 @@ package cmd import ( "github.com/spf13/afero" "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/services" + "github.com/supabase/cli/internal/services" ) var ( diff --git a/cmd/snippets.go b/cmd/snippets.go index 848e9b7d9..f69b232af 100644 --- a/cmd/snippets.go +++ b/cmd/snippets.go @@ -3,9 +3,9 @@ package cmd import ( "github.com/spf13/afero" "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/snippets/download" - "github.com/supabase/cli/v2/internal/snippets/list" - "github.com/supabase/cli/v2/internal/utils/flags" + "github.com/supabase/cli/internal/snippets/download" + "github.com/supabase/cli/internal/snippets/list" + "github.com/supabase/cli/internal/utils/flags" ) var ( diff --git a/cmd/sslEnforcement.go b/cmd/sslEnforcement.go index 3a7351484..7b44d6ddb 100644 --- a/cmd/sslEnforcement.go +++ b/cmd/sslEnforcement.go @@ -4,9 +4,9 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/ssl_enforcement/get" - "github.com/supabase/cli/v2/internal/ssl_enforcement/update" - "github.com/supabase/cli/v2/internal/utils/flags" + "github.com/supabase/cli/internal/ssl_enforcement/get" + "github.com/supabase/cli/internal/ssl_enforcement/update" + "github.com/supabase/cli/internal/utils/flags" ) var ( diff --git a/cmd/sso.go b/cmd/sso.go index 8c7f3109f..a9b4db7d3 100644 --- a/cmd/sso.go +++ b/cmd/sso.go @@ -4,14 +4,14 @@ import ( "github.com/go-errors/errors" "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/sso/create" - "github.com/supabase/cli/v2/internal/sso/get" - "github.com/supabase/cli/v2/internal/sso/info" - "github.com/supabase/cli/v2/internal/sso/list" - "github.com/supabase/cli/v2/internal/sso/remove" - "github.com/supabase/cli/v2/internal/sso/update" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" + "github.com/supabase/cli/internal/sso/create" + "github.com/supabase/cli/internal/sso/get" + "github.com/supabase/cli/internal/sso/info" + "github.com/supabase/cli/internal/sso/list" + "github.com/supabase/cli/internal/sso/remove" + "github.com/supabase/cli/internal/sso/update" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" ) var ( diff --git a/cmd/start.go b/cmd/start.go index bbdf54d0f..a7af80e0c 100644 --- a/cmd/start.go +++ b/cmd/start.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/afero" "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/start" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/start" + "github.com/supabase/cli/internal/utils" ) func validateExcludedContainers(excludedContainers []string) { diff --git a/cmd/status.go b/cmd/status.go index f082a432e..13540bfb1 100644 --- a/cmd/status.go +++ b/cmd/status.go @@ -7,8 +7,8 @@ import ( env "github.com/Netflix/go-env" "github.com/spf13/afero" "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/status" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/status" + "github.com/supabase/cli/internal/utils" ) var ( diff --git a/cmd/stop.go b/cmd/stop.go index 797651107..6a6f4aa55 100644 --- a/cmd/stop.go +++ b/cmd/stop.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/afero" "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/stop" + "github.com/supabase/cli/internal/stop" ) var ( diff --git a/cmd/storage.go b/cmd/storage.go index 8269baac0..3e6eb8fea 100644 --- a/cmd/storage.go +++ b/cmd/storage.go @@ -3,12 +3,12 @@ package cmd import ( "github.com/spf13/afero" "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/storage/client" - "github.com/supabase/cli/v2/internal/storage/cp" - "github.com/supabase/cli/v2/internal/storage/ls" - "github.com/supabase/cli/v2/internal/storage/mv" - "github.com/supabase/cli/v2/internal/storage/rm" - "github.com/supabase/cli/v2/pkg/storage" + "github.com/supabase/cli/internal/storage/client" + "github.com/supabase/cli/internal/storage/cp" + "github.com/supabase/cli/internal/storage/ls" + "github.com/supabase/cli/internal/storage/mv" + "github.com/supabase/cli/internal/storage/rm" + "github.com/supabase/cli/pkg/storage" ) var ( diff --git a/cmd/test.go b/cmd/test.go index 91ac6def8..06fb77730 100644 --- a/cmd/test.go +++ b/cmd/test.go @@ -6,8 +6,8 @@ import ( "github.com/spf13/afero" "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/test/new" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/test/new" + "github.com/supabase/cli/internal/utils" ) var ( diff --git a/cmd/unlink.go b/cmd/unlink.go index 8b0f726f7..e017e75ed 100644 --- a/cmd/unlink.go +++ b/cmd/unlink.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/afero" "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/unlink" + "github.com/supabase/cli/internal/unlink" ) var ( diff --git a/cmd/vanitySubdomains.go b/cmd/vanitySubdomains.go index 47f3de7b7..dd3608c53 100644 --- a/cmd/vanitySubdomains.go +++ b/cmd/vanitySubdomains.go @@ -3,11 +3,11 @@ package cmd import ( "github.com/spf13/afero" "github.com/spf13/cobra" - "github.com/supabase/cli/v2/internal/utils/flags" - "github.com/supabase/cli/v2/internal/vanity_subdomains/activate" - "github.com/supabase/cli/v2/internal/vanity_subdomains/check" - "github.com/supabase/cli/v2/internal/vanity_subdomains/delete" - "github.com/supabase/cli/v2/internal/vanity_subdomains/get" + "github.com/supabase/cli/internal/utils/flags" + "github.com/supabase/cli/internal/vanity_subdomains/activate" + "github.com/supabase/cli/internal/vanity_subdomains/check" + "github.com/supabase/cli/internal/vanity_subdomains/delete" + "github.com/supabase/cli/internal/vanity_subdomains/get" ) var ( diff --git a/docs/main.go b/docs/main.go index c7cacc82b..bfacba311 100644 --- a/docs/main.go +++ b/docs/main.go @@ -11,8 +11,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - cli "github.com/supabase/cli/v2/cmd" - "github.com/supabase/cli/v2/internal/utils" + cli "github.com/supabase/cli/cmd" + "github.com/supabase/cli/internal/utils" "gopkg.in/yaml.v3" ) diff --git a/examples/functions-deploy/main.go b/examples/functions-deploy/main.go index e3f7b0469..716ef1462 100644 --- a/examples/functions-deploy/main.go +++ b/examples/functions-deploy/main.go @@ -8,9 +8,9 @@ import ( "os" "time" - "github.com/supabase/cli/v2/pkg/api" - "github.com/supabase/cli/v2/pkg/config" - "github.com/supabase/cli/v2/pkg/function" + "github.com/supabase/cli/pkg/api" + "github.com/supabase/cli/pkg/config" + "github.com/supabase/cli/pkg/function" ) func main() { diff --git a/examples/migrations-up/main.go b/examples/migrations-up/main.go index 4ff759e95..3ef03242b 100644 --- a/examples/migrations-up/main.go +++ b/examples/migrations-up/main.go @@ -6,8 +6,8 @@ import ( "log" "os" - "github.com/supabase/cli/v2/pkg/migration" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/pkg/migration" + "github.com/supabase/cli/pkg/pgxv5" ) func main() { diff --git a/examples/seed-buckets/main.go b/examples/seed-buckets/main.go index 8cd8f69e1..2c62b1084 100644 --- a/examples/seed-buckets/main.go +++ b/examples/seed-buckets/main.go @@ -8,9 +8,9 @@ import ( "os" "time" - "github.com/supabase/cli/v2/pkg/config" - "github.com/supabase/cli/v2/pkg/fetcher" - "github.com/supabase/cli/v2/pkg/storage" + "github.com/supabase/cli/pkg/config" + "github.com/supabase/cli/pkg/fetcher" + "github.com/supabase/cli/pkg/storage" ) func main() { diff --git a/go.mod b/go.mod index c33559c93..1c55174b8 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/supabase/cli/v2 +module github.com/supabase/cli go 1.23.2 @@ -18,6 +18,7 @@ require ( github.com/docker/go-connections v0.5.0 github.com/docker/go-units v0.5.0 github.com/getsentry/sentry-go v0.30.0 + github.com/gin-gonic/gin v1.10.0 github.com/go-errors/errors v1.5.1 github.com/go-git/go-git/v5 v5.12.0 github.com/go-xmlfmt/xmlfmt v1.1.3 @@ -34,6 +35,7 @@ require ( github.com/jackc/pgtype v1.14.4 github.com/jackc/pgx/v4 v4.18.3 github.com/joho/godotenv v1.5.1 + github.com/matoous/go-nanoid/v2 v2.1.0 github.com/mitchellh/mapstructure v1.5.0 github.com/muesli/reflow v0.3.0 github.com/oapi-codegen/runtime v1.1.1 @@ -93,6 +95,8 @@ require ( github.com/breml/errchkjson v0.4.0 // indirect github.com/butuzov/ireturn v0.3.0 // indirect github.com/butuzov/mirror v1.2.0 // indirect + github.com/bytedance/sonic v1.11.6 // indirect + github.com/bytedance/sonic/loader v0.1.1 // indirect github.com/catenacyber/perfsprint v0.7.1 // indirect github.com/ccojocar/zxcvbn-go v1.0.2 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect @@ -102,6 +106,8 @@ require ( github.com/chavacava/garif v0.1.0 // indirect github.com/ckaznocha/intrange v0.2.1 // indirect github.com/cloudflare/circl v1.3.7 // indirect + github.com/cloudwego/base64x v0.1.4 // indirect + github.com/cloudwego/iasm v0.2.0 // indirect github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect github.com/containerd/log v0.1.0 // indirect github.com/containers/storage v1.56.0 // indirect @@ -127,8 +133,10 @@ require ( github.com/fsnotify/fsnotify v1.8.0 // indirect github.com/fvbommel/sortorder v1.1.0 // indirect github.com/fzipp/gocyclo v0.6.0 // indirect + github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/getkin/kin-openapi v0.124.0 // indirect github.com/ghostiam/protogetter v0.3.8 // indirect + github.com/gin-contrib/sse v0.1.0 // indirect github.com/go-critic/go-critic v0.11.5 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect github.com/go-git/go-billy/v5 v5.5.0 // indirect @@ -136,6 +144,9 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-openapi/jsonpointer v0.21.0 // indirect github.com/go-openapi/swag v0.23.0 // indirect + github.com/go-playground/locales v0.14.1 // indirect + github.com/go-playground/universal-translator v0.18.1 // indirect + github.com/go-playground/validator/v10 v10.20.0 // indirect github.com/go-toolsmith/astcast v1.1.0 // indirect github.com/go-toolsmith/astcopy v1.1.0 // indirect github.com/go-toolsmith/astequal v1.2.0 // indirect @@ -145,6 +156,7 @@ require ( github.com/go-toolsmith/typep v1.1.0 // indirect github.com/go-viper/mapstructure/v2 v2.2.1 // indirect github.com/gobwas/glob v0.2.3 // indirect + github.com/goccy/go-json v0.10.2 // indirect github.com/godbus/dbus/v5 v5.1.0 // indirect github.com/gofrs/flock v0.12.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -184,11 +196,13 @@ require ( github.com/jingyugao/rowserrcheck v1.1.1 // indirect github.com/jjti/go-spancheck v0.6.2 // indirect github.com/josharian/intern v1.0.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect github.com/julz/importas v0.1.0 // indirect github.com/karamaru-alpha/copyloopvar v1.1.0 // indirect github.com/kevinburke/ssh_config v1.2.0 // indirect github.com/kisielk/errcheck v1.8.0 // indirect github.com/kkHAIKE/contextcheck v1.1.5 // indirect + github.com/klauspost/cpuid/v2 v2.2.7 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect github.com/kulti/thelper v0.6.3 // indirect @@ -197,6 +211,7 @@ require ( github.com/lasiar/canonicalheader v1.1.2 // indirect github.com/ldez/gomoddirectives v0.2.4 // indirect github.com/ldez/tagliatelle v0.5.0 // indirect + github.com/leodido/go-urn v1.4.0 // indirect github.com/leonklingele/grouper v1.1.2 // indirect github.com/lib/pq v1.10.9 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect @@ -219,6 +234,8 @@ require ( github.com/moby/docker-image-spec v1.3.1 // indirect github.com/moby/sys/sequential v0.6.0 // indirect github.com/moby/term v0.5.0 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect github.com/moricho/tparallel v0.3.2 // indirect github.com/morikuni/aec v1.0.0 // indirect @@ -281,6 +298,7 @@ require ( github.com/timonwong/loggercheck v0.10.1 // indirect github.com/tomarrell/wrapcheck/v2 v2.9.0 // indirect github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect + github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect github.com/ultraware/funlen v0.1.0 // indirect github.com/ultraware/whitespace v0.1.1 // indirect @@ -313,6 +331,7 @@ require ( go.uber.org/automaxprocs v1.6.0 // indirect go.uber.org/multierr v1.9.0 // indirect go.uber.org/zap v1.24.0 // indirect + golang.org/x/arch v0.8.0 // indirect golang.org/x/crypto v0.29.0 // indirect golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect golang.org/x/exp/typeparams v0.0.0-20241108190413-2d47ceb2692f // indirect diff --git a/go.sum b/go.sum index 29f788f41..9313587d7 100644 --- a/go.sum +++ b/go.sum @@ -147,6 +147,10 @@ github.com/butuzov/ireturn v0.3.0/go.mod h1:A09nIiwiqzN/IoVo9ogpa0Hzi9fex1kd9PSD github.com/butuzov/mirror v1.2.0 h1:9YVK1qIjNspaqWutSv8gsge2e/Xpq1eqEkslEUHy5cs= github.com/butuzov/mirror v1.2.0/go.mod h1:DqZZDtzm42wIAIyHXeN8W/qb1EPlb9Qn/if9icBOpdQ= github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= +github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0= +github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4= +github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM= +github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= github.com/catenacyber/perfsprint v0.7.1 h1:PGW5G/Kxn+YrN04cRAZKC+ZuvlVwolYMrIyyTJ/rMmc= github.com/catenacyber/perfsprint v0.7.1/go.mod h1:/wclWYompEyjUD2FuIIDVKNkqz7IgBIWXIH3V0Zol50= github.com/ccojocar/zxcvbn-go v1.0.2 h1:na/czXU8RrhXO4EZme6eQJLR4PzcGsahsBOAwU6I3Vg= @@ -185,6 +189,10 @@ github.com/cloudflare/cfssl v0.0.0-20180223231731-4e2dcbde5004/go.mod h1:yMWuSON github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU= github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA= +github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y= +github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= +github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg= +github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= @@ -279,12 +287,18 @@ github.com/fvbommel/sortorder v1.1.0 h1:fUmoe+HLsBTctBDoaBwpQo5N+nrCp8g/BjKb/6ZQ github.com/fvbommel/sortorder v1.1.0/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0= github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo= github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA= +github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= +github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= github.com/getkin/kin-openapi v0.124.0 h1:VSFNMB9C9rTKBnQ/fpyDU8ytMTr4dWI9QovSKj9kz/M= github.com/getkin/kin-openapi v0.124.0/go.mod h1:wb1aSZA/iWmorQP9KTAS/phLj/t17B5jT7+fS8ed9NM= github.com/getsentry/sentry-go v0.30.0 h1:lWUwDnY7sKHaVIoZ9wYqRHJ5iEmoc0pqcRqFkosKzBo= github.com/getsentry/sentry-go v0.30.0/go.mod h1:WU9B9/1/sHDqeV8T+3VwwbjeR5MSXs/6aqG3mqZrezA= github.com/ghostiam/protogetter v0.3.8 h1:LYcXbYvybUyTIxN2Mj9h6rHrDZBDwZloPoKctWrFyJY= github.com/ghostiam/protogetter v0.3.8/go.mod h1:WZ0nw9pfzsgxuRsPOFQomgDVSWtDLJRfQJEhsGbmQMA= +github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= +github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU= +github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= github.com/gliderlabs/ssh v0.3.7 h1:iV3Bqi942d9huXnzEF2Mt+CY9gLu8DNM4Obd+8bODRE= github.com/gliderlabs/ssh v0.3.7/go.mod h1:zpHEXBstFnQYtGnB8k8kQLol82umzn/2/snG7alWVD8= github.com/go-critic/go-critic v0.11.5 h1:TkDTOn5v7EEngMxu8KbuFqFR43USaaH8XRJLz1jhVYA= @@ -317,6 +331,14 @@ github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1 github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= +github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBExVwjEviJTixqxL8= +github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI= github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow= github.com/go-sql-driver/mysql v1.3.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= @@ -353,6 +375,8 @@ github.com/go-xmlfmt/xmlfmt v1.1.3 h1:t8Ey3Uy7jDSEisW2K3somuMKIpzktkWptA0iFCnRUW github.com/go-xmlfmt/xmlfmt v1.1.3/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= +github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= +github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E= @@ -578,6 +602,7 @@ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCV github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= @@ -597,6 +622,10 @@ github.com/kisielk/errcheck v1.8.0/go.mod h1:1kLL+jV4e+CFfueBmI1dSK2ADDyQnlrnrY/ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kkHAIKE/contextcheck v1.1.5 h1:CdnJh63tcDe53vG+RebdpdXJTc9atMgGqdx8LXxiilg= github.com/kkHAIKE/contextcheck v1.1.5/go.mod h1:O930cpht4xb1YQpK+1+AgoM3mFsvxr7uyFptcnWTYUA= +github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= +github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -623,6 +652,8 @@ github.com/ldez/gomoddirectives v0.2.4 h1:j3YjBIjEBbqZ0NKtBNzr8rtMHTOrLPeiwTkfUJ github.com/ldez/gomoddirectives v0.2.4/go.mod h1:oWu9i62VcQDYp9EQ0ONTfqLNh+mDLWWDO+SO0qSQw5g= github.com/ldez/tagliatelle v0.5.0 h1:epgfuYt9v0CG3fms0pEgIMNPuFf/LpPIfjk4kyqSioo= github.com/ldez/tagliatelle v0.5.0/go.mod h1:rj1HmWiL1MiKQuOONhd09iySTEkUuE/8+5jtPYz9xa4= +github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= +github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/leonklingele/grouper v1.1.2 h1:o1ARBDLOmmasUaNDesWqWCIFH3u7hoFlM84YrjT3mIY= github.com/leonklingele/grouper v1.1.2/go.mod h1:6D0M/HVkhs2yRKRFZUoGjeDy7EZTfFBE9gl4kjmIGkA= github.com/lib/pq v0.0.0-20150723085316-0dad96c0b94f/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= @@ -645,6 +676,8 @@ github.com/maratori/testableexamples v1.0.0 h1:dU5alXRrD8WKSjOUnmJZuzdxWOEQ57+7s github.com/maratori/testableexamples v1.0.0/go.mod h1:4rhjL1n20TUTT4vdh3RDqSizKLyXp7K2u6HgraZCGzE= github.com/maratori/testpackage v1.1.1 h1:S58XVV5AD7HADMmD0fNnziNHqKvSdDuEKdPD1rNTU04= github.com/maratori/testpackage v1.1.1/go.mod h1:s4gRK/ym6AMrqpOa/kEbQTV4Q4jb7WeLZzVhVVVOQMc= +github.com/matoous/go-nanoid/v2 v2.1.0 h1:P64+dmq21hhWdtvZfEAofnvJULaRR1Yib0+PnU669bE= +github.com/matoous/go-nanoid/v2 v2.1.0/go.mod h1:KlbGNQ+FhrUNIHUxZdL63t7tl4LaPkZNpUULS8H4uVM= github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26 h1:gWg6ZQ4JhDfJPqlo2srm/LN17lpybq15AryXIRcWYLE= github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE= @@ -691,9 +724,11 @@ github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiT github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= @@ -936,6 +971,8 @@ github.com/tomarrell/wrapcheck/v2 v2.9.0 h1:801U2YCAjLhdN8zhZ/7tdjB3EnAoRlJHt/s+ github.com/tomarrell/wrapcheck/v2 v2.9.0/go.mod h1:g9vNIyhb5/9TQgumxQyOEqDHsmGYcGsVMOx/xGkqdMo= github.com/tommy-muehle/go-mnd/v2 v2.5.1 h1:NowYhSdyE/1zwK9QCLeRb6USWdoif80Ie+v+yU8u1Zw= github.com/tommy-muehle/go-mnd/v2 v2.5.1/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw= +github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= +github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= github.com/ultraware/funlen v0.1.0 h1:BuqclbkY6pO+cvxoq7OsktIXZpgBSkYTQtmwhAK81vI= @@ -1037,6 +1074,9 @@ go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= +golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc= +golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -1508,6 +1548,8 @@ mvdan.cc/gofumpt v0.7.0 h1:bg91ttqXmi9y2xawvkuMXyvAA/1ZGJqYAEGjXuP0JXU= mvdan.cc/gofumpt v0.7.0/go.mod h1:txVFJy/Sc/mvaycET54pV8SW8gWxTlUuGHVEcncmNUo= mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f h1:lMpcwN6GxNbWtbpI1+xzFLSW8XzX0u72NttUGVFjO3U= mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f/go.mod h1:RSLa7mKKCNeTTMHBw5Hsy2rfJmd6O2ivt9Dw9ZqCQpQ= +nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/internal/bans/get/get.go b/internal/bans/get/get.go index f6f63c401..a9e52901d 100644 --- a/internal/bans/get/get.go +++ b/internal/bans/get/get.go @@ -6,7 +6,7 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/utils" ) func Run(ctx context.Context, projectRef string, fsys afero.Fs) error { diff --git a/internal/bans/update/update.go b/internal/bans/update/update.go index 496f187ed..dfb31d8cf 100644 --- a/internal/bans/update/update.go +++ b/internal/bans/update/update.go @@ -7,8 +7,8 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func validateIps(ips []string) error { diff --git a/internal/bootstrap/bootstrap.go b/internal/bootstrap/bootstrap.go index aecbdd6e1..677ef1530 100644 --- a/internal/bootstrap/bootstrap.go +++ b/internal/bootstrap/bootstrap.go @@ -19,18 +19,18 @@ import ( "github.com/joho/godotenv" "github.com/spf13/afero" "github.com/spf13/viper" - "github.com/supabase/cli/v2/internal/db/push" - initBlank "github.com/supabase/cli/v2/internal/init" - "github.com/supabase/cli/v2/internal/link" - "github.com/supabase/cli/v2/internal/login" - "github.com/supabase/cli/v2/internal/projects/apiKeys" - "github.com/supabase/cli/v2/internal/projects/create" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" - "github.com/supabase/cli/v2/internal/utils/tenant" - "github.com/supabase/cli/v2/pkg/api" - "github.com/supabase/cli/v2/pkg/fetcher" - "github.com/supabase/cli/v2/pkg/queue" + "github.com/supabase/cli/internal/db/push" + initBlank "github.com/supabase/cli/internal/init" + "github.com/supabase/cli/internal/link" + "github.com/supabase/cli/internal/login" + "github.com/supabase/cli/internal/projects/apiKeys" + "github.com/supabase/cli/internal/projects/create" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" + "github.com/supabase/cli/internal/utils/tenant" + "github.com/supabase/cli/pkg/api" + "github.com/supabase/cli/pkg/fetcher" + "github.com/supabase/cli/pkg/queue" "golang.org/x/term" ) diff --git a/internal/bootstrap/bootstrap_test.go b/internal/bootstrap/bootstrap_test.go index 8dd89d46d..6cf6eb6e4 100644 --- a/internal/bootstrap/bootstrap_test.go +++ b/internal/bootstrap/bootstrap_test.go @@ -10,8 +10,8 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/utils/flags" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/utils/flags" + "github.com/supabase/cli/pkg/api" ) func TestSuggestAppStart(t *testing.T) { diff --git a/internal/branches/create/create.go b/internal/branches/create/create.go index 63dbaad6f..bf2931b68 100644 --- a/internal/branches/create/create.go +++ b/internal/branches/create/create.go @@ -6,10 +6,10 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/gen/keys" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/gen/keys" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" + "github.com/supabase/cli/pkg/api" ) func Run(ctx context.Context, body api.CreateBranchBody, fsys afero.Fs) error { diff --git a/internal/branches/create/create_test.go b/internal/branches/create/create_test.go index d58ed55ad..e07e10387 100644 --- a/internal/branches/create/create_test.go +++ b/internal/branches/create/create_test.go @@ -10,11 +10,11 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" - "github.com/supabase/cli/v2/pkg/api" - "github.com/supabase/cli/v2/pkg/cast" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" + "github.com/supabase/cli/pkg/api" + "github.com/supabase/cli/pkg/cast" ) func TestCreateCommand(t *testing.T) { diff --git a/internal/branches/delete/delete.go b/internal/branches/delete/delete.go index 568fd56c0..b7fdd6671 100644 --- a/internal/branches/delete/delete.go +++ b/internal/branches/delete/delete.go @@ -6,7 +6,7 @@ import ( "net/http" "github.com/go-errors/errors" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/utils" ) func Run(ctx context.Context, branchId string) error { diff --git a/internal/branches/disable/disable.go b/internal/branches/disable/disable.go index b7d54f293..d94c1e6c5 100644 --- a/internal/branches/disable/disable.go +++ b/internal/branches/disable/disable.go @@ -7,8 +7,8 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" ) func Run(ctx context.Context, fsys afero.Fs) error { diff --git a/internal/branches/get/get.go b/internal/branches/get/get.go index 19f04a58e..ee5bc332c 100644 --- a/internal/branches/get/get.go +++ b/internal/branches/get/get.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/go-errors/errors" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" ) func Run(ctx context.Context, branchId string) error { diff --git a/internal/branches/list/list.go b/internal/branches/list/list.go index d40b3824a..7a153138f 100644 --- a/internal/branches/list/list.go +++ b/internal/branches/list/list.go @@ -7,9 +7,9 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" ) func Run(ctx context.Context, fsys afero.Fs) error { diff --git a/internal/branches/update/update.go b/internal/branches/update/update.go index 2ddb03f19..6c0f5fc4a 100644 --- a/internal/branches/update/update.go +++ b/internal/branches/update/update.go @@ -6,8 +6,8 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func Run(ctx context.Context, branchId string, body api.UpdateBranchBody, fsys afero.Fs) error { diff --git a/internal/config/push/push.go b/internal/config/push/push.go index 5ddc9070c..a4c901473 100644 --- a/internal/config/push/push.go +++ b/internal/config/push/push.go @@ -6,8 +6,8 @@ import ( "os" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/config" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/config" ) func Run(ctx context.Context, ref string, fsys afero.Fs) error { diff --git a/internal/db/branch/create/create.go b/internal/db/branch/create/create.go index 66635bad1..085e10f9d 100644 --- a/internal/db/branch/create/create.go +++ b/internal/db/branch/create/create.go @@ -13,7 +13,7 @@ import ( "github.com/docker/docker/pkg/stdcopy" "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/utils" ) var ( diff --git a/internal/db/branch/create/create_test.go b/internal/db/branch/create/create_test.go index 20bfd4ac3..8e3842345 100644 --- a/internal/db/branch/create/create_test.go +++ b/internal/db/branch/create/create_test.go @@ -10,8 +10,8 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" ) func TestBranchValidation(t *testing.T) { diff --git a/internal/db/branch/delete/delete.go b/internal/db/branch/delete/delete.go index 9655cd793..f59f5e51c 100644 --- a/internal/db/branch/delete/delete.go +++ b/internal/db/branch/delete/delete.go @@ -11,7 +11,7 @@ import ( "github.com/docker/docker/pkg/stdcopy" "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/utils" ) func Run(branch string, fsys afero.Fs) error { diff --git a/internal/db/branch/delete/delete_test.go b/internal/db/branch/delete/delete_test.go index 709a3a520..76957e246 100644 --- a/internal/db/branch/delete/delete_test.go +++ b/internal/db/branch/delete/delete_test.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" ) func TestBranchDir(t *testing.T) { diff --git a/internal/db/branch/list/list.go b/internal/db/branch/list/list.go index f88104229..b1037ac1b 100644 --- a/internal/db/branch/list/list.go +++ b/internal/db/branch/list/list.go @@ -8,7 +8,7 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/utils" ) func Run(fsys afero.Fs, out io.Writer) error { diff --git a/internal/db/branch/list/list_test.go b/internal/db/branch/list/list_test.go index fa16586a5..24e34d5e5 100644 --- a/internal/db/branch/list/list_test.go +++ b/internal/db/branch/list/list_test.go @@ -10,7 +10,7 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/utils" ) func TestListCommand(t *testing.T) { diff --git a/internal/db/branch/switch_/switch_.go b/internal/db/branch/switch_/switch_.go index b1255ea63..462b26c69 100644 --- a/internal/db/branch/switch_/switch_.go +++ b/internal/db/branch/switch_/switch_.go @@ -10,8 +10,8 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/utils" ) func Run(ctx context.Context, target string, fsys afero.Fs, options ...func(*pgx.ConnConfig)) error { diff --git a/internal/db/branch/switch_/switch__test.go b/internal/db/branch/switch_/switch__test.go index 8f22f3214..7c70959ce 100644 --- a/internal/db/branch/switch_/switch__test.go +++ b/internal/db/branch/switch_/switch__test.go @@ -13,10 +13,10 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgtest" ) func TestSwitchCommand(t *testing.T) { diff --git a/internal/db/diff/diff.go b/internal/db/diff/diff.go index 05da60459..6c5faa892 100644 --- a/internal/db/diff/diff.go +++ b/internal/db/diff/diff.go @@ -21,11 +21,11 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/db/start" - "github.com/supabase/cli/v2/internal/gen/keys" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/migration" - "github.com/supabase/cli/v2/pkg/parser" + "github.com/supabase/cli/internal/db/start" + "github.com/supabase/cli/internal/gen/keys" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/migration" + "github.com/supabase/cli/pkg/parser" ) type DiffFunc func(context.Context, string, string, []string) (string, error) diff --git a/internal/db/diff/diff_test.go b/internal/db/diff/diff_test.go index 3db4d954a..6ada103c7 100644 --- a/internal/db/diff/diff_test.go +++ b/internal/db/diff/diff_test.go @@ -17,14 +17,14 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/db/start" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/testing/fstest" - "github.com/supabase/cli/v2/internal/testing/helper" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/config" - "github.com/supabase/cli/v2/pkg/migration" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/db/start" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/testing/fstest" + "github.com/supabase/cli/internal/testing/helper" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/config" + "github.com/supabase/cli/pkg/migration" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/db/diff/migra.go b/internal/db/diff/migra.go index 47f8ba1bf..4e7842693 100644 --- a/internal/db/diff/migra.go +++ b/internal/db/diff/migra.go @@ -9,8 +9,8 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" "github.com/go-errors/errors" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/config" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/config" ) //go:embed templates/migra.sh diff --git a/internal/db/diff/pgadmin.go b/internal/db/diff/pgadmin.go index baa984849..298023580 100644 --- a/internal/db/diff/pgadmin.go +++ b/internal/db/diff/pgadmin.go @@ -8,10 +8,10 @@ import ( "github.com/jackc/pgconn" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/db/start" - "github.com/supabase/cli/v2/internal/migration/new" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/config" + "github.com/supabase/cli/internal/db/start" + "github.com/supabase/cli/internal/migration/new" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/config" ) var warnDiff = `WARNING: The diff tool is not foolproof, so you may need to manually rearrange and modify the generated migration. diff --git a/internal/db/dump/dump.go b/internal/db/dump/dump.go index bef685fe9..94e2ba7af 100644 --- a/internal/db/dump/dump.go +++ b/internal/db/dump/dump.go @@ -13,8 +13,8 @@ import ( "github.com/go-errors/errors" "github.com/jackc/pgconn" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" - cliConfig "github.com/supabase/cli/v2/pkg/config" + "github.com/supabase/cli/internal/utils" + cliConfig "github.com/supabase/cli/pkg/config" ) var ( diff --git a/internal/db/dump/dump_test.go b/internal/db/dump/dump_test.go index 62c1240a3..3a7c3cc65 100644 --- a/internal/db/dump/dump_test.go +++ b/internal/db/dump/dump_test.go @@ -10,8 +10,8 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" ) var dbConfig = pgconn.Config{ diff --git a/internal/db/lint/lint.go b/internal/db/lint/lint.go index 5fe21d182..5701d89be 100644 --- a/internal/db/lint/lint.go +++ b/internal/db/lint/lint.go @@ -13,8 +13,8 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/migration" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/migration" ) const ENABLE_PGSQL_CHECK = "CREATE EXTENSION IF NOT EXISTS plpgsql_check" diff --git a/internal/db/lint/lint_test.go b/internal/db/lint/lint_test.go index 807540a44..8d7abef8f 100644 --- a/internal/db/lint/lint_test.go +++ b/internal/db/lint/lint_test.go @@ -14,9 +14,9 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/db/pull/pull.go b/internal/db/pull/pull.go index ad5e07103..f6a235e11 100644 --- a/internal/db/pull/pull.go +++ b/internal/db/pull/pull.go @@ -12,13 +12,13 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/db/diff" - "github.com/supabase/cli/v2/internal/db/dump" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/migration/new" - "github.com/supabase/cli/v2/internal/migration/repair" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/migration" + "github.com/supabase/cli/internal/db/diff" + "github.com/supabase/cli/internal/db/dump" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/migration/new" + "github.com/supabase/cli/internal/migration/repair" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/migration" ) var ( diff --git a/internal/db/pull/pull_test.go b/internal/db/pull/pull_test.go index f6248fe9d..2e55fcfed 100644 --- a/internal/db/pull/pull_test.go +++ b/internal/db/pull/pull_test.go @@ -13,11 +13,11 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/testing/fstest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/migration" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/testing/fstest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/migration" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/db/push/push.go b/internal/db/push/push.go index 29555b5be..2141255ae 100644 --- a/internal/db/push/push.go +++ b/internal/db/push/push.go @@ -10,10 +10,10 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/migration/up" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" - "github.com/supabase/cli/v2/pkg/migration" + "github.com/supabase/cli/internal/migration/up" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" + "github.com/supabase/cli/pkg/migration" ) func Run(ctx context.Context, dryRun, ignoreVersionMismatch bool, includeRoles, includeSeed bool, config pgconn.Config, fsys afero.Fs, options ...func(*pgx.ConnConfig)) error { diff --git a/internal/db/push/push_test.go b/internal/db/push/push_test.go index dad8f2e49..3a3ff3cda 100644 --- a/internal/db/push/push_test.go +++ b/internal/db/push/push_test.go @@ -13,11 +13,11 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/fstest" - "github.com/supabase/cli/v2/internal/testing/helper" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/migration" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/testing/fstest" + "github.com/supabase/cli/internal/testing/helper" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/migration" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/db/remote/changes/changes.go b/internal/db/remote/changes/changes.go index c711470c8..c735b5984 100644 --- a/internal/db/remote/changes/changes.go +++ b/internal/db/remote/changes/changes.go @@ -6,9 +6,9 @@ import ( "github.com/jackc/pgconn" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/db/diff" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/migration" + "github.com/supabase/cli/internal/db/diff" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/migration" ) var output string diff --git a/internal/db/remote/commit/commit.go b/internal/db/remote/commit/commit.go index 75b9232d8..f9062d492 100644 --- a/internal/db/remote/commit/commit.go +++ b/internal/db/remote/commit/commit.go @@ -10,12 +10,12 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/db/diff" - "github.com/supabase/cli/v2/internal/db/dump" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/migration/repair" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/migration" + "github.com/supabase/cli/internal/db/diff" + "github.com/supabase/cli/internal/db/dump" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/migration/repair" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/migration" ) func Run(ctx context.Context, schema []string, config pgconn.Config, fsys afero.Fs) error { diff --git a/internal/db/reset/reset.go b/internal/db/reset/reset.go index 81b8e1457..3830a019d 100644 --- a/internal/db/reset/reset.go +++ b/internal/db/reset/reset.go @@ -20,15 +20,15 @@ import ( "github.com/jackc/pgerrcode" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/db/start" - "github.com/supabase/cli/v2/internal/gen/keys" - "github.com/supabase/cli/v2/internal/migration/apply" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/migration/repair" - "github.com/supabase/cli/v2/internal/seed/buckets" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" - "github.com/supabase/cli/v2/pkg/migration" + "github.com/supabase/cli/internal/db/start" + "github.com/supabase/cli/internal/gen/keys" + "github.com/supabase/cli/internal/migration/apply" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/migration/repair" + "github.com/supabase/cli/internal/seed/buckets" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" + "github.com/supabase/cli/pkg/migration" ) func Run(ctx context.Context, version string, config pgconn.Config, fsys afero.Fs, options ...func(*pgx.ConnConfig)) error { diff --git a/internal/db/reset/reset_test.go b/internal/db/reset/reset_test.go index 3693ac8b5..4e3558be3 100644 --- a/internal/db/reset/reset_test.go +++ b/internal/db/reset/reset_test.go @@ -16,14 +16,14 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/db/start" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/testing/fstest" - "github.com/supabase/cli/v2/internal/testing/helper" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/migration" - "github.com/supabase/cli/v2/pkg/pgtest" - "github.com/supabase/cli/v2/pkg/storage" + "github.com/supabase/cli/internal/db/start" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/testing/fstest" + "github.com/supabase/cli/internal/testing/helper" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/migration" + "github.com/supabase/cli/pkg/pgtest" + "github.com/supabase/cli/pkg/storage" ) func TestResetCommand(t *testing.T) { diff --git a/internal/db/start/start.go b/internal/db/start/start.go index f286b1fcb..c4722f22f 100644 --- a/internal/db/start/start.go +++ b/internal/db/start/start.go @@ -19,10 +19,10 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/migration/apply" - "github.com/supabase/cli/v2/internal/status" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/migration" + "github.com/supabase/cli/internal/migration/apply" + "github.com/supabase/cli/internal/status" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/migration" ) var ( diff --git a/internal/db/start/start_test.go b/internal/db/start/start_test.go index e52ecbbbd..475562f2f 100644 --- a/internal/db/start/start_test.go +++ b/internal/db/start/start_test.go @@ -14,11 +14,11 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/testing/fstest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/cast" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/testing/fstest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/cast" + "github.com/supabase/cli/pkg/pgtest" ) func TestInitBranch(t *testing.T) { diff --git a/internal/db/test/test.go b/internal/db/test/test.go index 4374e7c98..263305736 100644 --- a/internal/db/test/test.go +++ b/internal/db/test/test.go @@ -15,8 +15,8 @@ import ( "github.com/jackc/pgx/v4" "github.com/spf13/afero" "github.com/spf13/viper" - "github.com/supabase/cli/v2/internal/utils" - cliConfig "github.com/supabase/cli/v2/pkg/config" + "github.com/supabase/cli/internal/utils" + cliConfig "github.com/supabase/cli/pkg/config" ) const ( diff --git a/internal/db/test/test_test.go b/internal/db/test/test_test.go index 30f781fdf..7c9310991 100644 --- a/internal/db/test/test_test.go +++ b/internal/db/test/test_test.go @@ -11,10 +11,10 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/config" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/config" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/debug/postgres_test.go b/internal/debug/postgres_test.go index 4d836ce7d..9f46fd6b8 100644 --- a/internal/debug/postgres_test.go +++ b/internal/debug/postgres_test.go @@ -7,7 +7,7 @@ import ( "github.com/jackc/pgx/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/pkg/pgtest" ) func TestPostgresProxy(t *testing.T) { diff --git a/internal/encryption/get/get.go b/internal/encryption/get/get.go index 22b827860..93c698635 100644 --- a/internal/encryption/get/get.go +++ b/internal/encryption/get/get.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/go-errors/errors" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/utils" ) func Run(ctx context.Context, projectRef string) error { diff --git a/internal/encryption/get/get_test.go b/internal/encryption/get/get_test.go index a3656dc0b..8f280189b 100644 --- a/internal/encryption/get/get_test.go +++ b/internal/encryption/get/get_test.go @@ -7,9 +7,9 @@ import ( "github.com/h2non/gock" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func TestGetRootKey(t *testing.T) { diff --git a/internal/encryption/update/update.go b/internal/encryption/update/update.go index 172c6429e..ed576823f 100644 --- a/internal/encryption/update/update.go +++ b/internal/encryption/update/update.go @@ -7,9 +7,9 @@ import ( "strings" "github.com/go-errors/errors" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/credentials" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/credentials" + "github.com/supabase/cli/pkg/api" ) func Run(ctx context.Context, projectRef string, stdin *os.File) error { diff --git a/internal/encryption/update/update_test.go b/internal/encryption/update/update_test.go index 5e8bf3434..8a6f60930 100644 --- a/internal/encryption/update/update_test.go +++ b/internal/encryption/update/update_test.go @@ -9,9 +9,9 @@ import ( "github.com/h2non/gock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func TestUpdateRootKey(t *testing.T) { diff --git a/internal/functions/delete/delete.go b/internal/functions/delete/delete.go index 0242d5a7a..47d5957ef 100644 --- a/internal/functions/delete/delete.go +++ b/internal/functions/delete/delete.go @@ -7,7 +7,7 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/utils" ) func Run(ctx context.Context, slug string, projectRef string, fsys afero.Fs) error { diff --git a/internal/functions/delete/delete_test.go b/internal/functions/delete/delete_test.go index ac39d5ce2..110208ea9 100644 --- a/internal/functions/delete/delete_test.go +++ b/internal/functions/delete/delete_test.go @@ -9,8 +9,8 @@ import ( "github.com/h2non/gock" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" ) func TestDeleteCommand(t *testing.T) { diff --git a/internal/functions/deploy/bundle.go b/internal/functions/deploy/bundle.go index 4a75e82e4..0119a559c 100644 --- a/internal/functions/deploy/bundle.go +++ b/internal/functions/deploy/bundle.go @@ -13,8 +13,8 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" "github.com/spf13/viper" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/function" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/function" ) type dockerBundler struct { diff --git a/internal/functions/deploy/bundle_test.go b/internal/functions/deploy/bundle_test.go index bb286cc21..f8a68f439 100644 --- a/internal/functions/deploy/bundle_test.go +++ b/internal/functions/deploy/bundle_test.go @@ -11,8 +11,8 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" ) func TestDockerBundle(t *testing.T) { diff --git a/internal/functions/deploy/deploy.go b/internal/functions/deploy/deploy.go index 2c97931c8..529b78976 100644 --- a/internal/functions/deploy/deploy.go +++ b/internal/functions/deploy/deploy.go @@ -9,11 +9,11 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" - "github.com/supabase/cli/v2/pkg/cast" - "github.com/supabase/cli/v2/pkg/config" - "github.com/supabase/cli/v2/pkg/function" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" + "github.com/supabase/cli/pkg/cast" + "github.com/supabase/cli/pkg/config" + "github.com/supabase/cli/pkg/function" ) func Run(ctx context.Context, slugs []string, projectRef string, noVerifyJWT *bool, importMapPath string, fsys afero.Fs) error { diff --git a/internal/functions/deploy/deploy_test.go b/internal/functions/deploy/deploy_test.go index 542094f1a..558a33f32 100644 --- a/internal/functions/deploy/deploy_test.go +++ b/internal/functions/deploy/deploy_test.go @@ -12,11 +12,11 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" - "github.com/supabase/cli/v2/pkg/cast" - "github.com/supabase/cli/v2/pkg/config" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" + "github.com/supabase/cli/pkg/cast" + "github.com/supabase/cli/pkg/config" ) func TestDeployCommand(t *testing.T) { diff --git a/internal/functions/download/download.go b/internal/functions/download/download.go index 169df9d8b..e3b68cae9 100644 --- a/internal/functions/download/download.go +++ b/internal/functions/download/download.go @@ -15,8 +15,8 @@ import ( "github.com/docker/docker/api/types/network" "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) var ( diff --git a/internal/functions/download/download_test.go b/internal/functions/download/download_test.go index 73c8afd80..b727f95c3 100644 --- a/internal/functions/download/download_test.go +++ b/internal/functions/download/download_test.go @@ -13,9 +13,9 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func TestMain(m *testing.M) { diff --git a/internal/functions/list/list.go b/internal/functions/list/list.go index 603de90aa..d0d2d9ecc 100644 --- a/internal/functions/list/list.go +++ b/internal/functions/list/list.go @@ -7,8 +7,8 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" ) func Run(ctx context.Context, projectRef string, fsys afero.Fs) error { diff --git a/internal/functions/list/list_test.go b/internal/functions/list/list_test.go index 8f9d26174..e9c7f26b7 100644 --- a/internal/functions/list/list_test.go +++ b/internal/functions/list/list_test.go @@ -8,9 +8,9 @@ import ( "github.com/h2non/gock" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func TestFunctionsListCommand(t *testing.T) { diff --git a/internal/functions/new/new.go b/internal/functions/new/new.go index d876a9916..3656e9b5f 100644 --- a/internal/functions/new/new.go +++ b/internal/functions/new/new.go @@ -10,7 +10,7 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/utils" ) var ( diff --git a/internal/functions/new/new_test.go b/internal/functions/new/new_test.go index fbb5f5e2d..d5e9c2fc8 100644 --- a/internal/functions/new/new_test.go +++ b/internal/functions/new/new_test.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/utils" ) func TestNewCommand(t *testing.T) { diff --git a/internal/functions/serve/serve.go b/internal/functions/serve/serve.go index 1d9b28258..62811d769 100644 --- a/internal/functions/serve/serve.go +++ b/internal/functions/serve/serve.go @@ -16,9 +16,9 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" "github.com/spf13/viper" - "github.com/supabase/cli/v2/internal/functions/deploy" - "github.com/supabase/cli/v2/internal/secrets/set" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/functions/deploy" + "github.com/supabase/cli/internal/secrets/set" + "github.com/supabase/cli/internal/utils" ) type InspectMode string diff --git a/internal/functions/serve/serve_test.go b/internal/functions/serve/serve_test.go index dbc14852a..570c4b927 100644 --- a/internal/functions/serve/serve_test.go +++ b/internal/functions/serve/serve_test.go @@ -12,9 +12,9 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/cast" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/cast" ) func TestServeCommand(t *testing.T) { diff --git a/internal/gen/keys/keys.go b/internal/gen/keys/keys.go index a1079e627..81ed52988 100644 --- a/internal/gen/keys/keys.go +++ b/internal/gen/keys/keys.go @@ -11,8 +11,8 @@ import ( "github.com/go-errors/errors" "github.com/go-git/go-git/v5" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/config" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/config" ) type CustomName struct { diff --git a/internal/gen/types/types.go b/internal/gen/types/types.go index 1e158dd10..b399cfb5c 100644 --- a/internal/gen/types/types.go +++ b/internal/gen/types/types.go @@ -12,8 +12,8 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) const ( diff --git a/internal/gen/types/types_test.go b/internal/gen/types/types_test.go index 07ed9e02f..811ae061d 100644 --- a/internal/gen/types/types_test.go +++ b/internal/gen/types/types_test.go @@ -12,10 +12,10 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" + "github.com/supabase/cli/pkg/pgtest" ) func TestGenLocalCommand(t *testing.T) { diff --git a/internal/hostnames/activate/activate.go b/internal/hostnames/activate/activate.go index 1b951085e..3cc01c206 100644 --- a/internal/hostnames/activate/activate.go +++ b/internal/hostnames/activate/activate.go @@ -6,8 +6,8 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/hostnames" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/hostnames" + "github.com/supabase/cli/internal/utils" ) func Run(ctx context.Context, projectRef string, includeRawOutput bool, fsys afero.Fs) error { diff --git a/internal/hostnames/common.go b/internal/hostnames/common.go index b1f55e241..c01e6a0da 100644 --- a/internal/hostnames/common.go +++ b/internal/hostnames/common.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/go-errors/errors" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func GetCustomHostnameConfig(ctx context.Context, projectRef string) (*api.V1GetHostnameConfigResponse, error) { diff --git a/internal/hostnames/create/create.go b/internal/hostnames/create/create.go index 4f3e7c3e0..563b524bc 100644 --- a/internal/hostnames/create/create.go +++ b/internal/hostnames/create/create.go @@ -7,9 +7,9 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/hostnames" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/hostnames" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func Run(ctx context.Context, projectRef string, customHostname string, includeRawOutput bool, fsys afero.Fs) error { diff --git a/internal/hostnames/delete/delete.go b/internal/hostnames/delete/delete.go index 6e472bc6c..3b9f3653c 100644 --- a/internal/hostnames/delete/delete.go +++ b/internal/hostnames/delete/delete.go @@ -6,7 +6,7 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/utils" ) func Run(ctx context.Context, projectRef string, fsys afero.Fs) error { diff --git a/internal/hostnames/get/get.go b/internal/hostnames/get/get.go index def0af734..9e17c19f2 100644 --- a/internal/hostnames/get/get.go +++ b/internal/hostnames/get/get.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/hostnames" + "github.com/supabase/cli/internal/hostnames" ) func Run(ctx context.Context, projectRef string, includeRawOutput bool, fsys afero.Fs) error { diff --git a/internal/hostnames/reverify/reverify.go b/internal/hostnames/reverify/reverify.go index c7abe8217..7f4329903 100644 --- a/internal/hostnames/reverify/reverify.go +++ b/internal/hostnames/reverify/reverify.go @@ -6,8 +6,8 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/hostnames" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/hostnames" + "github.com/supabase/cli/internal/utils" ) func Run(ctx context.Context, projectRef string, includeRawOutput bool, fsys afero.Fs) error { diff --git a/internal/init/init.go b/internal/init/init.go index ed99ecb9c..f4e470b02 100644 --- a/internal/init/init.go +++ b/internal/init/init.go @@ -11,7 +11,7 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/utils" ) var ( diff --git a/internal/init/init_test.go b/internal/init/init_test.go index b47c2f0f4..99a96dce5 100644 --- a/internal/init/init_test.go +++ b/internal/init/init_test.go @@ -9,9 +9,9 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/fstest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/cast" + "github.com/supabase/cli/internal/testing/fstest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/cast" ) func TestInitCommand(t *testing.T) { diff --git a/internal/inspect/bloat/bloat.go b/internal/inspect/bloat/bloat.go index ed680d005..6a97e41c8 100644 --- a/internal/inspect/bloat/bloat.go +++ b/internal/inspect/bloat/bloat.go @@ -9,10 +9,10 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgxv5" ) //go:embed bloat.sql diff --git a/internal/inspect/bloat/bloat_test.go b/internal/inspect/bloat/bloat_test.go index e5b75d799..8646565ce 100644 --- a/internal/inspect/bloat/bloat_test.go +++ b/internal/inspect/bloat/bloat_test.go @@ -7,9 +7,9 @@ import ( "github.com/jackc/pgconn" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/inspect/blocking/blocking.go b/internal/inspect/blocking/blocking.go index 9aa6baba2..37baed1f9 100644 --- a/internal/inspect/blocking/blocking.go +++ b/internal/inspect/blocking/blocking.go @@ -10,9 +10,9 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgxv5" ) //go:embed blocking.sql diff --git a/internal/inspect/blocking/blocking_test.go b/internal/inspect/blocking/blocking_test.go index 15bd69712..46b63441f 100644 --- a/internal/inspect/blocking/blocking_test.go +++ b/internal/inspect/blocking/blocking_test.go @@ -7,7 +7,7 @@ import ( "github.com/jackc/pgconn" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/inspect/cache/cache.go b/internal/inspect/cache/cache.go index c36339a66..ce30c1f4a 100644 --- a/internal/inspect/cache/cache.go +++ b/internal/inspect/cache/cache.go @@ -9,9 +9,9 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgxv5" ) //go:embed cache.sql diff --git a/internal/inspect/cache/cache_test.go b/internal/inspect/cache/cache_test.go index cc332c857..28fa1cb73 100644 --- a/internal/inspect/cache/cache_test.go +++ b/internal/inspect/cache/cache_test.go @@ -7,7 +7,7 @@ import ( "github.com/jackc/pgconn" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/inspect/calls/calls.go b/internal/inspect/calls/calls.go index a1fe4d9e2..2fd0c8df8 100644 --- a/internal/inspect/calls/calls.go +++ b/internal/inspect/calls/calls.go @@ -10,9 +10,9 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgxv5" ) //go:embed calls.sql diff --git a/internal/inspect/calls/calls_test.go b/internal/inspect/calls/calls_test.go index 3d5a8408b..ded271009 100644 --- a/internal/inspect/calls/calls_test.go +++ b/internal/inspect/calls/calls_test.go @@ -7,7 +7,7 @@ import ( "github.com/jackc/pgconn" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/inspect/index_sizes/index_sizes.go b/internal/inspect/index_sizes/index_sizes.go index 56467f381..2cfc06e8d 100644 --- a/internal/inspect/index_sizes/index_sizes.go +++ b/internal/inspect/index_sizes/index_sizes.go @@ -9,10 +9,10 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgxv5" ) //go:embed index_sizes.sql diff --git a/internal/inspect/index_sizes/index_sizes_test.go b/internal/inspect/index_sizes/index_sizes_test.go index fe3cf71ed..9071c5710 100644 --- a/internal/inspect/index_sizes/index_sizes_test.go +++ b/internal/inspect/index_sizes/index_sizes_test.go @@ -7,9 +7,9 @@ import ( "github.com/jackc/pgconn" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/inspect/index_usage/index_usage.go b/internal/inspect/index_usage/index_usage.go index 76019e5cf..cd8875f79 100644 --- a/internal/inspect/index_usage/index_usage.go +++ b/internal/inspect/index_usage/index_usage.go @@ -9,10 +9,10 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgxv5" ) //go:embed index_usage.sql diff --git a/internal/inspect/index_usage/index_usage_test.go b/internal/inspect/index_usage/index_usage_test.go index be965bf39..5b735bb60 100644 --- a/internal/inspect/index_usage/index_usage_test.go +++ b/internal/inspect/index_usage/index_usage_test.go @@ -7,9 +7,9 @@ import ( "github.com/jackc/pgconn" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/inspect/locks/locks.go b/internal/inspect/locks/locks.go index 57aa8ed67..0b2db71c6 100644 --- a/internal/inspect/locks/locks.go +++ b/internal/inspect/locks/locks.go @@ -10,9 +10,9 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgxv5" ) //go:embed locks.sql diff --git a/internal/inspect/locks/locks_test.go b/internal/inspect/locks/locks_test.go index 398c9dce9..e4c55c6bd 100644 --- a/internal/inspect/locks/locks_test.go +++ b/internal/inspect/locks/locks_test.go @@ -7,7 +7,7 @@ import ( "github.com/jackc/pgconn" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/inspect/long_running_queries/long_running_queries.go b/internal/inspect/long_running_queries/long_running_queries.go index 31b0095a0..acf4be456 100644 --- a/internal/inspect/long_running_queries/long_running_queries.go +++ b/internal/inspect/long_running_queries/long_running_queries.go @@ -9,9 +9,9 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgxv5" ) //go:embed long_running_queries.sql diff --git a/internal/inspect/long_running_queries/long_running_queries_test.go b/internal/inspect/long_running_queries/long_running_queries_test.go index afb2e249f..d936c61a3 100644 --- a/internal/inspect/long_running_queries/long_running_queries_test.go +++ b/internal/inspect/long_running_queries/long_running_queries_test.go @@ -7,7 +7,7 @@ import ( "github.com/jackc/pgconn" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/inspect/outliers/outliers.go b/internal/inspect/outliers/outliers.go index 2e5c849d8..06f015c18 100644 --- a/internal/inspect/outliers/outliers.go +++ b/internal/inspect/outliers/outliers.go @@ -10,9 +10,9 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgxv5" ) //go:embed outliers.sql diff --git a/internal/inspect/outliers/outliers_test.go b/internal/inspect/outliers/outliers_test.go index f6f83cf34..e5d46432a 100644 --- a/internal/inspect/outliers/outliers_test.go +++ b/internal/inspect/outliers/outliers_test.go @@ -7,7 +7,7 @@ import ( "github.com/jackc/pgconn" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/inspect/replication_slots/replication_slots.go b/internal/inspect/replication_slots/replication_slots.go index e0ef52ee2..927ad052a 100644 --- a/internal/inspect/replication_slots/replication_slots.go +++ b/internal/inspect/replication_slots/replication_slots.go @@ -9,9 +9,9 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgxv5" ) //go:embed replication_slots.sql diff --git a/internal/inspect/replication_slots/replication_slots_test.go b/internal/inspect/replication_slots/replication_slots_test.go index a7891b4c8..d9e9b3225 100644 --- a/internal/inspect/replication_slots/replication_slots_test.go +++ b/internal/inspect/replication_slots/replication_slots_test.go @@ -7,7 +7,7 @@ import ( "github.com/jackc/pgconn" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/inspect/report.go b/internal/inspect/report.go index 718ea5344..de721d954 100644 --- a/internal/inspect/report.go +++ b/internal/inspect/report.go @@ -14,8 +14,8 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/utils" ) //go:embed **/*.sql diff --git a/internal/inspect/report_test.go b/internal/inspect/report_test.go index 898734c69..6b4220451 100644 --- a/internal/inspect/report_test.go +++ b/internal/inspect/report_test.go @@ -8,27 +8,27 @@ import ( "github.com/jackc/pgconn" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/inspect/bloat" - "github.com/supabase/cli/v2/internal/inspect/blocking" - "github.com/supabase/cli/v2/internal/inspect/cache" - "github.com/supabase/cli/v2/internal/inspect/calls" - "github.com/supabase/cli/v2/internal/inspect/index_sizes" - "github.com/supabase/cli/v2/internal/inspect/index_usage" - "github.com/supabase/cli/v2/internal/inspect/locks" - "github.com/supabase/cli/v2/internal/inspect/long_running_queries" - "github.com/supabase/cli/v2/internal/inspect/outliers" - "github.com/supabase/cli/v2/internal/inspect/replication_slots" - "github.com/supabase/cli/v2/internal/inspect/role_configs" - "github.com/supabase/cli/v2/internal/inspect/role_connections" - "github.com/supabase/cli/v2/internal/inspect/seq_scans" - "github.com/supabase/cli/v2/internal/inspect/table_index_sizes" - "github.com/supabase/cli/v2/internal/inspect/table_record_counts" - "github.com/supabase/cli/v2/internal/inspect/table_sizes" - "github.com/supabase/cli/v2/internal/inspect/total_index_size" - "github.com/supabase/cli/v2/internal/inspect/total_table_sizes" - "github.com/supabase/cli/v2/internal/inspect/unused_indexes" - "github.com/supabase/cli/v2/internal/inspect/vacuum_stats" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/inspect/bloat" + "github.com/supabase/cli/internal/inspect/blocking" + "github.com/supabase/cli/internal/inspect/cache" + "github.com/supabase/cli/internal/inspect/calls" + "github.com/supabase/cli/internal/inspect/index_sizes" + "github.com/supabase/cli/internal/inspect/index_usage" + "github.com/supabase/cli/internal/inspect/locks" + "github.com/supabase/cli/internal/inspect/long_running_queries" + "github.com/supabase/cli/internal/inspect/outliers" + "github.com/supabase/cli/internal/inspect/replication_slots" + "github.com/supabase/cli/internal/inspect/role_configs" + "github.com/supabase/cli/internal/inspect/role_connections" + "github.com/supabase/cli/internal/inspect/seq_scans" + "github.com/supabase/cli/internal/inspect/table_index_sizes" + "github.com/supabase/cli/internal/inspect/table_record_counts" + "github.com/supabase/cli/internal/inspect/table_sizes" + "github.com/supabase/cli/internal/inspect/total_index_size" + "github.com/supabase/cli/internal/inspect/total_table_sizes" + "github.com/supabase/cli/internal/inspect/unused_indexes" + "github.com/supabase/cli/internal/inspect/vacuum_stats" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/inspect/role_configs/role_configs.go b/internal/inspect/role_configs/role_configs.go index 9f605419f..f4fb79382 100644 --- a/internal/inspect/role_configs/role_configs.go +++ b/internal/inspect/role_configs/role_configs.go @@ -9,9 +9,9 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgxv5" ) //go:embed role_configs.sql diff --git a/internal/inspect/role_configs/role_configs_test.go b/internal/inspect/role_configs/role_configs_test.go index 67d734301..554a12526 100644 --- a/internal/inspect/role_configs/role_configs_test.go +++ b/internal/inspect/role_configs/role_configs_test.go @@ -7,7 +7,7 @@ import ( "github.com/jackc/pgconn" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/inspect/role_connections/role_connections.go b/internal/inspect/role_connections/role_connections.go index e5bec0934..5b0a56539 100644 --- a/internal/inspect/role_connections/role_connections.go +++ b/internal/inspect/role_connections/role_connections.go @@ -9,9 +9,9 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgxv5" ) //go:embed role_connections.sql diff --git a/internal/inspect/role_connections/role_connections_test.go b/internal/inspect/role_connections/role_connections_test.go index b7d1ec884..32ecab768 100644 --- a/internal/inspect/role_connections/role_connections_test.go +++ b/internal/inspect/role_connections/role_connections_test.go @@ -7,7 +7,7 @@ import ( "github.com/jackc/pgconn" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/inspect/seq_scans/seq_scans.go b/internal/inspect/seq_scans/seq_scans.go index 240112d5b..6b52538ee 100644 --- a/internal/inspect/seq_scans/seq_scans.go +++ b/internal/inspect/seq_scans/seq_scans.go @@ -9,10 +9,10 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgxv5" ) //go:embed seq_scans.sql diff --git a/internal/inspect/seq_scans/seq_scans_test.go b/internal/inspect/seq_scans/seq_scans_test.go index 0e2bdfb42..3db6caee5 100644 --- a/internal/inspect/seq_scans/seq_scans_test.go +++ b/internal/inspect/seq_scans/seq_scans_test.go @@ -7,9 +7,9 @@ import ( "github.com/jackc/pgconn" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/inspect/table_index_sizes/table_index_sizes.go b/internal/inspect/table_index_sizes/table_index_sizes.go index 8a5b3a096..e61f23361 100644 --- a/internal/inspect/table_index_sizes/table_index_sizes.go +++ b/internal/inspect/table_index_sizes/table_index_sizes.go @@ -9,10 +9,10 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgxv5" ) //go:embed table_index_sizes.sql diff --git a/internal/inspect/table_index_sizes/table_index_sizes_test.go b/internal/inspect/table_index_sizes/table_index_sizes_test.go index 92e58ef56..20ad80fc9 100644 --- a/internal/inspect/table_index_sizes/table_index_sizes_test.go +++ b/internal/inspect/table_index_sizes/table_index_sizes_test.go @@ -7,9 +7,9 @@ import ( "github.com/jackc/pgconn" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/inspect/table_record_counts/table_record_counts.go b/internal/inspect/table_record_counts/table_record_counts.go index 19e32a5b3..e0b394374 100644 --- a/internal/inspect/table_record_counts/table_record_counts.go +++ b/internal/inspect/table_record_counts/table_record_counts.go @@ -9,10 +9,10 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgxv5" ) //go:embed table_record_counts.sql diff --git a/internal/inspect/table_record_counts/table_record_counts_test.go b/internal/inspect/table_record_counts/table_record_counts_test.go index 753074e77..a03714d97 100644 --- a/internal/inspect/table_record_counts/table_record_counts_test.go +++ b/internal/inspect/table_record_counts/table_record_counts_test.go @@ -7,9 +7,9 @@ import ( "github.com/jackc/pgconn" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/inspect/table_sizes/table_sizes.go b/internal/inspect/table_sizes/table_sizes.go index 7ce49e225..7741f0119 100644 --- a/internal/inspect/table_sizes/table_sizes.go +++ b/internal/inspect/table_sizes/table_sizes.go @@ -9,10 +9,10 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgxv5" ) //go:embed table_sizes.sql diff --git a/internal/inspect/table_sizes/table_sizes_test.go b/internal/inspect/table_sizes/table_sizes_test.go index 057f32d14..5cc6426ad 100644 --- a/internal/inspect/table_sizes/table_sizes_test.go +++ b/internal/inspect/table_sizes/table_sizes_test.go @@ -7,9 +7,9 @@ import ( "github.com/jackc/pgconn" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/inspect/total_index_size/total_index_size.go b/internal/inspect/total_index_size/total_index_size.go index bd6a13fd9..fbc66b259 100644 --- a/internal/inspect/total_index_size/total_index_size.go +++ b/internal/inspect/total_index_size/total_index_size.go @@ -9,10 +9,10 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgxv5" ) //go:embed total_index_size.sql diff --git a/internal/inspect/total_index_size/total_index_size_test.go b/internal/inspect/total_index_size/total_index_size_test.go index c59401469..8eb0e0aa9 100644 --- a/internal/inspect/total_index_size/total_index_size_test.go +++ b/internal/inspect/total_index_size/total_index_size_test.go @@ -7,9 +7,9 @@ import ( "github.com/jackc/pgconn" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/inspect/total_table_sizes/total_table_sizes.go b/internal/inspect/total_table_sizes/total_table_sizes.go index 3b96dcadd..80b1c89a8 100644 --- a/internal/inspect/total_table_sizes/total_table_sizes.go +++ b/internal/inspect/total_table_sizes/total_table_sizes.go @@ -9,10 +9,10 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgxv5" ) //go:embed total_table_sizes.sql diff --git a/internal/inspect/total_table_sizes/total_table_sizes_test.go b/internal/inspect/total_table_sizes/total_table_sizes_test.go index 3419fc762..bc548af60 100644 --- a/internal/inspect/total_table_sizes/total_table_sizes_test.go +++ b/internal/inspect/total_table_sizes/total_table_sizes_test.go @@ -7,9 +7,9 @@ import ( "github.com/jackc/pgconn" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/inspect/unused_indexes/unused_indexes.go b/internal/inspect/unused_indexes/unused_indexes.go index d7589888d..2a30a46d7 100644 --- a/internal/inspect/unused_indexes/unused_indexes.go +++ b/internal/inspect/unused_indexes/unused_indexes.go @@ -9,10 +9,10 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgxv5" ) //go:embed unused_indexes.sql diff --git a/internal/inspect/unused_indexes/unused_indexes_test.go b/internal/inspect/unused_indexes/unused_indexes_test.go index af3936166..ee4182094 100644 --- a/internal/inspect/unused_indexes/unused_indexes_test.go +++ b/internal/inspect/unused_indexes/unused_indexes_test.go @@ -7,9 +7,9 @@ import ( "github.com/jackc/pgconn" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/inspect/vacuum_stats/vacuum_stats.go b/internal/inspect/vacuum_stats/vacuum_stats.go index 950956503..dc9326d79 100644 --- a/internal/inspect/vacuum_stats/vacuum_stats.go +++ b/internal/inspect/vacuum_stats/vacuum_stats.go @@ -10,10 +10,10 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgxv5" ) //go:embed vacuum_stats.sql diff --git a/internal/inspect/vacuum_stats/vacuum_stats_test.go b/internal/inspect/vacuum_stats/vacuum_stats_test.go index fba1e9a47..0d3cbec10 100644 --- a/internal/inspect/vacuum_stats/vacuum_stats_test.go +++ b/internal/inspect/vacuum_stats/vacuum_stats_test.go @@ -7,9 +7,9 @@ import ( "github.com/jackc/pgconn" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/db/reset" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/db/reset" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/link/link.go b/internal/link/link.go index 5f156b11b..e791271b8 100644 --- a/internal/link/link.go +++ b/internal/link/link.go @@ -13,15 +13,15 @@ import ( "github.com/jackc/pgx/v4" "github.com/spf13/afero" "github.com/spf13/viper" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/credentials" - "github.com/supabase/cli/v2/internal/utils/flags" - "github.com/supabase/cli/v2/internal/utils/tenant" - "github.com/supabase/cli/v2/pkg/api" - "github.com/supabase/cli/v2/pkg/cast" - cliConfig "github.com/supabase/cli/v2/pkg/config" - "github.com/supabase/cli/v2/pkg/diff" - "github.com/supabase/cli/v2/pkg/migration" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/credentials" + "github.com/supabase/cli/internal/utils/flags" + "github.com/supabase/cli/internal/utils/tenant" + "github.com/supabase/cli/pkg/api" + "github.com/supabase/cli/pkg/cast" + cliConfig "github.com/supabase/cli/pkg/config" + "github.com/supabase/cli/pkg/diff" + "github.com/supabase/cli/pkg/migration" ) func Run(ctx context.Context, projectRef string, fsys afero.Fs, options ...func(*pgx.ConnConfig)) error { diff --git a/internal/link/link_test.go b/internal/link/link_test.go index 4f05a296e..18c090ad3 100644 --- a/internal/link/link_test.go +++ b/internal/link/link_test.go @@ -12,14 +12,14 @@ import ( "github.com/jackc/pgx/v4" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/testing/fstest" - "github.com/supabase/cli/v2/internal/testing/helper" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/tenant" - "github.com/supabase/cli/v2/pkg/api" - "github.com/supabase/cli/v2/pkg/migration" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/testing/fstest" + "github.com/supabase/cli/internal/testing/helper" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/tenant" + "github.com/supabase/cli/pkg/api" + "github.com/supabase/cli/pkg/migration" + "github.com/supabase/cli/pkg/pgtest" "github.com/zalando/go-keyring" ) diff --git a/internal/login/login.go b/internal/login/login.go index be1265bec..6239b500a 100644 --- a/internal/login/login.go +++ b/internal/login/login.go @@ -20,9 +20,9 @@ import ( "github.com/go-errors/errors" "github.com/google/uuid" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/migration/new" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/fetcher" + "github.com/supabase/cli/internal/migration/new" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/fetcher" ) type RunParams struct { diff --git a/internal/login/login_test.go b/internal/login/login_test.go index 8dd02deab..758fbc5c4 100644 --- a/internal/login/login_test.go +++ b/internal/login/login_test.go @@ -12,9 +12,9 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/credentials" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/credentials" "github.com/zalando/go-keyring" ) diff --git a/internal/logout/logout.go b/internal/logout/logout.go index ae71bf00b..abbd191b8 100644 --- a/internal/logout/logout.go +++ b/internal/logout/logout.go @@ -7,8 +7,8 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/credentials" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/credentials" ) func Run(ctx context.Context, stdout *os.File, fsys afero.Fs) error { diff --git a/internal/logout/logout_test.go b/internal/logout/logout_test.go index 5a7835824..42f9f8ead 100644 --- a/internal/logout/logout_test.go +++ b/internal/logout/logout_test.go @@ -8,10 +8,10 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/testing/fstest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/credentials" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/testing/fstest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/credentials" "github.com/zalando/go-keyring" ) diff --git a/internal/migration/apply/apply.go b/internal/migration/apply/apply.go index ea7f6cb8b..224b342f7 100644 --- a/internal/migration/apply/apply.go +++ b/internal/migration/apply/apply.go @@ -5,9 +5,9 @@ import ( "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/migration" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/migration" ) func MigrateAndSeed(ctx context.Context, version string, conn *pgx.Conn, fsys afero.Fs) error { diff --git a/internal/migration/apply/apply_test.go b/internal/migration/apply/apply_test.go index 49165f275..286093743 100644 --- a/internal/migration/apply/apply_test.go +++ b/internal/migration/apply/apply_test.go @@ -9,11 +9,11 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/fstest" - "github.com/supabase/cli/v2/internal/testing/helper" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/migration" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/testing/fstest" + "github.com/supabase/cli/internal/testing/helper" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/migration" + "github.com/supabase/cli/pkg/pgtest" ) func TestMigrateDatabase(t *testing.T) { diff --git a/internal/migration/fetch/fetch.go b/internal/migration/fetch/fetch.go index fac525787..cb78c70d8 100644 --- a/internal/migration/fetch/fetch.go +++ b/internal/migration/fetch/fetch.go @@ -10,8 +10,8 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/migration" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/migration" ) func Run(ctx context.Context, config pgconn.Config, fsys afero.Fs, options ...func(*pgx.ConnConfig)) error { diff --git a/internal/migration/list/list.go b/internal/migration/list/list.go index d1202d068..3107d4ec6 100644 --- a/internal/migration/list/list.go +++ b/internal/migration/list/list.go @@ -11,8 +11,8 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/migration" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/migration" ) func Run(ctx context.Context, config pgconn.Config, fsys afero.Fs, options ...func(*pgx.ConnConfig)) error { diff --git a/internal/migration/list/list_test.go b/internal/migration/list/list_test.go index c68ade375..b23fa4a2d 100644 --- a/internal/migration/list/list_test.go +++ b/internal/migration/list/list_test.go @@ -12,10 +12,10 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/fstest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/migration" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/testing/fstest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/migration" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/migration/new/new.go b/internal/migration/new/new.go index 026c54c7b..be232b591 100644 --- a/internal/migration/new/new.go +++ b/internal/migration/new/new.go @@ -8,7 +8,7 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/utils" ) func Run(migrationName string, stdin afero.File, fsys afero.Fs) error { diff --git a/internal/migration/new/new_test.go b/internal/migration/new/new_test.go index 232623cb1..39e2fe115 100644 --- a/internal/migration/new/new_test.go +++ b/internal/migration/new/new_test.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/utils" ) func TestNewCommand(t *testing.T) { diff --git a/internal/migration/repair/repair.go b/internal/migration/repair/repair.go index b43779aa6..c0670000a 100644 --- a/internal/migration/repair/repair.go +++ b/internal/migration/repair/repair.go @@ -11,9 +11,9 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/migration" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/migration" ) const ( diff --git a/internal/migration/repair/repair_test.go b/internal/migration/repair/repair_test.go index cb035c489..4dea63279 100644 --- a/internal/migration/repair/repair_test.go +++ b/internal/migration/repair/repair_test.go @@ -12,11 +12,11 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/fstest" - "github.com/supabase/cli/v2/internal/testing/helper" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/migration" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/testing/fstest" + "github.com/supabase/cli/internal/testing/helper" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/migration" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/migration/squash/squash.go b/internal/migration/squash/squash.go index 64429d260..2ed9e6252 100644 --- a/internal/migration/squash/squash.go +++ b/internal/migration/squash/squash.go @@ -14,13 +14,13 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/db/diff" - "github.com/supabase/cli/v2/internal/db/dump" - "github.com/supabase/cli/v2/internal/db/start" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/migration/repair" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/migration" + "github.com/supabase/cli/internal/db/diff" + "github.com/supabase/cli/internal/db/dump" + "github.com/supabase/cli/internal/db/start" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/migration/repair" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/migration" ) var ErrMissingVersion = errors.New("version not found") diff --git a/internal/migration/squash/squash_test.go b/internal/migration/squash/squash_test.go index 1cbd85849..cc0461f3b 100644 --- a/internal/migration/squash/squash_test.go +++ b/internal/migration/squash/squash_test.go @@ -21,14 +21,14 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/db/start" - "github.com/supabase/cli/v2/internal/migration/repair" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/testing/fstest" - "github.com/supabase/cli/v2/internal/testing/helper" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/migration" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/db/start" + "github.com/supabase/cli/internal/migration/repair" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/testing/fstest" + "github.com/supabase/cli/internal/testing/helper" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/migration" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/migration/up/up.go b/internal/migration/up/up.go index 8229fd6ed..d33117f33 100644 --- a/internal/migration/up/up.go +++ b/internal/migration/up/up.go @@ -9,8 +9,8 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/migration" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/migration" ) func Run(ctx context.Context, includeAll bool, config pgconn.Config, fsys afero.Fs, options ...func(*pgx.ConnConfig)) error { diff --git a/internal/migration/up/up_test.go b/internal/migration/up/up_test.go index 69e9c5ecd..ea41680bc 100644 --- a/internal/migration/up/up_test.go +++ b/internal/migration/up/up_test.go @@ -9,10 +9,10 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/fstest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/migration" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/testing/fstest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/migration" + "github.com/supabase/cli/pkg/pgtest" ) func TestPendingMigrations(t *testing.T) { diff --git a/internal/orgs/create/create.go b/internal/orgs/create/create.go index df7c1eec5..ed6008ab3 100644 --- a/internal/orgs/create/create.go +++ b/internal/orgs/create/create.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/go-errors/errors" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func Run(ctx context.Context, name string) error { diff --git a/internal/orgs/create/create_test.go b/internal/orgs/create/create_test.go index 8792188f6..f491bdc31 100644 --- a/internal/orgs/create/create_test.go +++ b/internal/orgs/create/create_test.go @@ -8,9 +8,9 @@ import ( "github.com/h2non/gock" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func TestOrganizationCreateCommand(t *testing.T) { diff --git a/internal/orgs/list/list.go b/internal/orgs/list/list.go index 4eb7487f0..abd6c08df 100644 --- a/internal/orgs/list/list.go +++ b/internal/orgs/list/list.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/go-errors/errors" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" ) func Run(ctx context.Context) error { diff --git a/internal/orgs/list/list_test.go b/internal/orgs/list/list_test.go index d538f5fea..00030dbd2 100644 --- a/internal/orgs/list/list_test.go +++ b/internal/orgs/list/list_test.go @@ -8,9 +8,9 @@ import ( "github.com/h2non/gock" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func TestOrganizationListCommand(t *testing.T) { diff --git a/internal/postgresConfig/get/get.go b/internal/postgresConfig/get/get.go index 535f0f171..ad311b396 100644 --- a/internal/postgresConfig/get/get.go +++ b/internal/postgresConfig/get/get.go @@ -9,8 +9,8 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" ) func Run(ctx context.Context, projectRef string, fsys afero.Fs) error { diff --git a/internal/postgresConfig/update/update.go b/internal/postgresConfig/update/update.go index 9c8bec823..94632d486 100644 --- a/internal/postgresConfig/update/update.go +++ b/internal/postgresConfig/update/update.go @@ -9,8 +9,8 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/postgresConfig/get" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/postgresConfig/get" + "github.com/supabase/cli/internal/utils" ) func Run(ctx context.Context, projectRef string, values []string, replaceOverrides, noRestart bool, fsys afero.Fs) error { diff --git a/internal/projects/apiKeys/api_keys.go b/internal/projects/apiKeys/api_keys.go index be5035a5b..7daddce21 100644 --- a/internal/projects/apiKeys/api_keys.go +++ b/internal/projects/apiKeys/api_keys.go @@ -8,9 +8,9 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func Run(ctx context.Context, projectRef string, fsys afero.Fs) error { diff --git a/internal/projects/apiKeys/api_keys_test.go b/internal/projects/apiKeys/api_keys_test.go index e94a999ce..57130f158 100644 --- a/internal/projects/apiKeys/api_keys_test.go +++ b/internal/projects/apiKeys/api_keys_test.go @@ -8,9 +8,9 @@ import ( "github.com/h2non/gock" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func TestProjectApiKeysCommand(t *testing.T) { diff --git a/internal/projects/create/create.go b/internal/projects/create/create.go index 671020f1f..ddbd46b47 100644 --- a/internal/projects/create/create.go +++ b/internal/projects/create/create.go @@ -9,10 +9,10 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" "github.com/spf13/viper" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/credentials" - "github.com/supabase/cli/v2/internal/utils/flags" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/credentials" + "github.com/supabase/cli/internal/utils/flags" + "github.com/supabase/cli/pkg/api" ) func Run(ctx context.Context, params api.V1CreateProjectBodyDto, fsys afero.Fs) error { diff --git a/internal/projects/create/create_test.go b/internal/projects/create/create_test.go index 8db8ef3da..879421d72 100644 --- a/internal/projects/create/create_test.go +++ b/internal/projects/create/create_test.go @@ -8,9 +8,9 @@ import ( "github.com/h2non/gock" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func TestProjectCreateCommand(t *testing.T) { diff --git a/internal/projects/delete/delete.go b/internal/projects/delete/delete.go index dda1dd297..f042f62e1 100644 --- a/internal/projects/delete/delete.go +++ b/internal/projects/delete/delete.go @@ -8,9 +8,9 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/unlink" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/credentials" + "github.com/supabase/cli/internal/unlink" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/credentials" "github.com/zalando/go-keyring" ) diff --git a/internal/projects/delete/delete_test.go b/internal/projects/delete/delete_test.go index aaa441229..b83d4cf8c 100644 --- a/internal/projects/delete/delete_test.go +++ b/internal/projects/delete/delete_test.go @@ -10,9 +10,9 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" "github.com/zalando/go-keyring" ) diff --git a/internal/projects/list/list.go b/internal/projects/list/list.go index 23dae8f07..ef356dfcf 100644 --- a/internal/projects/list/list.go +++ b/internal/projects/list/list.go @@ -8,10 +8,10 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" + "github.com/supabase/cli/pkg/api" ) type linkedProject struct { diff --git a/internal/projects/list/list_test.go b/internal/projects/list/list_test.go index 31a1bc716..d5450bfb4 100644 --- a/internal/projects/list/list_test.go +++ b/internal/projects/list/list_test.go @@ -8,9 +8,9 @@ import ( "github.com/h2non/gock" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func TestProjectListCommand(t *testing.T) { diff --git a/internal/restrictions/get/get.go b/internal/restrictions/get/get.go index ffd4d8fb0..f8e27342d 100644 --- a/internal/restrictions/get/get.go +++ b/internal/restrictions/get/get.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/go-errors/errors" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/utils" ) func Run(ctx context.Context, projectRef string) error { diff --git a/internal/restrictions/update/update.go b/internal/restrictions/update/update.go index 8b5718a76..98a70da98 100644 --- a/internal/restrictions/update/update.go +++ b/internal/restrictions/update/update.go @@ -6,8 +6,8 @@ import ( "net" "github.com/go-errors/errors" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func Run(ctx context.Context, projectRef string, dbCidrsToAllow []string, bypassCidrChecks bool) error { diff --git a/internal/restrictions/update/update_test.go b/internal/restrictions/update/update_test.go index e23a3101e..5a6583ea8 100644 --- a/internal/restrictions/update/update_test.go +++ b/internal/restrictions/update/update_test.go @@ -8,9 +8,9 @@ import ( "github.com/go-errors/errors" "github.com/h2non/gock" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func TestUpdateRestrictionsCommand(t *testing.T) { diff --git a/internal/secrets/list/list.go b/internal/secrets/list/list.go index 9cf4efa6a..e5b4d4538 100644 --- a/internal/secrets/list/list.go +++ b/internal/secrets/list/list.go @@ -8,9 +8,9 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func Run(ctx context.Context, projectRef string, fsys afero.Fs) error { diff --git a/internal/secrets/list/list_test.go b/internal/secrets/list/list_test.go index 4e831d38c..4e0da98b6 100644 --- a/internal/secrets/list/list_test.go +++ b/internal/secrets/list/list_test.go @@ -8,9 +8,9 @@ import ( "github.com/h2non/gock" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func TestSecretListCommand(t *testing.T) { diff --git a/internal/secrets/set/set.go b/internal/secrets/set/set.go index 14e715c7a..d2877c314 100644 --- a/internal/secrets/set/set.go +++ b/internal/secrets/set/set.go @@ -12,8 +12,8 @@ import ( "github.com/go-errors/errors" "github.com/joho/godotenv" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func Run(ctx context.Context, projectRef, envFilePath string, args []string, fsys afero.Fs) error { diff --git a/internal/secrets/set/set_test.go b/internal/secrets/set/set_test.go index beb15c7fd..6021804c1 100644 --- a/internal/secrets/set/set_test.go +++ b/internal/secrets/set/set_test.go @@ -10,9 +10,9 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func TestSecretSetCommand(t *testing.T) { diff --git a/internal/secrets/unset/unset.go b/internal/secrets/unset/unset.go index e9f680d14..f6bbca8cf 100644 --- a/internal/secrets/unset/unset.go +++ b/internal/secrets/unset/unset.go @@ -9,8 +9,8 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/secrets/list" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/secrets/list" + "github.com/supabase/cli/internal/utils" ) func Run(ctx context.Context, projectRef string, args []string, fsys afero.Fs) error { diff --git a/internal/secrets/unset/unset_test.go b/internal/secrets/unset/unset_test.go index e3f6d9dff..3207f8df7 100644 --- a/internal/secrets/unset/unset_test.go +++ b/internal/secrets/unset/unset_test.go @@ -8,9 +8,9 @@ import ( "github.com/h2non/gock" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func TestSecretUnsetCommand(t *testing.T) { diff --git a/internal/seed/buckets/buckets.go b/internal/seed/buckets/buckets.go index f68344828..b460fdc79 100644 --- a/internal/seed/buckets/buckets.go +++ b/internal/seed/buckets/buckets.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/storage/client" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/storage/client" + "github.com/supabase/cli/internal/utils" ) func Run(ctx context.Context, projectRef string, interactive bool, fsys afero.Fs) error { diff --git a/internal/seed/buckets/buckets_test.go b/internal/seed/buckets/buckets_test.go index 9e9c7b1a5..e14a40e74 100644 --- a/internal/seed/buckets/buckets_test.go +++ b/internal/seed/buckets/buckets_test.go @@ -11,9 +11,9 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/storage" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/storage" ) func TestSeedBuckets(t *testing.T) { diff --git a/internal/services/services.go b/internal/services/services.go index e32a3ad57..ebc08efca 100644 --- a/internal/services/services.go +++ b/internal/services/services.go @@ -9,10 +9,10 @@ import ( "sync" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" - "github.com/supabase/cli/v2/internal/utils/tenant" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" + "github.com/supabase/cli/internal/utils/tenant" ) func Run(ctx context.Context, fsys afero.Fs) error { diff --git a/internal/snippets/download/download.go b/internal/snippets/download/download.go index f983d2101..7f1f3a463 100644 --- a/internal/snippets/download/download.go +++ b/internal/snippets/download/download.go @@ -6,7 +6,7 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/utils" ) func Run(ctx context.Context, snippetId string, fsys afero.Fs) error { diff --git a/internal/snippets/list/list.go b/internal/snippets/list/list.go index c3c651f7b..f54325eaa 100644 --- a/internal/snippets/list/list.go +++ b/internal/snippets/list/list.go @@ -7,10 +7,10 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" + "github.com/supabase/cli/pkg/api" ) func Run(ctx context.Context, fsys afero.Fs) error { diff --git a/internal/ssl_enforcement/get/get.go b/internal/ssl_enforcement/get/get.go index 50673d9c9..e6d58693e 100644 --- a/internal/ssl_enforcement/get/get.go +++ b/internal/ssl_enforcement/get/get.go @@ -6,7 +6,7 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/utils" ) func Run(ctx context.Context, projectRef string, fsys afero.Fs) error { diff --git a/internal/ssl_enforcement/update/update.go b/internal/ssl_enforcement/update/update.go index f5805d108..51b0b6725 100644 --- a/internal/ssl_enforcement/update/update.go +++ b/internal/ssl_enforcement/update/update.go @@ -6,8 +6,8 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func Run(ctx context.Context, projectRef string, enforceDbSsl bool, fsys afero.Fs) error { diff --git a/internal/sso/create/create.go b/internal/sso/create/create.go index 1b24e12a9..a33b6e7e7 100644 --- a/internal/sso/create/create.go +++ b/internal/sso/create/create.go @@ -7,10 +7,10 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/sso/internal/render" - "github.com/supabase/cli/v2/internal/sso/internal/saml" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/sso/internal/render" + "github.com/supabase/cli/internal/sso/internal/saml" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) var Fs = afero.NewOsFs() diff --git a/internal/sso/get/get.go b/internal/sso/get/get.go index 43a8e206e..34370523e 100644 --- a/internal/sso/get/get.go +++ b/internal/sso/get/get.go @@ -7,9 +7,9 @@ import ( "os" "github.com/go-errors/errors" - "github.com/supabase/cli/v2/internal/sso/internal/render" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/sso/internal/render" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func Run(ctx context.Context, ref, providerId, format string) error { diff --git a/internal/sso/get/get_test.go b/internal/sso/get/get_test.go index 3c506ce78..bd6fd0ef3 100644 --- a/internal/sso/get/get_test.go +++ b/internal/sso/get/get_test.go @@ -7,8 +7,8 @@ import ( "github.com/h2non/gock" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" ) func TestSSOProvidersShowCommand(t *testing.T) { diff --git a/internal/sso/info/info.go b/internal/sso/info/info.go index ffe51b8b0..c8a25805f 100644 --- a/internal/sso/info/info.go +++ b/internal/sso/info/info.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/supabase/cli/v2/internal/sso/internal/render" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/sso/internal/render" + "github.com/supabase/cli/internal/utils" ) func Run(ctx context.Context, ref string, format string) error { diff --git a/internal/sso/internal/render/render.go b/internal/sso/internal/render/render.go index 3e45b2e01..3f3a03db1 100644 --- a/internal/sso/internal/render/render.go +++ b/internal/sso/internal/render/render.go @@ -7,9 +7,9 @@ import ( "github.com/go-errors/errors" "github.com/go-xmlfmt/xmlfmt" - "github.com/supabase/cli/v2/internal/migration/list" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/migration/list" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func formatProtocol(provider api.Provider) string { diff --git a/internal/sso/internal/saml/files.go b/internal/sso/internal/saml/files.go index 3b47dbe9d..62e0846e3 100644 --- a/internal/sso/internal/saml/files.go +++ b/internal/sso/internal/saml/files.go @@ -12,8 +12,8 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/pkg/api" - "github.com/supabase/cli/v2/pkg/fetcher" + "github.com/supabase/cli/pkg/api" + "github.com/supabase/cli/pkg/fetcher" ) var DefaultClient = http.DefaultClient diff --git a/internal/sso/list/list.go b/internal/sso/list/list.go index 181a86aff..efacb1a04 100644 --- a/internal/sso/list/list.go +++ b/internal/sso/list/list.go @@ -6,8 +6,8 @@ import ( "os" "github.com/go-errors/errors" - "github.com/supabase/cli/v2/internal/sso/internal/render" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/sso/internal/render" + "github.com/supabase/cli/internal/utils" ) func Run(ctx context.Context, ref, format string) error { diff --git a/internal/sso/list/list_test.go b/internal/sso/list/list_test.go index 50ab8d745..333ffd4a3 100644 --- a/internal/sso/list/list_test.go +++ b/internal/sso/list/list_test.go @@ -6,8 +6,8 @@ import ( "github.com/h2non/gock" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" ) func TestSSOProvidersListCommand(t *testing.T) { diff --git a/internal/sso/remove/remove.go b/internal/sso/remove/remove.go index a8b5b1ccf..1514314da 100644 --- a/internal/sso/remove/remove.go +++ b/internal/sso/remove/remove.go @@ -6,9 +6,9 @@ import ( "os" "github.com/go-errors/errors" - "github.com/supabase/cli/v2/internal/sso/internal/render" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/sso/internal/render" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func Run(ctx context.Context, ref, providerId, format string) error { diff --git a/internal/sso/remove/remove_test.go b/internal/sso/remove/remove_test.go index c606c8628..f284f7e06 100644 --- a/internal/sso/remove/remove_test.go +++ b/internal/sso/remove/remove_test.go @@ -7,8 +7,8 @@ import ( "github.com/h2non/gock" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" ) func TestSSOProvidersRemoveCommand(t *testing.T) { diff --git a/internal/sso/update/update.go b/internal/sso/update/update.go index 5a412fed7..e8a745dc3 100644 --- a/internal/sso/update/update.go +++ b/internal/sso/update/update.go @@ -7,10 +7,10 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/sso/internal/render" - "github.com/supabase/cli/v2/internal/sso/internal/saml" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/sso/internal/render" + "github.com/supabase/cli/internal/sso/internal/saml" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) var Fs = afero.NewOsFs() diff --git a/internal/sso/update/update_test.go b/internal/sso/update/update_test.go index dd423dadd..6754fd487 100644 --- a/internal/sso/update/update_test.go +++ b/internal/sso/update/update_test.go @@ -10,9 +10,9 @@ import ( "github.com/google/uuid" "github.com/h2non/gock" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func response(providerId string, domains []string) map[string]any { diff --git a/internal/start/start.go b/internal/start/start.go index c74f6287f..4315d31b7 100644 --- a/internal/start/start.go +++ b/internal/start/start.go @@ -23,14 +23,14 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/db/start" - "github.com/supabase/cli/v2/internal/functions/serve" - "github.com/supabase/cli/v2/internal/seed/buckets" - "github.com/supabase/cli/v2/internal/services" - "github.com/supabase/cli/v2/internal/status" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" - "github.com/supabase/cli/v2/pkg/config" + "github.com/supabase/cli/internal/db/start" + "github.com/supabase/cli/internal/functions/serve" + "github.com/supabase/cli/internal/seed/buckets" + "github.com/supabase/cli/internal/services" + "github.com/supabase/cli/internal/status" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" + "github.com/supabase/cli/pkg/config" "golang.org/x/mod/semver" ) diff --git a/internal/start/start_test.go b/internal/start/start_test.go index 93af236d9..079eb3c79 100644 --- a/internal/start/start_test.go +++ b/internal/start/start_test.go @@ -17,11 +17,11 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/config" - "github.com/supabase/cli/v2/pkg/pgtest" - "github.com/supabase/cli/v2/pkg/storage" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/config" + "github.com/supabase/cli/pkg/pgtest" + "github.com/supabase/cli/pkg/storage" ) func TestStartCommand(t *testing.T) { diff --git a/internal/status/status.go b/internal/status/status.go index bcd8ff8bf..1b9d02f90 100644 --- a/internal/status/status.go +++ b/internal/status/status.go @@ -18,8 +18,8 @@ import ( "github.com/docker/docker/api/types/container" "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/fetcher" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/fetcher" ) type CustomName struct { diff --git a/internal/status/status_test.go b/internal/status/status_test.go index 792b99c65..391a8c998 100644 --- a/internal/status/status_test.go +++ b/internal/status/status_test.go @@ -13,8 +13,8 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" ) func TestStatusCommand(t *testing.T) { diff --git a/internal/stop/stop.go b/internal/stop/stop.go index fc9dfebd5..39c5e00e5 100644 --- a/internal/stop/stop.go +++ b/internal/stop/stop.go @@ -8,7 +8,7 @@ import ( "github.com/docker/docker/api/types/volume" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/utils" ) func Run(ctx context.Context, backup bool, projectId string, all bool, fsys afero.Fs) error { diff --git a/internal/stop/stop_test.go b/internal/stop/stop_test.go index cc287cb9e..b607d87d7 100644 --- a/internal/stop/stop_test.go +++ b/internal/stop/stop_test.go @@ -18,8 +18,8 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" ) func TestStopCommand(t *testing.T) { diff --git a/internal/storage/client/api.go b/internal/storage/client/api.go index ea44f3c7b..c8c2a02ef 100644 --- a/internal/storage/client/api.go +++ b/internal/storage/client/api.go @@ -5,11 +5,11 @@ import ( "net/http" "github.com/spf13/viper" - "github.com/supabase/cli/v2/internal/status" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/tenant" - "github.com/supabase/cli/v2/pkg/fetcher" - "github.com/supabase/cli/v2/pkg/storage" + "github.com/supabase/cli/internal/status" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/tenant" + "github.com/supabase/cli/pkg/fetcher" + "github.com/supabase/cli/pkg/storage" ) func NewStorageAPI(ctx context.Context, projectRef string) (storage.StorageAPI, error) { diff --git a/internal/storage/cp/cp.go b/internal/storage/cp/cp.go index 6c5df9f31..e55120a1c 100644 --- a/internal/storage/cp/cp.go +++ b/internal/storage/cp/cp.go @@ -12,12 +12,12 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/storage/client" - "github.com/supabase/cli/v2/internal/storage/ls" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" - "github.com/supabase/cli/v2/pkg/queue" - "github.com/supabase/cli/v2/pkg/storage" + "github.com/supabase/cli/internal/storage/client" + "github.com/supabase/cli/internal/storage/ls" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" + "github.com/supabase/cli/pkg/queue" + "github.com/supabase/cli/pkg/storage" ) var errUnsupportedOperation = errors.New("Unsupported operation") diff --git a/internal/storage/cp/cp_test.go b/internal/storage/cp/cp_test.go index 83e787692..75a0cf3cd 100644 --- a/internal/storage/cp/cp_test.go +++ b/internal/storage/cp/cp_test.go @@ -10,13 +10,13 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" - "github.com/supabase/cli/v2/pkg/api" - "github.com/supabase/cli/v2/pkg/cast" - "github.com/supabase/cli/v2/pkg/fetcher" - "github.com/supabase/cli/v2/pkg/storage" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" + "github.com/supabase/cli/pkg/api" + "github.com/supabase/cli/pkg/cast" + "github.com/supabase/cli/pkg/fetcher" + "github.com/supabase/cli/pkg/storage" ) var mockFile = storage.ObjectResponse{ diff --git a/internal/storage/ls/ls.go b/internal/storage/ls/ls.go index 0f521ce97..396dc9b7c 100644 --- a/internal/storage/ls/ls.go +++ b/internal/storage/ls/ls.go @@ -8,9 +8,9 @@ import ( "strings" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/storage/client" - "github.com/supabase/cli/v2/internal/utils/flags" - "github.com/supabase/cli/v2/pkg/storage" + "github.com/supabase/cli/internal/storage/client" + "github.com/supabase/cli/internal/utils/flags" + "github.com/supabase/cli/pkg/storage" ) func Run(ctx context.Context, objectPath string, recursive bool, fsys afero.Fs) error { diff --git a/internal/storage/ls/ls_test.go b/internal/storage/ls/ls_test.go index bef37987d..e0e2cd207 100644 --- a/internal/storage/ls/ls_test.go +++ b/internal/storage/ls/ls_test.go @@ -9,14 +9,14 @@ import ( "github.com/h2non/gock" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/storage/client" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" - "github.com/supabase/cli/v2/pkg/api" - "github.com/supabase/cli/v2/pkg/cast" - "github.com/supabase/cli/v2/pkg/fetcher" - "github.com/supabase/cli/v2/pkg/storage" + "github.com/supabase/cli/internal/storage/client" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" + "github.com/supabase/cli/pkg/api" + "github.com/supabase/cli/pkg/cast" + "github.com/supabase/cli/pkg/fetcher" + "github.com/supabase/cli/pkg/storage" ) var mockFile = storage.ObjectResponse{ diff --git a/internal/storage/mv/mv.go b/internal/storage/mv/mv.go index 91f0ef3b2..a6dc8773c 100644 --- a/internal/storage/mv/mv.go +++ b/internal/storage/mv/mv.go @@ -9,10 +9,10 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/storage/client" - "github.com/supabase/cli/v2/internal/storage/ls" - "github.com/supabase/cli/v2/internal/utils/flags" - "github.com/supabase/cli/v2/pkg/storage" + "github.com/supabase/cli/internal/storage/client" + "github.com/supabase/cli/internal/storage/ls" + "github.com/supabase/cli/internal/utils/flags" + "github.com/supabase/cli/pkg/storage" ) var ( diff --git a/internal/storage/mv/mv_test.go b/internal/storage/mv/mv_test.go index 65164cc46..fd8ecfbcc 100644 --- a/internal/storage/mv/mv_test.go +++ b/internal/storage/mv/mv_test.go @@ -8,13 +8,13 @@ import ( "github.com/h2non/gock" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" - "github.com/supabase/cli/v2/pkg/api" - "github.com/supabase/cli/v2/pkg/cast" - "github.com/supabase/cli/v2/pkg/fetcher" - "github.com/supabase/cli/v2/pkg/storage" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" + "github.com/supabase/cli/pkg/api" + "github.com/supabase/cli/pkg/cast" + "github.com/supabase/cli/pkg/fetcher" + "github.com/supabase/cli/pkg/storage" ) var mockFile = storage.ObjectResponse{ diff --git a/internal/storage/rm/rm.go b/internal/storage/rm/rm.go index 8734cc8ca..720bbce02 100644 --- a/internal/storage/rm/rm.go +++ b/internal/storage/rm/rm.go @@ -8,12 +8,12 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/storage/client" - "github.com/supabase/cli/v2/internal/storage/cp" - "github.com/supabase/cli/v2/internal/storage/ls" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" - "github.com/supabase/cli/v2/pkg/storage" + "github.com/supabase/cli/internal/storage/client" + "github.com/supabase/cli/internal/storage/cp" + "github.com/supabase/cli/internal/storage/ls" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" + "github.com/supabase/cli/pkg/storage" ) var ( diff --git a/internal/storage/rm/rm_test.go b/internal/storage/rm/rm_test.go index c04a79a6a..46d204cf0 100644 --- a/internal/storage/rm/rm_test.go +++ b/internal/storage/rm/rm_test.go @@ -8,14 +8,14 @@ import ( "github.com/h2non/gock" "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/testing/fstest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/flags" - "github.com/supabase/cli/v2/pkg/api" - "github.com/supabase/cli/v2/pkg/cast" - "github.com/supabase/cli/v2/pkg/fetcher" - "github.com/supabase/cli/v2/pkg/storage" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/testing/fstest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/flags" + "github.com/supabase/cli/pkg/api" + "github.com/supabase/cli/pkg/cast" + "github.com/supabase/cli/pkg/fetcher" + "github.com/supabase/cli/pkg/storage" ) var mockFile = storage.ObjectResponse{ diff --git a/internal/test/new/new.go b/internal/test/new/new.go index babe62194..506a9e02e 100644 --- a/internal/test/new/new.go +++ b/internal/test/new/new.go @@ -8,7 +8,7 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/utils" ) const ( diff --git a/internal/test/new/new_test.go b/internal/test/new/new_test.go index a03e63dbf..d3f980157 100644 --- a/internal/test/new/new_test.go +++ b/internal/test/new/new_test.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/utils" ) func TestCreatePgTAP(t *testing.T) { diff --git a/internal/testing/helper/history.go b/internal/testing/helper/history.go index 7c5436dc4..95c846b7a 100644 --- a/internal/testing/helper/history.go +++ b/internal/testing/helper/history.go @@ -1,8 +1,8 @@ package helper import ( - "github.com/supabase/cli/v2/pkg/migration" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/pkg/migration" + "github.com/supabase/cli/pkg/pgtest" ) func MockMigrationHistory(conn *pgtest.MockConn) *pgtest.MockConn { diff --git a/internal/unlink/unlink.go b/internal/unlink/unlink.go index 5750f647d..b59f4d1f0 100644 --- a/internal/unlink/unlink.go +++ b/internal/unlink/unlink.go @@ -7,8 +7,8 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/credentials" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/credentials" "github.com/zalando/go-keyring" ) diff --git a/internal/unlink/unlink_test.go b/internal/unlink/unlink_test.go index e5967005a..9b526e109 100644 --- a/internal/unlink/unlink_test.go +++ b/internal/unlink/unlink_test.go @@ -8,9 +8,9 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/credentials" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/credentials" "github.com/zalando/go-keyring" ) diff --git a/internal/utils/access_token.go b/internal/utils/access_token.go index bd48823cb..f7ef90a01 100644 --- a/internal/utils/access_token.go +++ b/internal/utils/access_token.go @@ -7,7 +7,7 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils/credentials" + "github.com/supabase/cli/internal/utils/credentials" "github.com/zalando/go-keyring" ) diff --git a/internal/utils/access_token_test.go b/internal/utils/access_token_test.go index d05e5f3cd..f31988876 100644 --- a/internal/utils/access_token_test.go +++ b/internal/utils/access_token_test.go @@ -7,9 +7,9 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/testing/fstest" - "github.com/supabase/cli/v2/internal/utils/credentials" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/testing/fstest" + "github.com/supabase/cli/internal/utils/credentials" "github.com/zalando/go-keyring" ) diff --git a/internal/utils/api.go b/internal/utils/api.go index 271d8cebf..32b199b69 100644 --- a/internal/utils/api.go +++ b/internal/utils/api.go @@ -14,9 +14,9 @@ import ( "github.com/go-errors/errors" "github.com/spf13/viper" - "github.com/supabase/cli/v2/internal/utils/cloudflare" - supabase "github.com/supabase/cli/v2/pkg/api" - "github.com/supabase/cli/v2/pkg/cast" + "github.com/supabase/cli/internal/utils/cloudflare" + supabase "github.com/supabase/cli/pkg/api" + "github.com/supabase/cli/pkg/cast" ) const ( diff --git a/internal/utils/api_test.go b/internal/utils/api_test.go index 8a858441e..09365897d 100644 --- a/internal/utils/api_test.go +++ b/internal/utils/api_test.go @@ -10,8 +10,8 @@ import ( "github.com/h2non/gock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils/cloudflare" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils/cloudflare" ) const host = "api.supabase.io" diff --git a/internal/utils/cloudflare/api.go b/internal/utils/cloudflare/api.go index eeadef033..7c7cf10a2 100644 --- a/internal/utils/cloudflare/api.go +++ b/internal/utils/cloudflare/api.go @@ -4,7 +4,7 @@ import ( "net/http" "time" - "github.com/supabase/cli/v2/pkg/fetcher" + "github.com/supabase/cli/pkg/fetcher" ) type CloudflareAPI struct { diff --git a/internal/utils/cloudflare/dns.go b/internal/utils/cloudflare/dns.go index 739968ef9..f8a06367c 100644 --- a/internal/utils/cloudflare/dns.go +++ b/internal/utils/cloudflare/dns.go @@ -6,7 +6,7 @@ import ( "github.com/go-errors/errors" "github.com/google/go-querystring/query" - "github.com/supabase/cli/v2/pkg/fetcher" + "github.com/supabase/cli/pkg/fetcher" ) type DNSType uint16 diff --git a/internal/utils/config.go b/internal/utils/config.go index 13af5cd34..3f89dc75c 100644 --- a/internal/utils/config.go +++ b/internal/utils/config.go @@ -12,7 +12,7 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" "github.com/spf13/viper" - "github.com/supabase/cli/v2/pkg/config" + "github.com/supabase/cli/pkg/config" ) var ( diff --git a/internal/utils/connect.go b/internal/utils/connect.go index c4f20df56..9479d4e4f 100644 --- a/internal/utils/connect.go +++ b/internal/utils/connect.go @@ -13,8 +13,8 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/spf13/viper" - "github.com/supabase/cli/v2/internal/debug" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/internal/debug" + "github.com/supabase/cli/pkg/pgxv5" ) func ToPostgresURL(config pgconn.Config) string { diff --git a/internal/utils/connect_test.go b/internal/utils/connect_test.go index f66b66659..4ea76c126 100644 --- a/internal/utils/connect_test.go +++ b/internal/utils/connect_test.go @@ -12,9 +12,9 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/utils/cloudflare" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/utils/cloudflare" + "github.com/supabase/cli/pkg/pgtest" ) var dbConfig = pgconn.Config{ diff --git a/internal/utils/console.go b/internal/utils/console.go index 54c36b968..85bebdc1e 100644 --- a/internal/utils/console.go +++ b/internal/utils/console.go @@ -10,7 +10,7 @@ import ( "time" "github.com/go-errors/errors" - "github.com/supabase/cli/v2/pkg/cast" + "github.com/supabase/cli/pkg/cast" "golang.org/x/term" ) diff --git a/internal/utils/console_test.go b/internal/utils/console_test.go index f7662d2d1..ffc9532e7 100644 --- a/internal/utils/console_test.go +++ b/internal/utils/console_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/testing/fstest" + "github.com/supabase/cli/internal/testing/fstest" ) func TestPromptYesNo(t *testing.T) { diff --git a/internal/utils/docker_test.go b/internal/utils/docker_test.go index ef166611b..6a0cdf034 100644 --- a/internal/utils/docker_test.go +++ b/internal/utils/docker_test.go @@ -16,7 +16,7 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" + "github.com/supabase/cli/internal/testing/apitest" ) const ( diff --git a/internal/utils/flags/db_url.go b/internal/utils/flags/db_url.go index a08c6f0ba..013453b86 100644 --- a/internal/utils/flags/db_url.go +++ b/internal/utils/flags/db_url.go @@ -12,9 +12,9 @@ import ( "github.com/spf13/afero" "github.com/spf13/pflag" "github.com/spf13/viper" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/internal/utils/credentials" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/internal/utils/credentials" + "github.com/supabase/cli/pkg/api" ) type connection int diff --git a/internal/utils/flags/project_ref.go b/internal/utils/flags/project_ref.go index 6b39b02ac..c1629c0fa 100644 --- a/internal/utils/flags/project_ref.go +++ b/internal/utils/flags/project_ref.go @@ -10,7 +10,7 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" "github.com/spf13/viper" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/utils" "golang.org/x/term" ) diff --git a/internal/utils/flags/project_ref_test.go b/internal/utils/flags/project_ref_test.go index ee12de886..ee6a5374a 100644 --- a/internal/utils/flags/project_ref_test.go +++ b/internal/utils/flags/project_ref_test.go @@ -13,10 +13,10 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/internal/testing/fstest" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/internal/testing/fstest" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func TestProjectRef(t *testing.T) { diff --git a/internal/utils/release_test.go b/internal/utils/release_test.go index c5f413274..25aa920e8 100644 --- a/internal/utils/release_test.go +++ b/internal/utils/release_test.go @@ -9,8 +9,8 @@ import ( "github.com/google/go-github/v62/github" "github.com/h2non/gock" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/internal/testing/apitest" - "github.com/supabase/cli/v2/pkg/cast" + "github.com/supabase/cli/internal/testing/apitest" + "github.com/supabase/cli/pkg/cast" ) func TestLatestRelease(t *testing.T) { diff --git a/internal/utils/tenant/client.go b/internal/utils/tenant/client.go index f932a5310..ad0ef6aa7 100644 --- a/internal/utils/tenant/client.go +++ b/internal/utils/tenant/client.go @@ -6,9 +6,9 @@ import ( "time" "github.com/go-errors/errors" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" - "github.com/supabase/cli/v2/pkg/fetcher" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" + "github.com/supabase/cli/pkg/fetcher" ) var ( diff --git a/internal/utils/tenant/database.go b/internal/utils/tenant/database.go index 4f733e29c..1ae1ee6a7 100644 --- a/internal/utils/tenant/database.go +++ b/internal/utils/tenant/database.go @@ -4,7 +4,7 @@ import ( "context" "github.com/go-errors/errors" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/utils" ) var errDatabaseVersion = errors.New("Database version not found.") diff --git a/internal/utils/tenant/gotrue.go b/internal/utils/tenant/gotrue.go index 64269b276..507a63af5 100644 --- a/internal/utils/tenant/gotrue.go +++ b/internal/utils/tenant/gotrue.go @@ -5,7 +5,7 @@ import ( "net/http" "github.com/go-errors/errors" - "github.com/supabase/cli/v2/pkg/fetcher" + "github.com/supabase/cli/pkg/fetcher" ) var errGotrueVersion = errors.New("GoTrue version not found.") diff --git a/internal/utils/tenant/gotrue_test.go b/internal/utils/tenant/gotrue_test.go index 8c08d486f..fcc646e0d 100644 --- a/internal/utils/tenant/gotrue_test.go +++ b/internal/utils/tenant/gotrue_test.go @@ -8,7 +8,7 @@ import ( "github.com/h2non/gock" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/pkg/fetcher" + "github.com/supabase/cli/pkg/fetcher" ) var mockApi = TenantAPI{Fetcher: fetcher.NewFetcher( diff --git a/internal/utils/tenant/postgrest.go b/internal/utils/tenant/postgrest.go index 00293b4cf..cb8c96d28 100644 --- a/internal/utils/tenant/postgrest.go +++ b/internal/utils/tenant/postgrest.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/go-errors/errors" - "github.com/supabase/cli/v2/pkg/fetcher" + "github.com/supabase/cli/pkg/fetcher" ) var errPostgrestVersion = errors.New("PostgREST version not found.") diff --git a/internal/vanity_subdomains/activate/activate.go b/internal/vanity_subdomains/activate/activate.go index 2a968d88c..133ec7edd 100644 --- a/internal/vanity_subdomains/activate/activate.go +++ b/internal/vanity_subdomains/activate/activate.go @@ -7,8 +7,8 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func Run(ctx context.Context, projectRef string, desiredSubdomain string, fsys afero.Fs) error { diff --git a/internal/vanity_subdomains/check/check.go b/internal/vanity_subdomains/check/check.go index 6a8bf9ddd..390122707 100644 --- a/internal/vanity_subdomains/check/check.go +++ b/internal/vanity_subdomains/check/check.go @@ -7,8 +7,8 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/api" ) func Run(ctx context.Context, projectRef string, desiredSubdomain string, fsys afero.Fs) error { diff --git a/internal/vanity_subdomains/delete/delete.go b/internal/vanity_subdomains/delete/delete.go index 592e2880f..3ee24d473 100644 --- a/internal/vanity_subdomains/delete/delete.go +++ b/internal/vanity_subdomains/delete/delete.go @@ -6,7 +6,7 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/utils" ) func Run(ctx context.Context, projectRef string, fsys afero.Fs) error { diff --git a/internal/vanity_subdomains/get/get.go b/internal/vanity_subdomains/get/get.go index 450b54f4b..b466f1895 100644 --- a/internal/vanity_subdomains/get/get.go +++ b/internal/vanity_subdomains/get/get.go @@ -6,7 +6,7 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/utils" ) func Run(ctx context.Context, projectRef string, fsys afero.Fs) error { diff --git a/main.go b/main.go index be8d4dc88..9b54f5ec4 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/supabase/cli/v2/cmd" + "github.com/supabase/cli/cmd" ) //go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=pkg/api/types.cfg.yaml api/beta.yaml diff --git a/pkg/config/api.go b/pkg/config/api.go index 509e61e56..ec7c4f86d 100644 --- a/pkg/config/api.go +++ b/pkg/config/api.go @@ -3,9 +3,9 @@ package config import ( "strings" - v1API "github.com/supabase/cli/v2/pkg/api" - "github.com/supabase/cli/v2/pkg/cast" - "github.com/supabase/cli/v2/pkg/diff" + v1API "github.com/supabase/cli/pkg/api" + "github.com/supabase/cli/pkg/cast" + "github.com/supabase/cli/pkg/diff" ) type ( diff --git a/pkg/config/api_test.go b/pkg/config/api_test.go index 951ea3c7c..92859c671 100644 --- a/pkg/config/api_test.go +++ b/pkg/config/api_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - v1API "github.com/supabase/cli/v2/pkg/api" + v1API "github.com/supabase/cli/pkg/api" ) func TestApiToUpdatePostgrestConfigBody(t *testing.T) { diff --git a/pkg/config/auth.go b/pkg/config/auth.go index c02923df7..5cb551cd1 100644 --- a/pkg/config/auth.go +++ b/pkg/config/auth.go @@ -5,9 +5,9 @@ import ( "strings" "time" - v1API "github.com/supabase/cli/v2/pkg/api" - "github.com/supabase/cli/v2/pkg/cast" - "github.com/supabase/cli/v2/pkg/diff" + v1API "github.com/supabase/cli/pkg/api" + "github.com/supabase/cli/pkg/cast" + "github.com/supabase/cli/pkg/diff" ) type PasswordRequirements string diff --git a/pkg/config/auth_test.go b/pkg/config/auth_test.go index 428a6d055..057c5ccdd 100644 --- a/pkg/config/auth_test.go +++ b/pkg/config/auth_test.go @@ -8,8 +8,8 @@ import ( "github.com/go-errors/errors" "github.com/stretchr/testify/assert" - v1API "github.com/supabase/cli/v2/pkg/api" - "github.com/supabase/cli/v2/pkg/cast" + v1API "github.com/supabase/cli/pkg/api" + "github.com/supabase/cli/pkg/cast" ) func newWithDefaults() auth { diff --git a/pkg/config/config.go b/pkg/config/config.go index 425e02c12..938016e83 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -30,8 +30,8 @@ import ( "github.com/joho/godotenv" "github.com/mitchellh/mapstructure" "github.com/spf13/viper" - "github.com/supabase/cli/v2/pkg/cast" - "github.com/supabase/cli/v2/pkg/fetcher" + "github.com/supabase/cli/pkg/cast" + "github.com/supabase/cli/pkg/fetcher" "golang.org/x/mod/semver" ) diff --git a/pkg/config/db.go b/pkg/config/db.go index e08176587..2a1d31cad 100644 --- a/pkg/config/db.go +++ b/pkg/config/db.go @@ -3,9 +3,9 @@ package config import ( "bytes" - v1API "github.com/supabase/cli/v2/pkg/api" - "github.com/supabase/cli/v2/pkg/cast" - "github.com/supabase/cli/v2/pkg/diff" + v1API "github.com/supabase/cli/pkg/api" + "github.com/supabase/cli/pkg/cast" + "github.com/supabase/cli/pkg/diff" ) type PoolMode string diff --git a/pkg/config/db_test.go b/pkg/config/db_test.go index 8e7006d14..575fd202d 100644 --- a/pkg/config/db_test.go +++ b/pkg/config/db_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - v1API "github.com/supabase/cli/v2/pkg/api" - "github.com/supabase/cli/v2/pkg/cast" + v1API "github.com/supabase/cli/pkg/api" + "github.com/supabase/cli/pkg/cast" ) func TestDbSettingsToUpdatePostgresConfigBody(t *testing.T) { diff --git a/pkg/config/storage.go b/pkg/config/storage.go index b56907895..b11b28a10 100644 --- a/pkg/config/storage.go +++ b/pkg/config/storage.go @@ -1,9 +1,9 @@ package config import ( - v1API "github.com/supabase/cli/v2/pkg/api" - "github.com/supabase/cli/v2/pkg/cast" - "github.com/supabase/cli/v2/pkg/diff" + v1API "github.com/supabase/cli/pkg/api" + "github.com/supabase/cli/pkg/cast" + "github.com/supabase/cli/pkg/diff" ) type ( diff --git a/pkg/config/updater.go b/pkg/config/updater.go index 7a6d08d08..445000d0b 100644 --- a/pkg/config/updater.go +++ b/pkg/config/updater.go @@ -6,7 +6,7 @@ import ( "os" "github.com/go-errors/errors" - v1API "github.com/supabase/cli/v2/pkg/api" + v1API "github.com/supabase/cli/pkg/api" ) type ConfigUpdater struct { diff --git a/pkg/config/updater_test.go b/pkg/config/updater_test.go index d595d60b6..471e84963 100644 --- a/pkg/config/updater_test.go +++ b/pkg/config/updater_test.go @@ -8,8 +8,8 @@ import ( "github.com/h2non/gock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - v1API "github.com/supabase/cli/v2/pkg/api" - "github.com/supabase/cli/v2/pkg/cast" + v1API "github.com/supabase/cli/pkg/api" + "github.com/supabase/cli/pkg/cast" ) func TestUpdateApi(t *testing.T) { diff --git a/pkg/function/api.go b/pkg/function/api.go index 622786dc4..e3f641dee 100644 --- a/pkg/function/api.go +++ b/pkg/function/api.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/supabase/cli/v2/pkg/api" + "github.com/supabase/cli/pkg/api" ) type EdgeRuntimeAPI struct { diff --git a/pkg/function/batch.go b/pkg/function/batch.go index 0b61375c9..43f837fc4 100644 --- a/pkg/function/batch.go +++ b/pkg/function/batch.go @@ -12,8 +12,8 @@ import ( "github.com/cenkalti/backoff/v4" "github.com/docker/go-units" "github.com/go-errors/errors" - "github.com/supabase/cli/v2/pkg/api" - "github.com/supabase/cli/v2/pkg/config" + "github.com/supabase/cli/pkg/api" + "github.com/supabase/cli/pkg/config" ) const ( diff --git a/pkg/function/batch_test.go b/pkg/function/batch_test.go index dfba2f4af..1489cd329 100644 --- a/pkg/function/batch_test.go +++ b/pkg/function/batch_test.go @@ -10,8 +10,8 @@ import ( "github.com/h2non/gock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/pkg/api" - "github.com/supabase/cli/v2/pkg/config" + "github.com/supabase/cli/pkg/api" + "github.com/supabase/cli/pkg/config" ) type MockBundler struct { diff --git a/pkg/migration/apply_test.go b/pkg/migration/apply_test.go index 060702f11..65a75028a 100644 --- a/pkg/migration/apply_test.go +++ b/pkg/migration/apply_test.go @@ -9,7 +9,7 @@ import ( "github.com/jackc/pgerrcode" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/pkg/pgtest" ) func TestPendingMigrations(t *testing.T) { diff --git a/pkg/migration/drop.go b/pkg/migration/drop.go index 68677ac26..362f2a9d2 100644 --- a/pkg/migration/drop.go +++ b/pkg/migration/drop.go @@ -7,7 +7,7 @@ import ( "github.com/go-errors/errors" "github.com/jackc/pgx/v4" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/pkg/pgxv5" ) var ( diff --git a/pkg/migration/drop_test.go b/pkg/migration/drop_test.go index a218d883f..d2c25ed56 100644 --- a/pkg/migration/drop_test.go +++ b/pkg/migration/drop_test.go @@ -6,7 +6,7 @@ import ( "github.com/jackc/pgerrcode" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/pkg/pgtest" ) var escapedSchemas = append(ManagedSchemas, "extensions", "public") diff --git a/pkg/migration/file.go b/pkg/migration/file.go index d0bed5ad7..79da1c86a 100644 --- a/pkg/migration/file.go +++ b/pkg/migration/file.go @@ -14,7 +14,7 @@ import ( "github.com/jackc/pgtype" "github.com/jackc/pgx/v4" "github.com/spf13/viper" - "github.com/supabase/cli/v2/pkg/parser" + "github.com/supabase/cli/pkg/parser" ) type MigrationFile struct { diff --git a/pkg/migration/file_test.go b/pkg/migration/file_test.go index 3b2877c52..a38238f8d 100644 --- a/pkg/migration/file_test.go +++ b/pkg/migration/file_test.go @@ -10,8 +10,8 @@ import ( "github.com/jackc/pgerrcode" "github.com/spf13/viper" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/pkg/parser" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/pkg/parser" + "github.com/supabase/cli/pkg/pgtest" ) func TestMigrationFile(t *testing.T) { diff --git a/pkg/migration/history.go b/pkg/migration/history.go index 3e6f8a362..2ca14167b 100644 --- a/pkg/migration/history.go +++ b/pkg/migration/history.go @@ -6,7 +6,7 @@ import ( "github.com/go-errors/errors" "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/pkg/pgxv5" ) const ( diff --git a/pkg/migration/list.go b/pkg/migration/list.go index dfe9837bf..ec8bf2ac8 100644 --- a/pkg/migration/list.go +++ b/pkg/migration/list.go @@ -13,7 +13,7 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgerrcode" "github.com/jackc/pgx/v4" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/pkg/pgxv5" ) func ListRemoteMigrations(ctx context.Context, conn *pgx.Conn) ([]string, error) { diff --git a/pkg/migration/list_test.go b/pkg/migration/list_test.go index 40a193489..80d09fd40 100644 --- a/pkg/migration/list_test.go +++ b/pkg/migration/list_test.go @@ -7,7 +7,7 @@ import ( "github.com/jackc/pgerrcode" "github.com/stretchr/testify/assert" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/pkg/pgtest" ) func TestRemoteMigrations(t *testing.T) { diff --git a/pkg/migration/seed_test.go b/pkg/migration/seed_test.go index 1d228e531..7e9cd4aca 100644 --- a/pkg/migration/seed_test.go +++ b/pkg/migration/seed_test.go @@ -11,7 +11,7 @@ import ( "github.com/jackc/pgx/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/supabase/cli/v2/pkg/pgtest" + "github.com/supabase/cli/pkg/pgtest" ) //go:embed testdata/seed.sql diff --git a/pkg/parser/token.go b/pkg/parser/token.go index b939ae6cb..db0084342 100644 --- a/pkg/parser/token.go +++ b/pkg/parser/token.go @@ -8,7 +8,7 @@ import ( "github.com/go-errors/errors" "github.com/spf13/viper" - "github.com/supabase/cli/v2/pkg/cast" + "github.com/supabase/cli/pkg/cast" ) // Equal to `startBufSize` from `bufio/scan.go` diff --git a/pkg/pgtest/mock.go b/pkg/pgtest/mock.go index daa1dbd2a..0f5e9bb84 100644 --- a/pkg/pgtest/mock.go +++ b/pkg/pgtest/mock.go @@ -12,7 +12,7 @@ import ( "github.com/jackc/pgproto3/v2" "github.com/jackc/pgtype" "github.com/jackc/pgx/v4" - "github.com/supabase/cli/v2/pkg/pgxv5" + "github.com/supabase/cli/pkg/pgxv5" "google.golang.org/grpc/test/bufconn" ) diff --git a/pkg/storage/api.go b/pkg/storage/api.go index 3904b52e8..e7765eb9f 100644 --- a/pkg/storage/api.go +++ b/pkg/storage/api.go @@ -1,6 +1,6 @@ package storage -import "github.com/supabase/cli/v2/pkg/fetcher" +import "github.com/supabase/cli/pkg/fetcher" type StorageAPI struct { *fetcher.Fetcher diff --git a/pkg/storage/batch.go b/pkg/storage/batch.go index dc54515b5..8a681242d 100644 --- a/pkg/storage/batch.go +++ b/pkg/storage/batch.go @@ -9,8 +9,8 @@ import ( "path/filepath" "github.com/go-errors/errors" - "github.com/supabase/cli/v2/pkg/config" - "github.com/supabase/cli/v2/pkg/queue" + "github.com/supabase/cli/pkg/config" + "github.com/supabase/cli/pkg/queue" ) func (s *StorageAPI) UpsertBuckets(ctx context.Context, bucketConfig config.BucketConfig, filter ...func(string) bool) error { diff --git a/pkg/storage/buckets.go b/pkg/storage/buckets.go index b2d4fc255..1f4bf9cc8 100644 --- a/pkg/storage/buckets.go +++ b/pkg/storage/buckets.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/supabase/cli/v2/pkg/fetcher" + "github.com/supabase/cli/pkg/fetcher" ) type BucketResponse struct { diff --git a/pkg/storage/objects.go b/pkg/storage/objects.go index 3a5633cf0..f048cecf6 100644 --- a/pkg/storage/objects.go +++ b/pkg/storage/objects.go @@ -11,7 +11,7 @@ import ( "github.com/go-errors/errors" "github.com/spf13/afero" - "github.com/supabase/cli/v2/pkg/fetcher" + "github.com/supabase/cli/pkg/fetcher" ) type ListObjectsQuery struct { diff --git a/tools/bumpdoc/main.go b/tools/bumpdoc/main.go index 10a86772e..55d9de344 100644 --- a/tools/bumpdoc/main.go +++ b/tools/bumpdoc/main.go @@ -12,8 +12,8 @@ import ( "regexp" "github.com/google/go-github/v62/github" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/tools/shared" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/tools/shared" ) const ( diff --git a/tools/changelog/main.go b/tools/changelog/main.go index 84ce70eca..97b587ed4 100644 --- a/tools/changelog/main.go +++ b/tools/changelog/main.go @@ -14,7 +14,7 @@ import ( "github.com/google/go-github/v62/github" "github.com/slack-go/slack" - "github.com/supabase/cli/v2/internal/utils" + "github.com/supabase/cli/internal/utils" ) func main() { diff --git a/tools/listdep/main.go b/tools/listdep/main.go index 6d28db52c..bf3c88985 100644 --- a/tools/listdep/main.go +++ b/tools/listdep/main.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "github.com/supabase/cli/v2/pkg/config" + "github.com/supabase/cli/pkg/config" ) func main() { diff --git a/tools/publish/main.go b/tools/publish/main.go index c9944a293..be2474edb 100644 --- a/tools/publish/main.go +++ b/tools/publish/main.go @@ -16,9 +16,9 @@ import ( "text/template" "github.com/google/go-github/v62/github" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/fetcher" - "github.com/supabase/cli/v2/tools/shared" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/fetcher" + "github.com/supabase/cli/tools/shared" ) const ( diff --git a/tools/selfhost/main.go b/tools/selfhost/main.go index 145c53801..cb9ada3a0 100644 --- a/tools/selfhost/main.go +++ b/tools/selfhost/main.go @@ -11,9 +11,9 @@ import ( "strings" "github.com/google/go-github/v62/github" - "github.com/supabase/cli/v2/internal/utils" - "github.com/supabase/cli/v2/pkg/config" - "github.com/supabase/cli/v2/tools/shared" + "github.com/supabase/cli/internal/utils" + "github.com/supabase/cli/pkg/config" + "github.com/supabase/cli/tools/shared" "gopkg.in/yaml.v3" )