From 02fac6a4dfd1b3b796105684a0934f0e4dfaf433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 1 Aug 2023 12:35:48 +0200 Subject: [PATCH] Change Go package name from git.blender.org to projects.blender.org Change the package base name of the Go code, from `git.blender.org/flamenco` to `projects.blender.org/studio/flamenco`. The old location, `git.blender.org`, has no longer been use since the [migration to Gitea][1]. The new package names now reflect the actual location where Flamenco is hosted. [1]: https://code.blender.org/2023/02/new-blender-development-infrastructure/ --- Makefile | 2 +- cmd/addon-packer/addon-packer.go | 2 +- cmd/flamenco-manager/main.go | 34 +++++++++---------- cmd/flamenco-manager/webservice.go | 14 ++++---- cmd/flamenco-worker/find_exes.go | 4 +-- cmd/flamenco-worker/main.go | 6 ++-- cmd/job-creator/main.go | 10 +++--- cmd/shaman-checkout-id-setter/main.go | 8 ++--- cmd/stresser/main.go | 4 +-- go.mod | 2 +- internal/find_blender/find_blender.go | 4 +-- internal/manager/api_impl/api_impl.go | 2 +- internal/manager/api_impl/dummy/shaman.go | 4 +-- internal/manager/api_impl/interfaces.go | 22 ++++++------ internal/manager/api_impl/jobs.go | 12 +++---- internal/manager/api_impl/jobs_query.go | 6 ++-- internal/manager/api_impl/jobs_query_test.go | 4 +-- internal/manager/api_impl/jobs_test.go | 12 +++---- internal/manager/api_impl/meta.go | 8 ++--- internal/manager/api_impl/meta_test.go | 4 +-- .../api_impl/mocks/api_impl_mock.gen.go | 12 +++---- .../manager/api_impl/mocks/varrepl.gen.go | 4 +-- internal/manager/api_impl/shaman.go | 4 +-- internal/manager/api_impl/support_test.go | 8 ++--- internal/manager/api_impl/varrepl.go | 8 ++--- internal/manager/api_impl/varrepl_test.go | 8 ++--- internal/manager/api_impl/worker_auth.go | 2 +- internal/manager/api_impl/worker_mgt.go | 8 ++--- internal/manager/api_impl/worker_mgt_test.go | 4 +-- .../manager/api_impl/worker_sleep_schedule.go | 6 ++-- .../manager/api_impl/worker_task_updates.go | 6 ++-- .../api_impl/worker_task_updates_test.go | 6 ++-- internal/manager/api_impl/workers.go | 12 +++---- internal/manager/api_impl/workers_test.go | 8 ++--- internal/manager/config/config.go | 6 ++-- internal/manager/config/defaults.go | 2 +- internal/manager/config/settings_test.go | 2 +- internal/manager/config/variables.go | 2 +- internal/manager/job_compilers/author.go | 4 +-- .../manager/job_compilers/job_compilers.go | 4 +-- .../job_compilers/job_compilers_test.go | 2 +- internal/manager/job_compilers/js_path.go | 2 +- internal/manager/job_deleter/interfaces.go | 12 +++---- internal/manager/job_deleter/job_deleter.go | 8 ++--- .../manager/job_deleter/job_deleter_test.go | 6 ++-- .../job_deleter/mocks/interfaces_mock.gen.go | 6 ++-- .../last_rendered/last_rendered_test.go | 2 +- .../manager/local_storage/local_storage.go | 2 +- internal/manager/persistence/db.go | 2 +- internal/manager/persistence/jobs.go | 4 +-- internal/manager/persistence/jobs_query.go | 2 +- .../manager/persistence/jobs_query_test.go | 6 ++-- internal/manager/persistence/jobs_test.go | 6 ++-- .../manager/persistence/task_scheduler.go | 2 +- .../persistence/task_scheduler_test.go | 6 ++-- internal/manager/persistence/test_support.go | 4 +-- internal/manager/persistence/timeout.go | 2 +- internal/manager/persistence/timeout_test.go | 2 +- .../persistence/worker_sleep_schedule_test.go | 4 +-- .../manager/persistence/worker_tag_test.go | 2 +- internal/manager/persistence/workers.go | 2 +- internal/manager/persistence/workers_test.go | 4 +-- .../manager/sleep_scheduler/calculations.go | 4 +-- .../sleep_scheduler/calculations_test.go | 4 +-- .../manager/sleep_scheduler/interfaces.go | 8 ++--- .../mocks/interfaces_mock.gen.go | 6 ++-- .../sleep_scheduler/sleep_scheduler.go | 4 +-- .../sleep_scheduler/sleep_scheduler_test.go | 6 ++-- .../task_logs/mocks/interfaces_mock.gen.go | 4 +-- internal/manager/task_logs/task_logs.go | 6 ++-- internal/manager/task_logs/task_logs_test.go | 2 +- .../manager/task_state_machine/interfaces.go | 10 +++--- .../mocks/interfaces_mock.gen.go | 6 ++-- .../task_state_machine/task_state_machine.go | 6 ++-- .../task_state_machine_test.go | 6 ++-- .../task_state_machine/task_statuses.go | 2 +- .../task_state_machine/worker_requeue.go | 4 +-- .../task_state_machine/worker_requeue_test.go | 4 +-- .../manager/timeout_checker/interfaces.go | 10 +++--- .../mocks/interfaces_mock.gen.go | 6 ++-- internal/manager/timeout_checker/tasks.go | 4 +-- .../manager/timeout_checker/tasks_test.go | 4 +-- .../timeout_checker/timeout_checker_test.go | 2 +- internal/manager/timeout_checker/workers.go | 4 +-- .../manager/timeout_checker/workers_test.go | 4 +-- internal/manager/webupdates/job_updates.go | 4 +-- internal/manager/webupdates/sio_rooms.go | 4 +-- internal/manager/webupdates/worker_updates.go | 4 +-- internal/stresser/fake_config.go | 2 +- internal/stresser/fake_worker.go | 4 +-- internal/stresser/stresser.go | 4 +-- internal/upnp_ssdp/server.go | 2 +- internal/worker/autodiscovery.go | 4 +-- internal/worker/client.go | 4 +-- internal/worker/command_blender.go | 6 ++-- internal/worker/command_blender_test.go | 2 +- internal/worker/command_exe.go | 8 ++--- internal/worker/command_exe_test.go | 4 +-- internal/worker/command_ffmpeg.go | 6 ++-- internal/worker/command_ffmpeg_test.go | 2 +- internal/worker/command_file_mgmt.go | 2 +- internal/worker/command_file_mgmt_test.go | 2 +- internal/worker/command_misc.go | 2 +- internal/worker/command_misc_test.go | 2 +- internal/worker/config.go | 2 +- internal/worker/errors.go | 2 +- internal/worker/listener.go | 2 +- internal/worker/log_chunker_test.go | 2 +- internal/worker/mocks/cli_runner.gen.go | 4 +-- internal/worker/mocks/client.gen.go | 4 +-- internal/worker/mocks/command_listener.gen.go | 2 +- .../worker/mocks/task_exe_listener.gen.go | 2 +- internal/worker/output_uploader.go | 2 +- internal/worker/output_uploader_test.go | 4 +-- .../worker/persistence/upstream_buffer.go | 2 +- internal/worker/registration.go | 4 +-- internal/worker/state_asleep.go | 2 +- internal/worker/state_awake.go | 2 +- internal/worker/state_offline.go | 2 +- internal/worker/statemachine.go | 2 +- internal/worker/statemonitor.go | 2 +- internal/worker/task_executor.go | 4 +-- internal/worker/upstream_buffer.go | 4 +-- internal/worker/upstream_buffer_test.go | 4 +-- internal/worker/worker.go | 2 +- pkg/shaman/checkout/checkout.go | 4 +-- pkg/shaman/checkout/checkout_test.go | 4 +-- pkg/shaman/checkout/manager.go | 6 ++-- pkg/shaman/checkout/manager_test.go | 6 ++-- pkg/shaman/checkout/report_requirements.go | 4 +-- .../checkout/report_requirements_test.go | 2 +- pkg/shaman/cleanup_test.go | 6 ++-- pkg/shaman/fileserver/checkfile.go | 2 +- pkg/shaman/fileserver/fileserver.go | 2 +- pkg/shaman/fileserver/receivefile.go | 4 +-- pkg/shaman/fileserver/receivefile_test.go | 6 ++-- pkg/shaman/filestore/filestore.go | 2 +- pkg/shaman/filestore/testing.go | 2 +- pkg/shaman/server.go | 12 +++---- .../development/flamenco-api/_index.md | 2 +- 140 files changed, 336 insertions(+), 336 deletions(-) diff --git a/Makefile b/Makefile index ddb97701..44f0fb50 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ -include .env -PKG := git.blender.org/flamenco +PKG := projects.blender.org/studio/flamenco # To update the version number in all the relevant places, update the VERSION # variable below and run `make update-version`. diff --git a/cmd/addon-packer/addon-packer.go b/cmd/addon-packer/addon-packer.go index 67e3114b..bfcbc82b 100644 --- a/cmd/addon-packer/addon-packer.go +++ b/cmd/addon-packer/addon-packer.go @@ -18,7 +18,7 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "git.blender.org/flamenco/internal/appinfo" + "projects.blender.org/studio/flamenco/internal/appinfo" ) var cliArgs struct { diff --git a/cmd/flamenco-manager/main.go b/cmd/flamenco-manager/main.go index bc92f214..7ca961ac 100644 --- a/cmd/flamenco-manager/main.go +++ b/cmd/flamenco-manager/main.go @@ -22,23 +22,23 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "git.blender.org/flamenco/internal/appinfo" - "git.blender.org/flamenco/internal/manager/api_impl" - "git.blender.org/flamenco/internal/manager/api_impl/dummy" - "git.blender.org/flamenco/internal/manager/config" - "git.blender.org/flamenco/internal/manager/job_compilers" - "git.blender.org/flamenco/internal/manager/job_deleter" - "git.blender.org/flamenco/internal/manager/last_rendered" - "git.blender.org/flamenco/internal/manager/local_storage" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/internal/manager/sleep_scheduler" - "git.blender.org/flamenco/internal/manager/task_logs" - "git.blender.org/flamenco/internal/manager/task_state_machine" - "git.blender.org/flamenco/internal/manager/timeout_checker" - "git.blender.org/flamenco/internal/manager/webupdates" - "git.blender.org/flamenco/internal/own_url" - "git.blender.org/flamenco/internal/upnp_ssdp" - "git.blender.org/flamenco/pkg/shaman" + "projects.blender.org/studio/flamenco/internal/appinfo" + "projects.blender.org/studio/flamenco/internal/manager/api_impl" + "projects.blender.org/studio/flamenco/internal/manager/api_impl/dummy" + "projects.blender.org/studio/flamenco/internal/manager/config" + "projects.blender.org/studio/flamenco/internal/manager/job_compilers" + "projects.blender.org/studio/flamenco/internal/manager/job_deleter" + "projects.blender.org/studio/flamenco/internal/manager/last_rendered" + "projects.blender.org/studio/flamenco/internal/manager/local_storage" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/internal/manager/sleep_scheduler" + "projects.blender.org/studio/flamenco/internal/manager/task_logs" + "projects.blender.org/studio/flamenco/internal/manager/task_state_machine" + "projects.blender.org/studio/flamenco/internal/manager/timeout_checker" + "projects.blender.org/studio/flamenco/internal/manager/webupdates" + "projects.blender.org/studio/flamenco/internal/own_url" + "projects.blender.org/studio/flamenco/internal/upnp_ssdp" + "projects.blender.org/studio/flamenco/pkg/shaman" ) var cliArgs struct { diff --git a/cmd/flamenco-manager/webservice.go b/cmd/flamenco-manager/webservice.go index d07c8c63..df6359b7 100644 --- a/cmd/flamenco-manager/webservice.go +++ b/cmd/flamenco-manager/webservice.go @@ -19,13 +19,13 @@ import ( "github.com/rs/zerolog/log" "github.com/ziflex/lecho/v3" - "git.blender.org/flamenco/internal/manager/api_impl" - "git.blender.org/flamenco/internal/manager/local_storage" - "git.blender.org/flamenco/internal/manager/swagger_ui" - "git.blender.org/flamenco/internal/manager/webupdates" - "git.blender.org/flamenco/internal/upnp_ssdp" - "git.blender.org/flamenco/pkg/api" - "git.blender.org/flamenco/web" + "projects.blender.org/studio/flamenco/internal/manager/api_impl" + "projects.blender.org/studio/flamenco/internal/manager/local_storage" + "projects.blender.org/studio/flamenco/internal/manager/swagger_ui" + "projects.blender.org/studio/flamenco/internal/manager/webupdates" + "projects.blender.org/studio/flamenco/internal/upnp_ssdp" + "projects.blender.org/studio/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/web" ) func buildWebService( diff --git a/cmd/flamenco-worker/find_exes.go b/cmd/flamenco-worker/find_exes.go index 72f0a1de..45ef70d7 100644 --- a/cmd/flamenco-worker/find_exes.go +++ b/cmd/flamenco-worker/find_exes.go @@ -9,8 +9,8 @@ import ( "github.com/rs/zerolog/log" - "git.blender.org/flamenco/internal/find_blender" - "git.blender.org/flamenco/internal/find_ffmpeg" + "projects.blender.org/studio/flamenco/internal/find_blender" + "projects.blender.org/studio/flamenco/internal/find_ffmpeg" ) // findFFmpeg tries to find FFmpeg, in order to show its version (if found) or a warning (if not). diff --git a/cmd/flamenco-worker/main.go b/cmd/flamenco-worker/main.go index 700e27c4..f492be7c 100644 --- a/cmd/flamenco-worker/main.go +++ b/cmd/flamenco-worker/main.go @@ -20,9 +20,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "git.blender.org/flamenco/internal/appinfo" - "git.blender.org/flamenco/internal/worker" - "git.blender.org/flamenco/internal/worker/cli_runner" + "projects.blender.org/studio/flamenco/internal/appinfo" + "projects.blender.org/studio/flamenco/internal/worker" + "projects.blender.org/studio/flamenco/internal/worker/cli_runner" ) var ( diff --git a/cmd/job-creator/main.go b/cmd/job-creator/main.go index 34699b99..6203569c 100644 --- a/cmd/job-creator/main.go +++ b/cmd/job-creator/main.go @@ -18,11 +18,11 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "git.blender.org/flamenco/internal/appinfo" - "git.blender.org/flamenco/internal/manager/config" - "git.blender.org/flamenco/internal/manager/job_compilers" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/appinfo" + "projects.blender.org/studio/flamenco/internal/manager/config" + "projects.blender.org/studio/flamenco/internal/manager/job_compilers" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/pkg/api" ) var cliArgs struct { diff --git a/cmd/shaman-checkout-id-setter/main.go b/cmd/shaman-checkout-id-setter/main.go index b12e3d6c..abb3dfba 100644 --- a/cmd/shaman-checkout-id-setter/main.go +++ b/cmd/shaman-checkout-id-setter/main.go @@ -18,10 +18,10 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "git.blender.org/flamenco/internal/appinfo" - "git.blender.org/flamenco/internal/manager/config" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/appinfo" + "projects.blender.org/studio/flamenco/internal/manager/config" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/pkg/api" ) func main() { diff --git a/cmd/stresser/main.go b/cmd/stresser/main.go index 878c8304..751af94b 100644 --- a/cmd/stresser/main.go +++ b/cmd/stresser/main.go @@ -15,8 +15,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "git.blender.org/flamenco/internal/appinfo" - "git.blender.org/flamenco/internal/stresser" + "projects.blender.org/studio/flamenco/internal/appinfo" + "projects.blender.org/studio/flamenco/internal/stresser" ) var cliArgs struct { diff --git a/go.mod b/go.mod index 809807bd..221c3475 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module git.blender.org/flamenco +module projects.blender.org/studio/flamenco go 1.20 diff --git a/internal/find_blender/find_blender.go b/internal/find_blender/find_blender.go index 6b36c6d6..a5503a2c 100644 --- a/internal/find_blender/find_blender.go +++ b/internal/find_blender/find_blender.go @@ -12,9 +12,9 @@ import ( "strings" "time" - "git.blender.org/flamenco/pkg/api" - "git.blender.org/flamenco/pkg/crosspath" "github.com/rs/zerolog/log" + "projects.blender.org/studio/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/crosspath" ) var ( diff --git a/internal/manager/api_impl/api_impl.go b/internal/manager/api_impl/api_impl.go index f95a87c9..6e109481 100644 --- a/internal/manager/api_impl/api_impl.go +++ b/internal/manager/api_impl/api_impl.go @@ -11,8 +11,8 @@ import ( "sync" "time" - "git.blender.org/flamenco/pkg/api" "github.com/labstack/echo/v4" + "projects.blender.org/studio/flamenco/pkg/api" ) type Flamenco struct { diff --git a/internal/manager/api_impl/dummy/shaman.go b/internal/manager/api_impl/dummy/shaman.go index 39ae88d7..cd249405 100644 --- a/internal/manager/api_impl/dummy/shaman.go +++ b/internal/manager/api_impl/dummy/shaman.go @@ -7,8 +7,8 @@ import ( "errors" "io" - "git.blender.org/flamenco/internal/manager/api_impl" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/manager/api_impl" + "projects.blender.org/studio/flamenco/pkg/api" ) // DummyShaman implements the Shaman interface from `internal/manager/api_impl/interfaces.go` diff --git a/internal/manager/api_impl/interfaces.go b/internal/manager/api_impl/interfaces.go index 7b0c5c31..c33fd76e 100644 --- a/internal/manager/api_impl/interfaces.go +++ b/internal/manager/api_impl/interfaces.go @@ -13,20 +13,20 @@ import ( "github.com/benbjohnson/clock" "github.com/rs/zerolog" - "git.blender.org/flamenco/internal/manager/config" - "git.blender.org/flamenco/internal/manager/job_compilers" - "git.blender.org/flamenco/internal/manager/job_deleter" - "git.blender.org/flamenco/internal/manager/last_rendered" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/internal/manager/sleep_scheduler" - "git.blender.org/flamenco/internal/manager/task_state_machine" - "git.blender.org/flamenco/internal/manager/webupdates" - "git.blender.org/flamenco/pkg/api" - "git.blender.org/flamenco/pkg/shaman" + "projects.blender.org/studio/flamenco/internal/manager/config" + "projects.blender.org/studio/flamenco/internal/manager/job_compilers" + "projects.blender.org/studio/flamenco/internal/manager/job_deleter" + "projects.blender.org/studio/flamenco/internal/manager/last_rendered" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/internal/manager/sleep_scheduler" + "projects.blender.org/studio/flamenco/internal/manager/task_state_machine" + "projects.blender.org/studio/flamenco/internal/manager/webupdates" + "projects.blender.org/studio/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/shaman" ) // Generate mock implementations of these interfaces. -//go:generate go run github.com/golang/mock/mockgen -destination mocks/api_impl_mock.gen.go -package mocks git.blender.org/flamenco/internal/manager/api_impl PersistenceService,ChangeBroadcaster,JobCompiler,LogStorage,ConfigService,TaskStateMachine,Shaman,LastRendered,LocalStorage,WorkerSleepScheduler,JobDeleter +//go:generate go run github.com/golang/mock/mockgen -destination mocks/api_impl_mock.gen.go -package mocks projects.blender.org/studio/flamenco/internal/manager/api_impl PersistenceService,ChangeBroadcaster,JobCompiler,LogStorage,ConfigService,TaskStateMachine,Shaman,LastRendered,LocalStorage,WorkerSleepScheduler,JobDeleter type PersistenceService interface { StoreAuthoredJob(ctx context.Context, authoredJob job_compilers.AuthoredJob) error diff --git a/internal/manager/api_impl/jobs.go b/internal/manager/api_impl/jobs.go index aca62069..390cf845 100644 --- a/internal/manager/api_impl/jobs.go +++ b/internal/manager/api_impl/jobs.go @@ -15,12 +15,12 @@ import ( "github.com/labstack/echo/v4" "github.com/rs/zerolog" - "git.blender.org/flamenco/internal/manager/job_compilers" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/internal/manager/webupdates" - "git.blender.org/flamenco/internal/uuid" - "git.blender.org/flamenco/pkg/api" - "git.blender.org/flamenco/pkg/crosspath" + "projects.blender.org/studio/flamenco/internal/manager/job_compilers" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/internal/manager/webupdates" + "projects.blender.org/studio/flamenco/internal/uuid" + "projects.blender.org/studio/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/crosspath" ) // JobFilesURLPrefix is the URL prefix that the Flamenco API expects to serve diff --git a/internal/manager/api_impl/jobs_query.go b/internal/manager/api_impl/jobs_query.go index f2218055..bafe39bf 100644 --- a/internal/manager/api_impl/jobs_query.go +++ b/internal/manager/api_impl/jobs_query.go @@ -9,9 +9,9 @@ import ( "github.com/labstack/echo/v4" "github.com/rs/zerolog" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/internal/uuid" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/internal/uuid" + "projects.blender.org/studio/flamenco/pkg/api" ) // fetchJob fetches the job from the database, and sends the appropriate error diff --git a/internal/manager/api_impl/jobs_query_test.go b/internal/manager/api_impl/jobs_query_test.go index 74abd0b2..3fc57158 100644 --- a/internal/manager/api_impl/jobs_query_test.go +++ b/internal/manager/api_impl/jobs_query_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/pkg/api" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/pkg/api" ) func TestQueryJobs(t *testing.T) { diff --git a/internal/manager/api_impl/jobs_test.go b/internal/manager/api_impl/jobs_test.go index fa666fe8..a38868ff 100644 --- a/internal/manager/api_impl/jobs_test.go +++ b/internal/manager/api_impl/jobs_test.go @@ -9,15 +9,15 @@ import ( "os" "testing" - "git.blender.org/flamenco/internal/manager/config" - "git.blender.org/flamenco/internal/manager/job_compilers" - "git.blender.org/flamenco/internal/manager/last_rendered" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/pkg/api" - "git.blender.org/flamenco/pkg/moremock" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "projects.blender.org/studio/flamenco/internal/manager/config" + "projects.blender.org/studio/flamenco/internal/manager/job_compilers" + "projects.blender.org/studio/flamenco/internal/manager/last_rendered" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/moremock" ) func ptr[T any](value T) *T { diff --git a/internal/manager/api_impl/meta.go b/internal/manager/api_impl/meta.go index 8f597afd..c647270b 100644 --- a/internal/manager/api_impl/meta.go +++ b/internal/manager/api_impl/meta.go @@ -14,11 +14,11 @@ import ( "strconv" "strings" - "git.blender.org/flamenco/internal/appinfo" - "git.blender.org/flamenco/internal/find_blender" - "git.blender.org/flamenco/internal/manager/config" - "git.blender.org/flamenco/pkg/api" "github.com/labstack/echo/v4" + "projects.blender.org/studio/flamenco/internal/appinfo" + "projects.blender.org/studio/flamenco/internal/find_blender" + "projects.blender.org/studio/flamenco/internal/manager/config" + "projects.blender.org/studio/flamenco/pkg/api" ) func (f *Flamenco) GetVersion(e echo.Context) error { diff --git a/internal/manager/api_impl/meta_test.go b/internal/manager/api_impl/meta_test.go index ab9f013e..ec0d366a 100644 --- a/internal/manager/api_impl/meta_test.go +++ b/internal/manager/api_impl/meta_test.go @@ -11,12 +11,12 @@ import ( "runtime" "testing" - "git.blender.org/flamenco/internal/manager/config" - "git.blender.org/flamenco/pkg/api" "github.com/golang/mock/gomock" "github.com/labstack/echo/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "projects.blender.org/studio/flamenco/internal/manager/config" + "projects.blender.org/studio/flamenco/pkg/api" ) func TestGetVariables(t *testing.T) { diff --git a/internal/manager/api_impl/mocks/api_impl_mock.gen.go b/internal/manager/api_impl/mocks/api_impl_mock.gen.go index 08b7e319..cd5726d8 100644 --- a/internal/manager/api_impl/mocks/api_impl_mock.gen.go +++ b/internal/manager/api_impl/mocks/api_impl_mock.gen.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: git.blender.org/flamenco/internal/manager/api_impl (interfaces: PersistenceService,ChangeBroadcaster,JobCompiler,LogStorage,ConfigService,TaskStateMachine,Shaman,LastRendered,LocalStorage,WorkerSleepScheduler,JobDeleter) +// Source: projects.blender.org/studio/flamenco/internal/manager/api_impl (interfaces: PersistenceService,ChangeBroadcaster,JobCompiler,LogStorage,ConfigService,TaskStateMachine,Shaman,LastRendered,LocalStorage,WorkerSleepScheduler,JobDeleter) // Package mocks is a generated GoMock package. package mocks @@ -9,13 +9,13 @@ import ( io "io" reflect "reflect" - config "git.blender.org/flamenco/internal/manager/config" - job_compilers "git.blender.org/flamenco/internal/manager/job_compilers" - last_rendered "git.blender.org/flamenco/internal/manager/last_rendered" - persistence "git.blender.org/flamenco/internal/manager/persistence" - api "git.blender.org/flamenco/pkg/api" gomock "github.com/golang/mock/gomock" zerolog "github.com/rs/zerolog" + config "projects.blender.org/studio/flamenco/internal/manager/config" + job_compilers "projects.blender.org/studio/flamenco/internal/manager/job_compilers" + last_rendered "projects.blender.org/studio/flamenco/internal/manager/last_rendered" + persistence "projects.blender.org/studio/flamenco/internal/manager/persistence" + api "projects.blender.org/studio/flamenco/pkg/api" ) // MockPersistenceService is a mock of PersistenceService interface. diff --git a/internal/manager/api_impl/mocks/varrepl.gen.go b/internal/manager/api_impl/mocks/varrepl.gen.go index 7a9f3aa9..6acc804b 100644 --- a/internal/manager/api_impl/mocks/varrepl.gen.go +++ b/internal/manager/api_impl/mocks/varrepl.gen.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: git.blender.org/flamenco/internal/manager/api_impl (interfaces: VariableReplacer) +// Source: projects.blender.org/studio/flamenco/internal/manager/api_impl (interfaces: VariableReplacer) // Package mocks is a generated GoMock package. package mocks @@ -7,8 +7,8 @@ package mocks import ( reflect "reflect" - config "git.blender.org/flamenco/internal/manager/config" gomock "github.com/golang/mock/gomock" + config "projects.blender.org/studio/flamenco/internal/manager/config" ) // MockVariableReplacer is a mock of VariableReplacer interface. diff --git a/internal/manager/api_impl/shaman.go b/internal/manager/api_impl/shaman.go index 2e972c18..0596c203 100644 --- a/internal/manager/api_impl/shaman.go +++ b/internal/manager/api_impl/shaman.go @@ -7,8 +7,8 @@ import ( "github.com/labstack/echo/v4" - "git.blender.org/flamenco/pkg/api" - "git.blender.org/flamenco/pkg/shaman/fileserver" + "projects.blender.org/studio/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/shaman/fileserver" ) func (f *Flamenco) isShamanEnabled() bool { diff --git a/internal/manager/api_impl/support_test.go b/internal/manager/api_impl/support_test.go index 972d8c8e..4a7ea588 100644 --- a/internal/manager/api_impl/support_test.go +++ b/internal/manager/api_impl/support_test.go @@ -17,10 +17,10 @@ import ( "github.com/labstack/echo/v4" "github.com/stretchr/testify/assert" - "git.blender.org/flamenco/internal/manager/api_impl/mocks" - "git.blender.org/flamenco/internal/manager/config" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/manager/api_impl/mocks" + "projects.blender.org/studio/flamenco/internal/manager/config" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/pkg/api" ) type mockedFlamenco struct { diff --git a/internal/manager/api_impl/varrepl.go b/internal/manager/api_impl/varrepl.go index f70cedfe..4ce8313d 100644 --- a/internal/manager/api_impl/varrepl.go +++ b/internal/manager/api_impl/varrepl.go @@ -3,12 +3,12 @@ package api_impl // SPDX-License-Identifier: GPL-3.0-or-later import ( - "git.blender.org/flamenco/internal/manager/config" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/manager/config" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/pkg/api" ) -//go:generate go run github.com/golang/mock/mockgen -destination mocks/varrepl.gen.go -package mocks git.blender.org/flamenco/internal/manager/api_impl VariableReplacer +//go:generate go run github.com/golang/mock/mockgen -destination mocks/varrepl.gen.go -package mocks projects.blender.org/studio/flamenco/internal/manager/api_impl VariableReplacer type VariableReplacer interface { NewVariableExpander(audience config.VariableAudience, platform config.VariablePlatform) *config.VariableExpander ResolveVariables(audience config.VariableAudience, platform config.VariablePlatform) map[string]config.ResolvedVariable diff --git a/internal/manager/api_impl/varrepl_test.go b/internal/manager/api_impl/varrepl_test.go index 38a579dc..5eaa080c 100644 --- a/internal/manager/api_impl/varrepl_test.go +++ b/internal/manager/api_impl/varrepl_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/assert" - "git.blender.org/flamenco/internal/manager/config" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/pkg/api" - "git.blender.org/flamenco/pkg/crosspath" + "projects.blender.org/studio/flamenco/internal/manager/config" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/crosspath" ) func varreplTestTask() api.AssignedTask { diff --git a/internal/manager/api_impl/worker_auth.go b/internal/manager/api_impl/worker_auth.go index c7d8beb6..e8d4cdc3 100644 --- a/internal/manager/api_impl/worker_auth.go +++ b/internal/manager/api_impl/worker_auth.go @@ -13,7 +13,7 @@ import ( "github.com/labstack/echo/v4" "golang.org/x/crypto/bcrypt" - "git.blender.org/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/internal/manager/persistence" ) type workerContextKey string diff --git a/internal/manager/api_impl/worker_mgt.go b/internal/manager/api_impl/worker_mgt.go index 509f525f..f8a9db0b 100644 --- a/internal/manager/api_impl/worker_mgt.go +++ b/internal/manager/api_impl/worker_mgt.go @@ -6,11 +6,11 @@ import ( "errors" "net/http" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/internal/manager/webupdates" - "git.blender.org/flamenco/internal/uuid" - "git.blender.org/flamenco/pkg/api" "github.com/labstack/echo/v4" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/internal/manager/webupdates" + "projects.blender.org/studio/flamenco/internal/uuid" + "projects.blender.org/studio/flamenco/pkg/api" ) func (f *Flamenco) FetchWorkers(e echo.Context) error { diff --git a/internal/manager/api_impl/worker_mgt_test.go b/internal/manager/api_impl/worker_mgt_test.go index 352125c3..11b3e5a8 100644 --- a/internal/manager/api_impl/worker_mgt_test.go +++ b/internal/manager/api_impl/worker_mgt_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/pkg/api" ) func TestFetchWorkers(t *testing.T) { diff --git a/internal/manager/api_impl/worker_sleep_schedule.go b/internal/manager/api_impl/worker_sleep_schedule.go index 5bf902ee..12dfcb58 100644 --- a/internal/manager/api_impl/worker_sleep_schedule.go +++ b/internal/manager/api_impl/worker_sleep_schedule.go @@ -6,10 +6,10 @@ import ( "errors" "net/http" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/internal/uuid" - "git.blender.org/flamenco/pkg/api" "github.com/labstack/echo/v4" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/internal/uuid" + "projects.blender.org/studio/flamenco/pkg/api" ) func (f *Flamenco) FetchWorkerSleepSchedule(e echo.Context, workerUUID string) error { diff --git a/internal/manager/api_impl/worker_task_updates.go b/internal/manager/api_impl/worker_task_updates.go index 7f55ee81..0f7d5c05 100644 --- a/internal/manager/api_impl/worker_task_updates.go +++ b/internal/manager/api_impl/worker_task_updates.go @@ -12,9 +12,9 @@ import ( "github.com/labstack/echo/v4" "github.com/rs/zerolog" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/internal/uuid" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/internal/uuid" + "projects.blender.org/studio/flamenco/pkg/api" ) func (f *Flamenco) TaskUpdate(e echo.Context, taskID string) error { diff --git a/internal/manager/api_impl/worker_task_updates_test.go b/internal/manager/api_impl/worker_task_updates_test.go index 142ae0df..df918c24 100644 --- a/internal/manager/api_impl/worker_task_updates_test.go +++ b/internal/manager/api_impl/worker_task_updates_test.go @@ -9,9 +9,9 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "git.blender.org/flamenco/internal/manager/config" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/manager/config" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/pkg/api" ) func TestTaskUpdate(t *testing.T) { diff --git a/internal/manager/api_impl/workers.go b/internal/manager/api_impl/workers.go index 47cb73e5..7e889301 100644 --- a/internal/manager/api_impl/workers.go +++ b/internal/manager/api_impl/workers.go @@ -13,12 +13,12 @@ import ( "github.com/labstack/echo/v4" "github.com/rs/zerolog" - "git.blender.org/flamenco/internal/manager/last_rendered" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/internal/manager/task_state_machine" - "git.blender.org/flamenco/internal/manager/webupdates" - "git.blender.org/flamenco/internal/uuid" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/manager/last_rendered" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/internal/manager/task_state_machine" + "projects.blender.org/studio/flamenco/internal/manager/webupdates" + "projects.blender.org/studio/flamenco/internal/uuid" + "projects.blender.org/studio/flamenco/pkg/api" ) // rememberableWorkerStates contains those worker statuses that should be diff --git a/internal/manager/api_impl/workers_test.go b/internal/manager/api_impl/workers_test.go index 0e8b2944..7baec6e3 100644 --- a/internal/manager/api_impl/workers_test.go +++ b/internal/manager/api_impl/workers_test.go @@ -13,10 +13,10 @@ import ( "github.com/labstack/echo/v4" "github.com/stretchr/testify/assert" - "git.blender.org/flamenco/internal/manager/config" - "git.blender.org/flamenco/internal/manager/last_rendered" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/manager/config" + "projects.blender.org/studio/flamenco/internal/manager/last_rendered" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/pkg/api" ) func TestTaskScheduleHappy(t *testing.T) { diff --git a/internal/manager/config/config.go b/internal/manager/config/config.go index b280366d..31e7a7dd 100644 --- a/internal/manager/config/config.go +++ b/internal/manager/config/config.go @@ -20,9 +20,9 @@ import ( "github.com/rs/zerolog/log" yaml "gopkg.in/yaml.v2" - "git.blender.org/flamenco/internal/appinfo" - "git.blender.org/flamenco/pkg/crosspath" - shaman_config "git.blender.org/flamenco/pkg/shaman/config" + "projects.blender.org/studio/flamenco/internal/appinfo" + "projects.blender.org/studio/flamenco/pkg/crosspath" + shaman_config "projects.blender.org/studio/flamenco/pkg/shaman/config" ) // configFilename is used to specify where flamenco will write its config file. diff --git a/internal/manager/config/defaults.go b/internal/manager/config/defaults.go index 7e5b926b..d6182169 100644 --- a/internal/manager/config/defaults.go +++ b/internal/manager/config/defaults.go @@ -4,7 +4,7 @@ import ( "runtime" "time" - shaman_config "git.blender.org/flamenco/pkg/shaman/config" + shaman_config "projects.blender.org/studio/flamenco/pkg/shaman/config" ) // SPDX-License-Identifier: GPL-3.0-or-later diff --git a/internal/manager/config/settings_test.go b/internal/manager/config/settings_test.go index 33a55b18..5042ac7b 100644 --- a/internal/manager/config/settings_test.go +++ b/internal/manager/config/settings_test.go @@ -6,8 +6,8 @@ import ( "sync" "testing" - "git.blender.org/flamenco/pkg/crosspath" "github.com/stretchr/testify/assert" + "projects.blender.org/studio/flamenco/pkg/crosspath" ) func TestDefaultSettings(t *testing.T) { diff --git a/internal/manager/config/variables.go b/internal/manager/config/variables.go index 6cf78ec1..3665d5c9 100644 --- a/internal/manager/config/variables.go +++ b/internal/manager/config/variables.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "git.blender.org/flamenco/pkg/crosspath" "github.com/rs/zerolog/log" + "projects.blender.org/studio/flamenco/pkg/crosspath" ) type ValueToVariableReplacer struct { diff --git a/internal/manager/job_compilers/author.go b/internal/manager/job_compilers/author.go index c1d5dd3a..fc77b73a 100644 --- a/internal/manager/job_compilers/author.go +++ b/internal/manager/job_compilers/author.go @@ -10,8 +10,8 @@ import ( "github.com/dop251/goja" "github.com/rs/zerolog/log" - "git.blender.org/flamenco/internal/uuid" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/uuid" + "projects.blender.org/studio/flamenco/pkg/api" ) // Author allows scripts to author tasks and commands. diff --git a/internal/manager/job_compilers/job_compilers.go b/internal/manager/job_compilers/job_compilers.go index 41228d0f..db7e2520 100644 --- a/internal/manager/job_compilers/job_compilers.go +++ b/internal/manager/job_compilers/job_compilers.go @@ -19,8 +19,8 @@ import ( "github.com/dop251/goja_nodejs/require" "github.com/rs/zerolog/log" - "git.blender.org/flamenco/internal/uuid" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/uuid" + "projects.blender.org/studio/flamenco/pkg/api" ) var ErrJobTypeUnknown = errors.New("job type unknown") diff --git a/internal/manager/job_compilers/job_compilers_test.go b/internal/manager/job_compilers/job_compilers_test.go index 3fcccfaa..15bc2d11 100644 --- a/internal/manager/job_compilers/job_compilers_test.go +++ b/internal/manager/job_compilers/job_compilers_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/api" ) // The example job is expected to result in these arguments for FFmpeg. diff --git a/internal/manager/job_compilers/js_path.go b/internal/manager/job_compilers/js_path.go index e13aa2e8..03edd4f4 100644 --- a/internal/manager/job_compilers/js_path.go +++ b/internal/manager/job_compilers/js_path.go @@ -3,9 +3,9 @@ package job_compilers // SPDX-License-Identifier: GPL-3.0-or-later import ( - "git.blender.org/flamenco/pkg/crosspath" "github.com/dop251/goja" "github.com/rs/zerolog/log" + "projects.blender.org/studio/flamenco/pkg/crosspath" ) // PathModule provides file path manipulation functions by wrapping Go's `path`. diff --git a/internal/manager/job_deleter/interfaces.go b/internal/manager/job_deleter/interfaces.go index bdb8cab5..d1cd9006 100644 --- a/internal/manager/job_deleter/interfaces.go +++ b/internal/manager/job_deleter/interfaces.go @@ -5,15 +5,15 @@ package job_deleter import ( "context" - "git.blender.org/flamenco/internal/manager/local_storage" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/internal/manager/webupdates" - "git.blender.org/flamenco/pkg/api" - "git.blender.org/flamenco/pkg/shaman" + "projects.blender.org/studio/flamenco/internal/manager/local_storage" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/internal/manager/webupdates" + "projects.blender.org/studio/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/shaman" ) // Generate mock implementations of these interfaces. -//go:generate go run github.com/golang/mock/mockgen -destination mocks/interfaces_mock.gen.go -package mocks git.blender.org/flamenco/internal/manager/job_deleter PersistenceService,Storage,ChangeBroadcaster,Shaman +//go:generate go run github.com/golang/mock/mockgen -destination mocks/interfaces_mock.gen.go -package mocks projects.blender.org/studio/flamenco/internal/manager/job_deleter PersistenceService,Storage,ChangeBroadcaster,Shaman type PersistenceService interface { FetchJob(ctx context.Context, jobUUID string) (*persistence.Job, error) diff --git a/internal/manager/job_deleter/job_deleter.go b/internal/manager/job_deleter/job_deleter.go index d76b6283..6ed21427 100644 --- a/internal/manager/job_deleter/job_deleter.go +++ b/internal/manager/job_deleter/job_deleter.go @@ -16,12 +16,12 @@ import ( "fmt" "time" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/internal/manager/webupdates" - "git.blender.org/flamenco/pkg/api" - "git.blender.org/flamenco/pkg/shaman" "github.com/rs/zerolog" "github.com/rs/zerolog/log" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/internal/manager/webupdates" + "projects.blender.org/studio/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/shaman" ) // jobDeletionQueueSize determines how many job deletion requests can be kept in diff --git a/internal/manager/job_deleter/job_deleter_test.go b/internal/manager/job_deleter/job_deleter_test.go index 4b479fd9..6ff70741 100644 --- a/internal/manager/job_deleter/job_deleter_test.go +++ b/internal/manager/job_deleter/job_deleter_test.go @@ -7,11 +7,11 @@ import ( "errors" "testing" - "git.blender.org/flamenco/internal/manager/job_deleter/mocks" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/pkg/shaman" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" + "projects.blender.org/studio/flamenco/internal/manager/job_deleter/mocks" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/pkg/shaman" ) type JobDeleterMocks struct { diff --git a/internal/manager/job_deleter/mocks/interfaces_mock.gen.go b/internal/manager/job_deleter/mocks/interfaces_mock.gen.go index c1fa65ea..c938d5c1 100644 --- a/internal/manager/job_deleter/mocks/interfaces_mock.gen.go +++ b/internal/manager/job_deleter/mocks/interfaces_mock.gen.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: git.blender.org/flamenco/internal/manager/job_deleter (interfaces: PersistenceService,Storage,ChangeBroadcaster,Shaman) +// Source: projects.blender.org/studio/flamenco/internal/manager/job_deleter (interfaces: PersistenceService,Storage,ChangeBroadcaster,Shaman) // Package mocks is a generated GoMock package. package mocks @@ -8,9 +8,9 @@ import ( context "context" reflect "reflect" - persistence "git.blender.org/flamenco/internal/manager/persistence" - api "git.blender.org/flamenco/pkg/api" gomock "github.com/golang/mock/gomock" + persistence "projects.blender.org/studio/flamenco/internal/manager/persistence" + api "projects.blender.org/studio/flamenco/pkg/api" ) // MockPersistenceService is a mock of PersistenceService interface. diff --git a/internal/manager/last_rendered/last_rendered_test.go b/internal/manager/last_rendered/last_rendered_test.go index 760451c5..f06154c6 100644 --- a/internal/manager/last_rendered/last_rendered_test.go +++ b/internal/manager/last_rendered/last_rendered_test.go @@ -9,8 +9,8 @@ import ( "path/filepath" "testing" - "git.blender.org/flamenco/internal/manager/local_storage" "github.com/stretchr/testify/assert" + "projects.blender.org/studio/flamenco/internal/manager/local_storage" ) func TestNew(t *testing.T) { diff --git a/internal/manager/local_storage/local_storage.go b/internal/manager/local_storage/local_storage.go index e972d2c0..5ec3c5b5 100644 --- a/internal/manager/local_storage/local_storage.go +++ b/internal/manager/local_storage/local_storage.go @@ -9,8 +9,8 @@ import ( "os" "path/filepath" - "git.blender.org/flamenco/pkg/crosspath" "github.com/rs/zerolog/log" + "projects.blender.org/studio/flamenco/pkg/crosspath" ) type StorageInfo struct { diff --git a/internal/manager/persistence/db.go b/internal/manager/persistence/db.go index 0debe254..2dcb19c1 100644 --- a/internal/manager/persistence/db.go +++ b/internal/manager/persistence/db.go @@ -11,7 +11,7 @@ import ( "github.com/rs/zerolog/log" "gorm.io/gorm" - // sqlite "git.blender.org/flamenco/pkg/gorm-modernc-sqlite" + // sqlite "projects.blender.org/studio/flamenco/pkg/gorm-modernc-sqlite" "github.com/glebarez/sqlite" ) diff --git a/internal/manager/persistence/jobs.go b/internal/manager/persistence/jobs.go index 745d5d9b..a9b27b35 100644 --- a/internal/manager/persistence/jobs.go +++ b/internal/manager/persistence/jobs.go @@ -15,8 +15,8 @@ import ( "gorm.io/gorm" "gorm.io/gorm/clause" - "git.blender.org/flamenco/internal/manager/job_compilers" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/manager/job_compilers" + "projects.blender.org/studio/flamenco/pkg/api" ) type Job struct { diff --git a/internal/manager/persistence/jobs_query.go b/internal/manager/persistence/jobs_query.go index 77f295b8..c4431b05 100644 --- a/internal/manager/persistence/jobs_query.go +++ b/internal/manager/persistence/jobs_query.go @@ -5,8 +5,8 @@ import ( "context" "strings" - "git.blender.org/flamenco/pkg/api" "github.com/rs/zerolog/log" + "projects.blender.org/studio/flamenco/pkg/api" ) func (db *DB) QueryJobs(ctx context.Context, apiQ api.JobsQuery) ([]*Job, error) { diff --git a/internal/manager/persistence/jobs_query_test.go b/internal/manager/persistence/jobs_query_test.go index ed07e7e2..6229b799 100644 --- a/internal/manager/persistence/jobs_query_test.go +++ b/internal/manager/persistence/jobs_query_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" - "git.blender.org/flamenco/internal/manager/job_compilers" - "git.blender.org/flamenco/internal/uuid" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/manager/job_compilers" + "projects.blender.org/studio/flamenco/internal/uuid" + "projects.blender.org/studio/flamenco/pkg/api" ) func TestSimpleQuery(t *testing.T) { diff --git a/internal/manager/persistence/jobs_test.go b/internal/manager/persistence/jobs_test.go index f9623a4c..afb8171a 100644 --- a/internal/manager/persistence/jobs_test.go +++ b/internal/manager/persistence/jobs_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/net/context" - "git.blender.org/flamenco/internal/manager/job_compilers" - "git.blender.org/flamenco/internal/uuid" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/manager/job_compilers" + "projects.blender.org/studio/flamenco/internal/uuid" + "projects.blender.org/studio/flamenco/pkg/api" ) func TestStoreAuthoredJob(t *testing.T) { diff --git a/internal/manager/persistence/task_scheduler.go b/internal/manager/persistence/task_scheduler.go index 47560e5d..e0de0d8d 100644 --- a/internal/manager/persistence/task_scheduler.go +++ b/internal/manager/persistence/task_scheduler.go @@ -9,7 +9,7 @@ import ( "github.com/rs/zerolog/log" "gorm.io/gorm" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/api" ) var ( diff --git a/internal/manager/persistence/task_scheduler_test.go b/internal/manager/persistence/task_scheduler_test.go index 0005bdfc..289524a1 100644 --- a/internal/manager/persistence/task_scheduler_test.go +++ b/internal/manager/persistence/task_scheduler_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "git.blender.org/flamenco/internal/manager/job_compilers" - "git.blender.org/flamenco/internal/uuid" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/manager/job_compilers" + "projects.blender.org/studio/flamenco/internal/uuid" + "projects.blender.org/studio/flamenco/pkg/api" ) const schedulerTestTimeout = 100 * time.Millisecond diff --git a/internal/manager/persistence/test_support.go b/internal/manager/persistence/test_support.go index 2b1351c4..71a860c6 100644 --- a/internal/manager/persistence/test_support.go +++ b/internal/manager/persistence/test_support.go @@ -10,13 +10,13 @@ import ( "testing" "time" - "git.blender.org/flamenco/internal/uuid" - "git.blender.org/flamenco/pkg/api" "github.com/glebarez/sqlite" "github.com/rs/zerolog" "github.com/rs/zerolog/log" "github.com/stretchr/testify/require" "gorm.io/gorm" + "projects.blender.org/studio/flamenco/internal/uuid" + "projects.blender.org/studio/flamenco/pkg/api" ) // Change this to a filename if you want to run a single test and inspect the diff --git a/internal/manager/persistence/timeout.go b/internal/manager/persistence/timeout.go index b570fdfa..fc2b19dd 100644 --- a/internal/manager/persistence/timeout.go +++ b/internal/manager/persistence/timeout.go @@ -6,7 +6,7 @@ import ( "context" "time" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/api" ) // This file contains functions for dealing with task/worker timeouts. Not database timeouts. diff --git a/internal/manager/persistence/timeout_test.go b/internal/manager/persistence/timeout_test.go index f26b1ef2..b2b2f95d 100644 --- a/internal/manager/persistence/timeout_test.go +++ b/internal/manager/persistence/timeout_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "git.blender.org/flamenco/pkg/api" "github.com/stretchr/testify/assert" + "projects.blender.org/studio/flamenco/pkg/api" ) // SPDX-License-Identifier: GPL-3.0-or-later diff --git a/internal/manager/persistence/worker_sleep_schedule_test.go b/internal/manager/persistence/worker_sleep_schedule_test.go index bcfc70b0..fdf83f20 100644 --- a/internal/manager/persistence/worker_sleep_schedule_test.go +++ b/internal/manager/persistence/worker_sleep_schedule_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "git.blender.org/flamenco/internal/uuid" - "git.blender.org/flamenco/pkg/api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "projects.blender.org/studio/flamenco/internal/uuid" + "projects.blender.org/studio/flamenco/pkg/api" ) func TestFetchWorkerSleepSchedule(t *testing.T) { diff --git a/internal/manager/persistence/worker_tag_test.go b/internal/manager/persistence/worker_tag_test.go index 372332fd..f4872cd6 100644 --- a/internal/manager/persistence/worker_tag_test.go +++ b/internal/manager/persistence/worker_tag_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "git.blender.org/flamenco/internal/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "projects.blender.org/studio/flamenco/internal/uuid" ) func TestCreateFetchTag(t *testing.T) { diff --git a/internal/manager/persistence/workers.go b/internal/manager/persistence/workers.go index 0b9e6359..aa676485 100644 --- a/internal/manager/persistence/workers.go +++ b/internal/manager/persistence/workers.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "git.blender.org/flamenco/pkg/api" "gorm.io/gorm" + "projects.blender.org/studio/flamenco/pkg/api" ) type Worker struct { diff --git a/internal/manager/persistence/workers_test.go b/internal/manager/persistence/workers_test.go index a92bf705..b58db75d 100644 --- a/internal/manager/persistence/workers_test.go +++ b/internal/manager/persistence/workers_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "git.blender.org/flamenco/internal/uuid" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/uuid" + "projects.blender.org/studio/flamenco/pkg/api" ) func TestCreateFetchWorker(t *testing.T) { diff --git a/internal/manager/sleep_scheduler/calculations.go b/internal/manager/sleep_scheduler/calculations.go index bea60c81..f0d2d238 100644 --- a/internal/manager/sleep_scheduler/calculations.go +++ b/internal/manager/sleep_scheduler/calculations.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/pkg/api" ) // scheduledWorkerStatus returns the expected worker status at the given date/time. diff --git a/internal/manager/sleep_scheduler/calculations_test.go b/internal/manager/sleep_scheduler/calculations_test.go index a4cfb496..7f07f4cc 100644 --- a/internal/manager/sleep_scheduler/calculations_test.go +++ b/internal/manager/sleep_scheduler/calculations_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/pkg/api" ) func TestCalculateNextCheck(t *testing.T) { diff --git a/internal/manager/sleep_scheduler/interfaces.go b/internal/manager/sleep_scheduler/interfaces.go index 361cf3ca..03eaa85f 100644 --- a/internal/manager/sleep_scheduler/interfaces.go +++ b/internal/manager/sleep_scheduler/interfaces.go @@ -5,13 +5,13 @@ package sleep_scheduler import ( "context" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/internal/manager/webupdates" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/internal/manager/webupdates" + "projects.blender.org/studio/flamenco/pkg/api" ) // Generate mock implementations of these interfaces. -//go:generate go run github.com/golang/mock/mockgen -destination mocks/interfaces_mock.gen.go -package mocks git.blender.org/flamenco/internal/manager/sleep_scheduler PersistenceService,ChangeBroadcaster +//go:generate go run github.com/golang/mock/mockgen -destination mocks/interfaces_mock.gen.go -package mocks projects.blender.org/studio/flamenco/internal/manager/sleep_scheduler PersistenceService,ChangeBroadcaster type PersistenceService interface { FetchWorkerSleepSchedule(ctx context.Context, workerUUID string) (*persistence.SleepSchedule, error) diff --git a/internal/manager/sleep_scheduler/mocks/interfaces_mock.gen.go b/internal/manager/sleep_scheduler/mocks/interfaces_mock.gen.go index 8cf6f77a..b6f8d2a4 100644 --- a/internal/manager/sleep_scheduler/mocks/interfaces_mock.gen.go +++ b/internal/manager/sleep_scheduler/mocks/interfaces_mock.gen.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: git.blender.org/flamenco/internal/manager/sleep_scheduler (interfaces: PersistenceService,ChangeBroadcaster) +// Source: projects.blender.org/studio/flamenco/internal/manager/sleep_scheduler (interfaces: PersistenceService,ChangeBroadcaster) // Package mocks is a generated GoMock package. package mocks @@ -8,9 +8,9 @@ import ( context "context" reflect "reflect" - persistence "git.blender.org/flamenco/internal/manager/persistence" - api "git.blender.org/flamenco/pkg/api" gomock "github.com/golang/mock/gomock" + persistence "projects.blender.org/studio/flamenco/internal/manager/persistence" + api "projects.blender.org/studio/flamenco/pkg/api" ) // MockPersistenceService is a mock of PersistenceService interface. diff --git a/internal/manager/sleep_scheduler/sleep_scheduler.go b/internal/manager/sleep_scheduler/sleep_scheduler.go index 7d6189f4..83e3d63b 100644 --- a/internal/manager/sleep_scheduler/sleep_scheduler.go +++ b/internal/manager/sleep_scheduler/sleep_scheduler.go @@ -12,8 +12,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/pkg/api" ) // Time period for checking the schedule of every worker. diff --git a/internal/manager/sleep_scheduler/sleep_scheduler_test.go b/internal/manager/sleep_scheduler/sleep_scheduler_test.go index 65dfe3d8..95872130 100644 --- a/internal/manager/sleep_scheduler/sleep_scheduler_test.go +++ b/internal/manager/sleep_scheduler/sleep_scheduler_test.go @@ -11,9 +11,9 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/internal/manager/sleep_scheduler/mocks" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/internal/manager/sleep_scheduler/mocks" + "projects.blender.org/studio/flamenco/pkg/api" ) func TestFetchSchedule(t *testing.T) { diff --git a/internal/manager/task_logs/mocks/interfaces_mock.gen.go b/internal/manager/task_logs/mocks/interfaces_mock.gen.go index 28658c0e..d0682577 100644 --- a/internal/manager/task_logs/mocks/interfaces_mock.gen.go +++ b/internal/manager/task_logs/mocks/interfaces_mock.gen.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: git.blender.org/flamenco/internal/manager/task_logs (interfaces: LocalStorage,ChangeBroadcaster) +// Source: projects.blender.org/studio/flamenco/internal/manager/task_logs (interfaces: LocalStorage,ChangeBroadcaster) // Package mocks is a generated GoMock package. package mocks @@ -7,8 +7,8 @@ package mocks import ( reflect "reflect" - api "git.blender.org/flamenco/pkg/api" gomock "github.com/golang/mock/gomock" + api "projects.blender.org/studio/flamenco/pkg/api" ) // MockLocalStorage is a mock of LocalStorage interface. diff --git a/internal/manager/task_logs/task_logs.go b/internal/manager/task_logs/task_logs.go index 6e08894d..ef48e120 100644 --- a/internal/manager/task_logs/task_logs.go +++ b/internal/manager/task_logs/task_logs.go @@ -11,10 +11,10 @@ import ( "sync" "time" - "git.blender.org/flamenco/internal/manager/webupdates" - "git.blender.org/flamenco/pkg/api" "github.com/benbjohnson/clock" "github.com/rs/zerolog" + "projects.blender.org/studio/flamenco/internal/manager/webupdates" + "projects.blender.org/studio/flamenco/pkg/api" ) const ( @@ -35,7 +35,7 @@ type Storage struct { } // Generate mock implementations of these interfaces. -//go:generate go run github.com/golang/mock/mockgen -destination mocks/interfaces_mock.gen.go -package mocks git.blender.org/flamenco/internal/manager/task_logs LocalStorage,ChangeBroadcaster +//go:generate go run github.com/golang/mock/mockgen -destination mocks/interfaces_mock.gen.go -package mocks projects.blender.org/studio/flamenco/internal/manager/task_logs LocalStorage,ChangeBroadcaster type LocalStorage interface { // ForJob returns the absolute directory path for storing job-related files. diff --git a/internal/manager/task_logs/task_logs_test.go b/internal/manager/task_logs/task_logs_test.go index 81399d95..d1d0c74e 100644 --- a/internal/manager/task_logs/task_logs_test.go +++ b/internal/manager/task_logs/task_logs_test.go @@ -14,12 +14,12 @@ import ( "testing" "time" - "git.blender.org/flamenco/internal/manager/task_logs/mocks" "github.com/benbjohnson/clock" "github.com/golang/mock/gomock" "github.com/rs/zerolog" "github.com/rs/zerolog/log" "github.com/stretchr/testify/assert" + "projects.blender.org/studio/flamenco/internal/manager/task_logs/mocks" ) func TestLogWriting(t *testing.T) { diff --git a/internal/manager/task_state_machine/interfaces.go b/internal/manager/task_state_machine/interfaces.go index 5da02774..28e66d9f 100644 --- a/internal/manager/task_state_machine/interfaces.go +++ b/internal/manager/task_state_machine/interfaces.go @@ -5,15 +5,15 @@ package task_state_machine import ( "context" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/internal/manager/task_logs" - "git.blender.org/flamenco/internal/manager/webupdates" - "git.blender.org/flamenco/pkg/api" "github.com/rs/zerolog" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/internal/manager/task_logs" + "projects.blender.org/studio/flamenco/internal/manager/webupdates" + "projects.blender.org/studio/flamenco/pkg/api" ) // Generate mock implementations of these interfaces. -//go:generate go run github.com/golang/mock/mockgen -destination mocks/interfaces_mock.gen.go -package mocks git.blender.org/flamenco/internal/manager/task_state_machine PersistenceService,ChangeBroadcaster,LogStorage +//go:generate go run github.com/golang/mock/mockgen -destination mocks/interfaces_mock.gen.go -package mocks projects.blender.org/studio/flamenco/internal/manager/task_state_machine PersistenceService,ChangeBroadcaster,LogStorage type PersistenceService interface { SaveTask(ctx context.Context, task *persistence.Task) error diff --git a/internal/manager/task_state_machine/mocks/interfaces_mock.gen.go b/internal/manager/task_state_machine/mocks/interfaces_mock.gen.go index e288324d..2fa6179c 100644 --- a/internal/manager/task_state_machine/mocks/interfaces_mock.gen.go +++ b/internal/manager/task_state_machine/mocks/interfaces_mock.gen.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: git.blender.org/flamenco/internal/manager/task_state_machine (interfaces: PersistenceService,ChangeBroadcaster,LogStorage) +// Source: projects.blender.org/studio/flamenco/internal/manager/task_state_machine (interfaces: PersistenceService,ChangeBroadcaster,LogStorage) // Package mocks is a generated GoMock package. package mocks @@ -8,10 +8,10 @@ import ( context "context" reflect "reflect" - persistence "git.blender.org/flamenco/internal/manager/persistence" - api "git.blender.org/flamenco/pkg/api" gomock "github.com/golang/mock/gomock" zerolog "github.com/rs/zerolog" + persistence "projects.blender.org/studio/flamenco/internal/manager/persistence" + api "projects.blender.org/studio/flamenco/pkg/api" ) // MockPersistenceService is a mock of PersistenceService interface. diff --git a/internal/manager/task_state_machine/task_state_machine.go b/internal/manager/task_state_machine/task_state_machine.go index 69280005..1e696dd9 100644 --- a/internal/manager/task_state_machine/task_state_machine.go +++ b/internal/manager/task_state_machine/task_state_machine.go @@ -9,9 +9,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/internal/manager/webupdates" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/internal/manager/webupdates" + "projects.blender.org/studio/flamenco/pkg/api" ) // taskFailJobPercentage is the percentage of a job's tasks that need to fail to diff --git a/internal/manager/task_state_machine/task_state_machine_test.go b/internal/manager/task_state_machine/task_state_machine_test.go index f41e10bc..52f8103e 100644 --- a/internal/manager/task_state_machine/task_state_machine_test.go +++ b/internal/manager/task_state_machine/task_state_machine_test.go @@ -11,9 +11,9 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/internal/manager/task_state_machine/mocks" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/internal/manager/task_state_machine/mocks" + "projects.blender.org/studio/flamenco/pkg/api" ) type StateMachineMocks struct { diff --git a/internal/manager/task_state_machine/task_statuses.go b/internal/manager/task_state_machine/task_statuses.go index 87154cab..4e14a189 100644 --- a/internal/manager/task_state_machine/task_statuses.go +++ b/internal/manager/task_state_machine/task_statuses.go @@ -2,7 +2,7 @@ package task_state_machine // SPDX-License-Identifier: GPL-3.0-or-later -import "git.blender.org/flamenco/pkg/api" +import "projects.blender.org/studio/flamenco/pkg/api" var ( // Task statuses that always get requeued when the job is requeueing. diff --git a/internal/manager/task_state_machine/worker_requeue.go b/internal/manager/task_state_machine/worker_requeue.go index 8c23a215..0c14c1a8 100644 --- a/internal/manager/task_state_machine/worker_requeue.go +++ b/internal/manager/task_state_machine/worker_requeue.go @@ -5,9 +5,9 @@ package task_state_machine import ( "context" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/pkg/api" "github.com/rs/zerolog/log" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/pkg/api" ) // RequeueActiveTasksOfWorker re-queues all active tasks (should be max one) of this worker. diff --git a/internal/manager/task_state_machine/worker_requeue_test.go b/internal/manager/task_state_machine/worker_requeue_test.go index 23b97dc0..a124feef 100644 --- a/internal/manager/task_state_machine/worker_requeue_test.go +++ b/internal/manager/task_state_machine/worker_requeue_test.go @@ -5,10 +5,10 @@ package task_state_machine import ( "testing" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/pkg/api" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/pkg/api" ) func TestRequeueActiveTasksOfWorker(t *testing.T) { diff --git a/internal/manager/timeout_checker/interfaces.go b/internal/manager/timeout_checker/interfaces.go index 8e5b7207..2d2b35b8 100644 --- a/internal/manager/timeout_checker/interfaces.go +++ b/internal/manager/timeout_checker/interfaces.go @@ -6,15 +6,15 @@ import ( "context" "time" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/internal/manager/task_state_machine" - "git.blender.org/flamenco/internal/manager/webupdates" - "git.blender.org/flamenco/pkg/api" "github.com/rs/zerolog" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/internal/manager/task_state_machine" + "projects.blender.org/studio/flamenco/internal/manager/webupdates" + "projects.blender.org/studio/flamenco/pkg/api" ) // Generate mock implementations of these interfaces. -//go:generate go run github.com/golang/mock/mockgen -destination mocks/interfaces_mock.gen.go -package mocks git.blender.org/flamenco/internal/manager/timeout_checker PersistenceService,TaskStateMachine,LogStorage,ChangeBroadcaster +//go:generate go run github.com/golang/mock/mockgen -destination mocks/interfaces_mock.gen.go -package mocks projects.blender.org/studio/flamenco/internal/manager/timeout_checker PersistenceService,TaskStateMachine,LogStorage,ChangeBroadcaster type PersistenceService interface { FetchTimedOutTasks(ctx context.Context, untouchedSince time.Time) ([]*persistence.Task, error) diff --git a/internal/manager/timeout_checker/mocks/interfaces_mock.gen.go b/internal/manager/timeout_checker/mocks/interfaces_mock.gen.go index c9ffafd8..925f029a 100644 --- a/internal/manager/timeout_checker/mocks/interfaces_mock.gen.go +++ b/internal/manager/timeout_checker/mocks/interfaces_mock.gen.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: git.blender.org/flamenco/internal/manager/timeout_checker (interfaces: PersistenceService,TaskStateMachine,LogStorage,ChangeBroadcaster) +// Source: projects.blender.org/studio/flamenco/internal/manager/timeout_checker (interfaces: PersistenceService,TaskStateMachine,LogStorage,ChangeBroadcaster) // Package mocks is a generated GoMock package. package mocks @@ -9,10 +9,10 @@ import ( reflect "reflect" time "time" - persistence "git.blender.org/flamenco/internal/manager/persistence" - api "git.blender.org/flamenco/pkg/api" gomock "github.com/golang/mock/gomock" zerolog "github.com/rs/zerolog" + persistence "projects.blender.org/studio/flamenco/internal/manager/persistence" + api "projects.blender.org/studio/flamenco/pkg/api" ) // MockPersistenceService is a mock of PersistenceService interface. diff --git a/internal/manager/timeout_checker/tasks.go b/internal/manager/timeout_checker/tasks.go index cc1f4395..afee2337 100644 --- a/internal/manager/timeout_checker/tasks.go +++ b/internal/manager/timeout_checker/tasks.go @@ -10,8 +10,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/pkg/api" ) func (ttc *TimeoutChecker) checkTasks(ctx context.Context) { diff --git a/internal/manager/timeout_checker/tasks_test.go b/internal/manager/timeout_checker/tasks_test.go index 654f601a..63291ee5 100644 --- a/internal/manager/timeout_checker/tasks_test.go +++ b/internal/manager/timeout_checker/tasks_test.go @@ -11,8 +11,8 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/pkg/api" ) const taskTimeout = 20 * time.Minute diff --git a/internal/manager/timeout_checker/timeout_checker_test.go b/internal/manager/timeout_checker/timeout_checker_test.go index 7d62f1ca..f0a3ed9a 100644 --- a/internal/manager/timeout_checker/timeout_checker_test.go +++ b/internal/manager/timeout_checker/timeout_checker_test.go @@ -12,7 +12,7 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "git.blender.org/flamenco/internal/manager/timeout_checker/mocks" + "projects.blender.org/studio/flamenco/internal/manager/timeout_checker/mocks" ) type TimeoutCheckerMocks struct { diff --git a/internal/manager/timeout_checker/workers.go b/internal/manager/timeout_checker/workers.go index 56dcee01..c1aea08b 100644 --- a/internal/manager/timeout_checker/workers.go +++ b/internal/manager/timeout_checker/workers.go @@ -5,9 +5,9 @@ package timeout_checker import ( "context" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/pkg/api" "github.com/rs/zerolog/log" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/pkg/api" ) func (ttc *TimeoutChecker) checkWorkers(ctx context.Context) { diff --git a/internal/manager/timeout_checker/workers_test.go b/internal/manager/timeout_checker/workers_test.go index 363ff5d2..c53b91ca 100644 --- a/internal/manager/timeout_checker/workers_test.go +++ b/internal/manager/timeout_checker/workers_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/pkg/api" "github.com/golang/mock/gomock" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/pkg/api" ) const workerTimeout = 20 * time.Minute diff --git a/internal/manager/webupdates/job_updates.go b/internal/manager/webupdates/job_updates.go index eef3ace7..0ad547a7 100644 --- a/internal/manager/webupdates/job_updates.go +++ b/internal/manager/webupdates/job_updates.go @@ -4,8 +4,8 @@ package webupdates import ( "github.com/rs/zerolog/log" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/pkg/api" ) // NewJobUpdate returns a partial SocketIOJobUpdate struct for the given job. diff --git a/internal/manager/webupdates/sio_rooms.go b/internal/manager/webupdates/sio_rooms.go index 907b5d38..54749bc5 100644 --- a/internal/manager/webupdates/sio_rooms.go +++ b/internal/manager/webupdates/sio_rooms.go @@ -6,8 +6,8 @@ import ( gosocketio "github.com/graarh/golang-socketio" - "git.blender.org/flamenco/internal/uuid" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/uuid" + "projects.blender.org/studio/flamenco/pkg/api" ) // Separate type aliases for room names and event types; it's otherwise too easy diff --git a/internal/manager/webupdates/worker_updates.go b/internal/manager/webupdates/worker_updates.go index a60f40d8..45876008 100644 --- a/internal/manager/webupdates/worker_updates.go +++ b/internal/manager/webupdates/worker_updates.go @@ -4,8 +4,8 @@ package webupdates import ( "github.com/rs/zerolog/log" - "git.blender.org/flamenco/internal/manager/persistence" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/pkg/api" ) // NewWorkerUpdate returns a partial SocketIOWorkerUpdate struct for the given worker. diff --git a/internal/stresser/fake_config.go b/internal/stresser/fake_config.go index 04cdc9dd..8fa03d02 100644 --- a/internal/stresser/fake_config.go +++ b/internal/stresser/fake_config.go @@ -5,7 +5,7 @@ package stresser import ( "github.com/rs/zerolog/log" - "git.blender.org/flamenco/internal/worker" + "projects.blender.org/studio/flamenco/internal/worker" ) type FakeConfig struct { diff --git a/internal/stresser/fake_worker.go b/internal/stresser/fake_worker.go index 1f71f278..5e4453b9 100644 --- a/internal/stresser/fake_worker.go +++ b/internal/stresser/fake_worker.go @@ -11,8 +11,8 @@ import ( "github.com/rs/zerolog/log" - "git.blender.org/flamenco/internal/worker" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/worker" + "projects.blender.org/studio/flamenco/pkg/api" ) const ( diff --git a/internal/stresser/stresser.go b/internal/stresser/stresser.go index 474f4055..12ab4710 100644 --- a/internal/stresser/stresser.go +++ b/internal/stresser/stresser.go @@ -9,9 +9,9 @@ import ( "sync" "time" - "git.blender.org/flamenco/internal/worker" - "git.blender.org/flamenco/pkg/api" "github.com/rs/zerolog/log" + "projects.blender.org/studio/flamenco/internal/worker" + "projects.blender.org/studio/flamenco/pkg/api" ) const ( diff --git a/internal/upnp_ssdp/server.go b/internal/upnp_ssdp/server.go index 6d26ecdb..dff3eacf 100644 --- a/internal/upnp_ssdp/server.go +++ b/internal/upnp_ssdp/server.go @@ -26,9 +26,9 @@ import ( "net/url" "path" - "git.blender.org/flamenco/internal/appinfo" "github.com/fromkeith/gossdp" "github.com/rs/zerolog" + "projects.blender.org/studio/flamenco/internal/appinfo" ) // Server advertises services via UPnP/SSDP. diff --git a/internal/worker/autodiscovery.go b/internal/worker/autodiscovery.go index 09b80f43..5145eda8 100644 --- a/internal/worker/autodiscovery.go +++ b/internal/worker/autodiscovery.go @@ -11,9 +11,9 @@ import ( "sync" "time" - "git.blender.org/flamenco/internal/upnp_ssdp" - "git.blender.org/flamenco/pkg/api" "github.com/rs/zerolog/log" + "projects.blender.org/studio/flamenco/internal/upnp_ssdp" + "projects.blender.org/studio/flamenco/pkg/api" ) // maybeAutodiscoverManager starts Manager auto-discovery if there is no Manager URL configured yet. diff --git a/internal/worker/client.go b/internal/worker/client.go index 81854857..57048b9e 100644 --- a/internal/worker/client.go +++ b/internal/worker/client.go @@ -3,11 +3,11 @@ package worker // SPDX-License-Identifier: GPL-3.0-or-later import ( - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/api" ) // Generate the mock for the client interface. -//go:generate go run github.com/golang/mock/mockgen -destination mocks/client.gen.go -package mocks git.blender.org/flamenco/internal/worker FlamencoClient +//go:generate go run github.com/golang/mock/mockgen -destination mocks/client.gen.go -package mocks projects.blender.org/studio/flamenco/internal/worker FlamencoClient // FlamencoClient is a wrapper for api.ClientWithResponsesInterface so that locally mocks can be created. type FlamencoClient interface { diff --git a/internal/worker/command_blender.go b/internal/worker/command_blender.go index 5b2cab2b..c58fe7f7 100644 --- a/internal/worker/command_blender.go +++ b/internal/worker/command_blender.go @@ -14,9 +14,9 @@ import ( "github.com/google/shlex" "github.com/rs/zerolog" - "git.blender.org/flamenco/internal/find_blender" - "git.blender.org/flamenco/pkg/api" - "git.blender.org/flamenco/pkg/crosspath" + "projects.blender.org/studio/flamenco/internal/find_blender" + "projects.blender.org/studio/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/crosspath" ) var regexpFileSaved = regexp.MustCompile("Saved: '(.*)'") diff --git a/internal/worker/command_blender_test.go b/internal/worker/command_blender_test.go index d214ca3f..0c7cac22 100644 --- a/internal/worker/command_blender_test.go +++ b/internal/worker/command_blender_test.go @@ -9,7 +9,7 @@ import ( "github.com/rs/zerolog/log" "github.com/stretchr/testify/assert" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/api" ) // SPDX-License-Identifier: GPL-3.0-or-later diff --git a/internal/worker/command_exe.go b/internal/worker/command_exe.go index 8af8fa17..36b42301 100644 --- a/internal/worker/command_exe.go +++ b/internal/worker/command_exe.go @@ -12,8 +12,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "git.blender.org/flamenco/internal/worker/cli_runner" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/worker/cli_runner" + "projects.blender.org/studio/flamenco/pkg/api" ) type CommandExecutor struct { @@ -30,7 +30,7 @@ var _ CommandRunner = (*CommandExecutor)(nil) type commandCallable func(ctx context.Context, logger zerolog.Logger, taskID string, cmd api.Command) error // Generate mock implementation of this interface. -//go:generate go run github.com/golang/mock/mockgen -destination mocks/command_listener.gen.go -package mocks git.blender.org/flamenco/internal/worker CommandListener +//go:generate go run github.com/golang/mock/mockgen -destination mocks/command_listener.gen.go -package mocks projects.blender.org/studio/flamenco/internal/worker CommandListener // CommandListener sends the result of commands (log, output files) to the Manager. type CommandListener interface { @@ -49,7 +49,7 @@ type TimeService interface { // CommandLineRunner is an interface around exec.CommandContext(). // -//go:generate go run github.com/golang/mock/mockgen -destination mocks/cli_runner.gen.go -package mocks git.blender.org/flamenco/internal/worker CommandLineRunner +//go:generate go run github.com/golang/mock/mockgen -destination mocks/cli_runner.gen.go -package mocks projects.blender.org/studio/flamenco/internal/worker CommandLineRunner type CommandLineRunner interface { CommandContext(ctx context.Context, name string, arg ...string) *exec.Cmd RunWithTextOutput( diff --git a/internal/worker/command_exe_test.go b/internal/worker/command_exe_test.go index 4bc0880f..7e71915e 100644 --- a/internal/worker/command_exe_test.go +++ b/internal/worker/command_exe_test.go @@ -9,8 +9,8 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "git.blender.org/flamenco/internal/worker/mocks" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/worker/mocks" + "projects.blender.org/studio/flamenco/pkg/api" ) type CommandExecutorMocks struct { diff --git a/internal/worker/command_ffmpeg.go b/internal/worker/command_ffmpeg.go index 6eea55ee..fbdf6bd7 100644 --- a/internal/worker/command_ffmpeg.go +++ b/internal/worker/command_ffmpeg.go @@ -20,9 +20,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "git.blender.org/flamenco/internal/find_ffmpeg" - "git.blender.org/flamenco/pkg/api" - "git.blender.org/flamenco/pkg/crosspath" + "projects.blender.org/studio/flamenco/internal/find_ffmpeg" + "projects.blender.org/studio/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/crosspath" ) type CreateVideoParams struct { diff --git a/internal/worker/command_ffmpeg_test.go b/internal/worker/command_ffmpeg_test.go index ba8c2704..3e6eb7a7 100644 --- a/internal/worker/command_ffmpeg_test.go +++ b/internal/worker/command_ffmpeg_test.go @@ -10,7 +10,7 @@ import ( "github.com/rs/zerolog" "github.com/stretchr/testify/assert" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/api" ) func TestCmdFramesToVideoSimplePosix(t *testing.T) { diff --git a/internal/worker/command_file_mgmt.go b/internal/worker/command_file_mgmt.go index 1dc285aa..5a4b4263 100644 --- a/internal/worker/command_file_mgmt.go +++ b/internal/worker/command_file_mgmt.go @@ -18,7 +18,7 @@ import ( "github.com/rs/zerolog" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/api" ) // cmdMoveDirectory executes the "move-directory" command. diff --git a/internal/worker/command_file_mgmt_test.go b/internal/worker/command_file_mgmt_test.go index 76170ea8..15cd7a0b 100644 --- a/internal/worker/command_file_mgmt_test.go +++ b/internal/worker/command_file_mgmt_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "git.blender.org/flamenco/pkg/api" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" + "projects.blender.org/studio/flamenco/pkg/api" ) // `move-directory` tests. diff --git a/internal/worker/command_misc.go b/internal/worker/command_misc.go index b41720d4..3baaa56a 100644 --- a/internal/worker/command_misc.go +++ b/internal/worker/command_misc.go @@ -12,7 +12,7 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/api" ) // cmdEcho executes the "echo" command. diff --git a/internal/worker/command_misc_test.go b/internal/worker/command_misc_test.go index 6c3ad63e..3958b621 100644 --- a/internal/worker/command_misc_test.go +++ b/internal/worker/command_misc_test.go @@ -10,7 +10,7 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/api" ) func TestCommandEcho(t *testing.T) { diff --git a/internal/worker/config.go b/internal/worker/config.go index fa16ab3a..d046057e 100644 --- a/internal/worker/config.go +++ b/internal/worker/config.go @@ -13,9 +13,9 @@ import ( "strings" "time" - "git.blender.org/flamenco/internal/appinfo" "github.com/rs/zerolog/log" yaml "gopkg.in/yaml.v2" + "projects.blender.org/studio/flamenco/internal/appinfo" ) var ( diff --git a/internal/worker/errors.go b/internal/worker/errors.go index c96c020f..b346e44f 100644 --- a/internal/worker/errors.go +++ b/internal/worker/errors.go @@ -5,7 +5,7 @@ package worker import ( "fmt" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/api" ) // This file contains error types used in the rest of the Worker code. diff --git a/internal/worker/listener.go b/internal/worker/listener.go index f4b57538..f2931ab6 100644 --- a/internal/worker/listener.go +++ b/internal/worker/listener.go @@ -10,7 +10,7 @@ import ( "github.com/rs/zerolog/log" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/api" ) var _ CommandListener = (*Listener)(nil) diff --git a/internal/worker/log_chunker_test.go b/internal/worker/log_chunker_test.go index 4b030e16..8fd780ba 100644 --- a/internal/worker/log_chunker_test.go +++ b/internal/worker/log_chunker_test.go @@ -9,7 +9,7 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "git.blender.org/flamenco/internal/worker/mocks" + "projects.blender.org/studio/flamenco/internal/worker/mocks" ) // SPDX-License-Identifier: GPL-3.0-or-later diff --git a/internal/worker/mocks/cli_runner.gen.go b/internal/worker/mocks/cli_runner.gen.go index 323806df..6c08d324 100644 --- a/internal/worker/mocks/cli_runner.gen.go +++ b/internal/worker/mocks/cli_runner.gen.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: git.blender.org/flamenco/internal/worker (interfaces: CommandLineRunner) +// Source: projects.blender.org/studio/flamenco/internal/worker (interfaces: CommandLineRunner) // Package mocks is a generated GoMock package. package mocks @@ -9,9 +9,9 @@ import ( exec "os/exec" reflect "reflect" - cli_runner "git.blender.org/flamenco/internal/worker/cli_runner" gomock "github.com/golang/mock/gomock" zerolog "github.com/rs/zerolog" + cli_runner "projects.blender.org/studio/flamenco/internal/worker/cli_runner" ) // MockCommandLineRunner is a mock of CommandLineRunner interface. diff --git a/internal/worker/mocks/client.gen.go b/internal/worker/mocks/client.gen.go index 3d4b19fa..3c1065da 100644 --- a/internal/worker/mocks/client.gen.go +++ b/internal/worker/mocks/client.gen.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: git.blender.org/flamenco/internal/worker (interfaces: FlamencoClient) +// Source: projects.blender.org/studio/flamenco/internal/worker (interfaces: FlamencoClient) // Package mocks is a generated GoMock package. package mocks @@ -9,8 +9,8 @@ import ( io "io" reflect "reflect" - api "git.blender.org/flamenco/pkg/api" gomock "github.com/golang/mock/gomock" + api "projects.blender.org/studio/flamenco/pkg/api" ) // MockFlamencoClient is a mock of FlamencoClient interface. diff --git a/internal/worker/mocks/command_listener.gen.go b/internal/worker/mocks/command_listener.gen.go index 1581422e..21074d48 100644 --- a/internal/worker/mocks/command_listener.gen.go +++ b/internal/worker/mocks/command_listener.gen.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: git.blender.org/flamenco/internal/worker (interfaces: CommandListener) +// Source: projects.blender.org/studio/flamenco/internal/worker (interfaces: CommandListener) // Package mocks is a generated GoMock package. package mocks diff --git a/internal/worker/mocks/task_exe_listener.gen.go b/internal/worker/mocks/task_exe_listener.gen.go index 353ecc60..6fafc6bf 100644 --- a/internal/worker/mocks/task_exe_listener.gen.go +++ b/internal/worker/mocks/task_exe_listener.gen.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: git.blender.org/flamenco/internal/worker (interfaces: TaskExecutionListener) +// Source: projects.blender.org/studio/flamenco/internal/worker (interfaces: TaskExecutionListener) // Package mocks is a generated GoMock package. package mocks diff --git a/internal/worker/output_uploader.go b/internal/worker/output_uploader.go index c4c9d2ef..d6112219 100644 --- a/internal/worker/output_uploader.go +++ b/internal/worker/output_uploader.go @@ -16,7 +16,7 @@ import ( "github.com/rs/zerolog/log" _ "golang.org/x/image/tiff" - "git.blender.org/flamenco/pkg/last_in_one_out_queue" + "projects.blender.org/studio/flamenco/pkg/last_in_one_out_queue" ) const thumbnailJPEGQuality = 85 diff --git a/internal/worker/output_uploader_test.go b/internal/worker/output_uploader_test.go index 191127c0..9bc72a18 100644 --- a/internal/worker/output_uploader_test.go +++ b/internal/worker/output_uploader_test.go @@ -12,8 +12,8 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "git.blender.org/flamenco/internal/worker/mocks" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/worker/mocks" + "projects.blender.org/studio/flamenco/pkg/api" ) func TestQueueOutput(t *testing.T) { diff --git a/internal/worker/persistence/upstream_buffer.go b/internal/worker/persistence/upstream_buffer.go index 6fb0493b..46953dcb 100644 --- a/internal/worker/persistence/upstream_buffer.go +++ b/internal/worker/persistence/upstream_buffer.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/api" ) // SPDX-License-Identifier: GPL-3.0-or-later diff --git a/internal/worker/registration.go b/internal/worker/registration.go index fab65901..65878b41 100644 --- a/internal/worker/registration.go +++ b/internal/worker/registration.go @@ -15,8 +15,8 @@ import ( "github.com/rs/zerolog/log" - "git.blender.org/flamenco/internal/appinfo" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/appinfo" + "projects.blender.org/studio/flamenco/pkg/api" ) const workerNameEnvVariable = "FLAMENCO_WORKER_NAME" diff --git a/internal/worker/state_asleep.go b/internal/worker/state_asleep.go index f569c6e4..bed1c12d 100644 --- a/internal/worker/state_asleep.go +++ b/internal/worker/state_asleep.go @@ -6,7 +6,7 @@ import ( "context" "time" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/api" ) const durationSleepCheck = 3 * time.Second diff --git a/internal/worker/state_awake.go b/internal/worker/state_awake.go index 4ad6ae07..fad9cdcb 100644 --- a/internal/worker/state_awake.go +++ b/internal/worker/state_awake.go @@ -11,7 +11,7 @@ import ( "github.com/rs/zerolog/log" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/api" ) const ( diff --git a/internal/worker/state_offline.go b/internal/worker/state_offline.go index b00b3129..537767bb 100644 --- a/internal/worker/state_offline.go +++ b/internal/worker/state_offline.go @@ -8,7 +8,7 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/api" ) func (w *Worker) gotoStateOffline(context.Context) { diff --git a/internal/worker/statemachine.go b/internal/worker/statemachine.go index 55c7c5e5..1b12a362 100644 --- a/internal/worker/statemachine.go +++ b/internal/worker/statemachine.go @@ -8,7 +8,7 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/api" ) func (w *Worker) setupStateMachine() { diff --git a/internal/worker/statemonitor.go b/internal/worker/statemonitor.go index 2fa6adec..81883474 100644 --- a/internal/worker/statemonitor.go +++ b/internal/worker/statemonitor.go @@ -9,7 +9,7 @@ import ( "github.com/rs/zerolog/log" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/api" ) // queryManagerForStateChange asks the Manager whether we should go to another state or not. diff --git a/internal/worker/task_executor.go b/internal/worker/task_executor.go index 2f9c3cde..150e41ef 100644 --- a/internal/worker/task_executor.go +++ b/internal/worker/task_executor.go @@ -9,7 +9,7 @@ import ( "github.com/rs/zerolog/log" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/api" ) type CommandRunner interface { @@ -17,7 +17,7 @@ type CommandRunner interface { } // Generate mock implementation of this interface. -//go:generate go run github.com/golang/mock/mockgen -destination mocks/task_exe_listener.gen.go -package mocks git.blender.org/flamenco/internal/worker TaskExecutionListener +//go:generate go run github.com/golang/mock/mockgen -destination mocks/task_exe_listener.gen.go -package mocks projects.blender.org/studio/flamenco/internal/worker TaskExecutionListener // TaskExecutionListener sends task lifecycle events (start/fail/complete) to the Manager. type TaskExecutionListener interface { diff --git a/internal/worker/upstream_buffer.go b/internal/worker/upstream_buffer.go index 4ede5e96..50d7da8e 100644 --- a/internal/worker/upstream_buffer.go +++ b/internal/worker/upstream_buffer.go @@ -12,8 +12,8 @@ import ( "github.com/rs/zerolog/log" - "git.blender.org/flamenco/internal/worker/persistence" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/worker/persistence" + "projects.blender.org/studio/flamenco/pkg/api" ) // TODO: pull the SQLite stuff out of this file into a more global place, so diff --git a/internal/worker/upstream_buffer_test.go b/internal/worker/upstream_buffer_test.go index 79b27b22..28f52329 100644 --- a/internal/worker/upstream_buffer_test.go +++ b/internal/worker/upstream_buffer_test.go @@ -15,8 +15,8 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "git.blender.org/flamenco/internal/worker/mocks" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/internal/worker/mocks" + "projects.blender.org/studio/flamenco/pkg/api" ) type UpstreamBufferDBMocks struct { diff --git a/internal/worker/worker.go b/internal/worker/worker.go index 80208984..c7225ff3 100644 --- a/internal/worker/worker.go +++ b/internal/worker/worker.go @@ -8,7 +8,7 @@ import ( "github.com/rs/zerolog/log" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/api" ) // Worker performs regular Flamenco Worker operations. diff --git a/pkg/shaman/checkout/checkout.go b/pkg/shaman/checkout/checkout.go index 07b49ca5..c4f7affd 100644 --- a/pkg/shaman/checkout/checkout.go +++ b/pkg/shaman/checkout/checkout.go @@ -9,9 +9,9 @@ import ( "regexp" "strings" - "git.blender.org/flamenco/pkg/api" - "git.blender.org/flamenco/pkg/shaman/filestore" "github.com/rs/zerolog" + "projects.blender.org/studio/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/shaman/filestore" ) var ( diff --git a/pkg/shaman/checkout/checkout_test.go b/pkg/shaman/checkout/checkout_test.go index 259b6e1b..f78164ed 100644 --- a/pkg/shaman/checkout/checkout_test.go +++ b/pkg/shaman/checkout/checkout_test.go @@ -6,9 +6,9 @@ import ( "path/filepath" "testing" - "git.blender.org/flamenco/pkg/api" - "git.blender.org/flamenco/pkg/shaman/filestore" "github.com/stretchr/testify/assert" + "projects.blender.org/studio/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/shaman/filestore" ) func TestCheckout(t *testing.T) { diff --git a/pkg/shaman/checkout/manager.go b/pkg/shaman/checkout/manager.go index 1e1238a3..7b2f5699 100644 --- a/pkg/shaman/checkout/manager.go +++ b/pkg/shaman/checkout/manager.go @@ -34,9 +34,9 @@ import ( "github.com/rs/zerolog/log" - "git.blender.org/flamenco/pkg/shaman/config" - "git.blender.org/flamenco/pkg/shaman/filestore" - "git.blender.org/flamenco/pkg/shaman/touch" + "projects.blender.org/studio/flamenco/pkg/shaman/config" + "projects.blender.org/studio/flamenco/pkg/shaman/filestore" + "projects.blender.org/studio/flamenco/pkg/shaman/touch" ) var ( diff --git a/pkg/shaman/checkout/manager_test.go b/pkg/shaman/checkout/manager_test.go index aed3e30a..b976d0c1 100644 --- a/pkg/shaman/checkout/manager_test.go +++ b/pkg/shaman/checkout/manager_test.go @@ -31,11 +31,11 @@ import ( "testing" "time" - "git.blender.org/flamenco/pkg/api" - "git.blender.org/flamenco/pkg/shaman/config" - "git.blender.org/flamenco/pkg/shaman/filestore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "projects.blender.org/studio/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/shaman/config" + "projects.blender.org/studio/flamenco/pkg/shaman/filestore" ) func createTestManager() (*Manager, func()) { diff --git a/pkg/shaman/checkout/report_requirements.go b/pkg/shaman/checkout/report_requirements.go index 2cca22e6..847ff057 100644 --- a/pkg/shaman/checkout/report_requirements.go +++ b/pkg/shaman/checkout/report_requirements.go @@ -6,8 +6,8 @@ import ( "context" "fmt" - "git.blender.org/flamenco/pkg/api" - "git.blender.org/flamenco/pkg/shaman/filestore" + "projects.blender.org/studio/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/shaman/filestore" "github.com/rs/zerolog" ) diff --git a/pkg/shaman/checkout/report_requirements_test.go b/pkg/shaman/checkout/report_requirements_test.go index 64fc090b..656fa32f 100644 --- a/pkg/shaman/checkout/report_requirements_test.go +++ b/pkg/shaman/checkout/report_requirements_test.go @@ -26,8 +26,8 @@ import ( "context" "testing" - "git.blender.org/flamenco/pkg/api" "github.com/stretchr/testify/assert" + "projects.blender.org/studio/flamenco/pkg/api" ) func TestReportRequirements(t *testing.T) { diff --git a/pkg/shaman/cleanup_test.go b/pkg/shaman/cleanup_test.go index ea68208b..f45d809e 100644 --- a/pkg/shaman/cleanup_test.go +++ b/pkg/shaman/cleanup_test.go @@ -31,11 +31,11 @@ import ( "testing" "time" - "git.blender.org/flamenco/pkg/shaman/config" - "git.blender.org/flamenco/pkg/shaman/filestore" - "git.blender.org/flamenco/pkg/shaman/jwtauth" "github.com/rs/zerolog/log" "github.com/stretchr/testify/assert" + "projects.blender.org/studio/flamenco/pkg/shaman/config" + "projects.blender.org/studio/flamenco/pkg/shaman/filestore" + "projects.blender.org/studio/flamenco/pkg/shaman/jwtauth" ) func createTestShaman() (*Server, func()) { diff --git a/pkg/shaman/fileserver/checkfile.go b/pkg/shaman/fileserver/checkfile.go index f70dca4c..eccff503 100644 --- a/pkg/shaman/fileserver/checkfile.go +++ b/pkg/shaman/fileserver/checkfile.go @@ -23,7 +23,7 @@ package fileserver import ( - "git.blender.org/flamenco/pkg/shaman/filestore" + "projects.blender.org/studio/flamenco/pkg/shaman/filestore" ) func (fs *FileServer) CheckFile(checksum string, filesize int64) filestore.FileStatus { diff --git a/pkg/shaman/fileserver/fileserver.go b/pkg/shaman/fileserver/fileserver.go index 18319eca..6710a73e 100644 --- a/pkg/shaman/fileserver/fileserver.go +++ b/pkg/shaman/fileserver/fileserver.go @@ -26,7 +26,7 @@ import ( "context" "sync" - "git.blender.org/flamenco/pkg/shaman/filestore" + "projects.blender.org/studio/flamenco/pkg/shaman/filestore" ) type receiverChannel chan struct{} diff --git a/pkg/shaman/fileserver/receivefile.go b/pkg/shaman/fileserver/receivefile.go index 3a5b7e43..a0ed68c3 100644 --- a/pkg/shaman/fileserver/receivefile.go +++ b/pkg/shaman/fileserver/receivefile.go @@ -28,9 +28,9 @@ import ( "fmt" "io" - "git.blender.org/flamenco/pkg/shaman/filestore" - "git.blender.org/flamenco/pkg/shaman/hasher" "github.com/rs/zerolog" + "projects.blender.org/studio/flamenco/pkg/shaman/filestore" + "projects.blender.org/studio/flamenco/pkg/shaman/hasher" ) // ErrFileAlreadyExists indicates that a file already exists in the Shaman diff --git a/pkg/shaman/fileserver/receivefile_test.go b/pkg/shaman/fileserver/receivefile_test.go index 06844181..384720c4 100644 --- a/pkg/shaman/fileserver/receivefile_test.go +++ b/pkg/shaman/fileserver/receivefile_test.go @@ -29,11 +29,11 @@ import ( "io/ioutil" "testing" - "git.blender.org/flamenco/pkg/shaman/config" - "git.blender.org/flamenco/pkg/shaman/hasher" + "projects.blender.org/studio/flamenco/pkg/shaman/config" + "projects.blender.org/studio/flamenco/pkg/shaman/hasher" - "git.blender.org/flamenco/pkg/shaman/filestore" "github.com/stretchr/testify/assert" + "projects.blender.org/studio/flamenco/pkg/shaman/filestore" ) func TestStoreFile(t *testing.T) { diff --git a/pkg/shaman/filestore/filestore.go b/pkg/shaman/filestore/filestore.go index f1ce5dda..1c933e27 100644 --- a/pkg/shaman/filestore/filestore.go +++ b/pkg/shaman/filestore/filestore.go @@ -29,8 +29,8 @@ import ( "path/filepath" "strconv" - "git.blender.org/flamenco/pkg/shaman/config" "github.com/rs/zerolog/log" + "projects.blender.org/studio/flamenco/pkg/shaman/config" ) // Store represents the default Shaman file store. diff --git a/pkg/shaman/filestore/testing.go b/pkg/shaman/filestore/testing.go index 6b73d41b..9caecfbe 100644 --- a/pkg/shaman/filestore/testing.go +++ b/pkg/shaman/filestore/testing.go @@ -31,7 +31,7 @@ import ( "runtime" "time" - "git.blender.org/flamenco/pkg/shaman/config" + "projects.blender.org/studio/flamenco/pkg/shaman/config" ) // CreateTestStore returns a Store that can be used for unit testing. diff --git a/pkg/shaman/server.go b/pkg/shaman/server.go index 49d6b10e..556dc1e1 100644 --- a/pkg/shaman/server.go +++ b/pkg/shaman/server.go @@ -27,13 +27,13 @@ import ( "io" "sync" - "git.blender.org/flamenco/pkg/api" - "git.blender.org/flamenco/pkg/shaman/checkout" - "git.blender.org/flamenco/pkg/shaman/config" - "git.blender.org/flamenco/pkg/shaman/fileserver" - "git.blender.org/flamenco/pkg/shaman/filestore" - "git.blender.org/flamenco/pkg/shaman/jwtauth" "github.com/rs/zerolog/log" + "projects.blender.org/studio/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/shaman/checkout" + "projects.blender.org/studio/flamenco/pkg/shaman/config" + "projects.blender.org/studio/flamenco/pkg/shaman/fileserver" + "projects.blender.org/studio/flamenco/pkg/shaman/filestore" + "projects.blender.org/studio/flamenco/pkg/shaman/jwtauth" ) var ErrDoesNotExist = checkout.ErrDoesNotExist diff --git a/web/project-website/content/development/flamenco-api/_index.md b/web/project-website/content/development/flamenco-api/_index.md index 2e9e3cbe..82b62fc3 100644 --- a/web/project-website/content/development/flamenco-api/_index.md +++ b/web/project-website/content/development/flamenco-api/_index.md @@ -141,7 +141,7 @@ import ( "context" "fmt" - "git.blender.org/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/api" ) func main() {