From 47e36c927cd328c24688453805169e16db704d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 1 Mar 2022 20:45:09 +0100 Subject: [PATCH] Change package URL to the blender.org repository --- Makefile | 2 +- cmd/flamenco-manager/main.go | 18 +++++++++--------- cmd/flamenco-worker/main.go | 4 ++-- cmd/socketio-poc/main.go | 3 ++- go.mod | 2 +- internal/manager/api_impl/api_impl.go | 10 +++++----- internal/manager/api_impl/jobs.go | 4 ++-- internal/manager/api_impl/jobs_test.go | 4 ++-- .../api_impl/mocks/api_impl_mock.gen.go | 10 +++++----- internal/manager/api_impl/support_test.go | 7 ++++--- internal/manager/api_impl/varrepl.go | 6 +++--- internal/manager/api_impl/varrepl_test.go | 7 ++++--- internal/manager/api_impl/worker_auth.go | 3 ++- internal/manager/api_impl/workers.go | 4 ++-- internal/manager/api_impl/workers_test.go | 5 +++-- internal/manager/config/defaults.go | 2 +- internal/manager/job_compilers/author.go | 3 ++- .../manager/job_compilers/job_compilers.go | 3 ++- .../job_compilers/job_compilers_test.go | 3 ++- internal/manager/persistence/db.go | 2 +- internal/manager/persistence/jobs.go | 5 +++-- internal/manager/persistence/jobs_test.go | 5 +++-- internal/manager/persistence/task_scheduler.go | 3 ++- .../manager/persistence/task_scheduler_test.go | 5 +++-- internal/manager/persistence/workers.go | 3 ++- internal/manager/persistence/workers_test.go | 3 ++- .../mocks/interfaces_mock.gen.go | 6 +++--- .../task_state_machine/task_state_machine.go | 7 ++++--- .../task_state_machine_test.go | 6 +++--- internal/worker/client.go | 4 ++-- internal/worker/command_blender.go | 3 ++- internal/worker/command_blender_test.go | 3 ++- internal/worker/command_exe.go | 7 ++++--- internal/worker/command_exe_test.go | 5 +++-- internal/worker/command_misc.go | 3 ++- internal/worker/command_misc_test.go | 3 ++- internal/worker/listener.go | 3 ++- internal/worker/log_chunker_test.go | 3 ++- internal/worker/mocks/cli_runner.gen.go | 2 +- internal/worker/mocks/client.gen.go | 4 ++-- internal/worker/mocks/command_listener.gen.go | 2 +- internal/worker/mocks/task_exe_listener.gen.go | 2 +- internal/worker/registration.go | 5 +++-- internal/worker/state_asleep.go | 3 ++- internal/worker/state_awake.go | 3 ++- internal/worker/state_shutdown.go | 3 ++- internal/worker/statemachine.go | 3 ++- internal/worker/statemonitor.go | 3 ++- internal/worker/task_executor.go | 5 +++-- internal/worker/upstream_buffer.go | 4 ++-- internal/worker/upstream_buffer_test.go | 6 +++--- internal/worker/worker.go | 3 ++- 52 files changed, 129 insertions(+), 98 deletions(-) diff --git a/Makefile b/Makefile index 8f5c76a5..cade63de 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PKG := gitlab.com/blender/flamenco-ng-poc +PKG := git.blender.org/flamenco VERSION := $(shell git describe --tags --dirty --always) PKG_LIST := $(shell go list ${PKG}/... | grep -v /vendor/) diff --git a/cmd/flamenco-manager/main.go b/cmd/flamenco-manager/main.go index 5a1d0652..a60cfda6 100644 --- a/cmd/flamenco-manager/main.go +++ b/cmd/flamenco-manager/main.go @@ -36,15 +36,15 @@ import ( "github.com/rs/zerolog/log" "github.com/ziflex/lecho/v3" - "gitlab.com/blender/flamenco-ng-poc/internal/appinfo" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/api_impl" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/config" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/job_compilers" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/persistence" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/swagger_ui" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/task_logs" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/task_state_machine" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + "git.blender.org/flamenco/internal/appinfo" + "git.blender.org/flamenco/internal/manager/api_impl" + "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/internal/manager/swagger_ui" + "git.blender.org/flamenco/internal/manager/task_logs" + "git.blender.org/flamenco/internal/manager/task_state_machine" + "git.blender.org/flamenco/pkg/api" ) var cliArgs struct { diff --git a/cmd/flamenco-worker/main.go b/cmd/flamenco-worker/main.go index ee32fe1b..62397587 100644 --- a/cmd/flamenco-worker/main.go +++ b/cmd/flamenco-worker/main.go @@ -36,8 +36,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/blender/flamenco-ng-poc/internal/appinfo" - "gitlab.com/blender/flamenco-ng-poc/internal/worker" + "git.blender.org/flamenco/internal/appinfo" + "git.blender.org/flamenco/internal/worker" ) var ( diff --git a/cmd/socketio-poc/main.go b/cmd/socketio-poc/main.go index 5539d803..5fefecbf 100644 --- a/cmd/socketio-poc/main.go +++ b/cmd/socketio-poc/main.go @@ -9,10 +9,11 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" "github.com/ziflex/lecho/v3" - "gitlab.com/blender/flamenco-ng-poc/internal/appinfo" gosocketio "github.com/graarh/golang-socketio" "github.com/graarh/golang-socketio/transport" + + "git.blender.org/flamenco/internal/appinfo" ) type Message struct { diff --git a/go.mod b/go.mod index 4da31062..aa986c1c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module gitlab.com/blender/flamenco-ng-poc +module git.blender.org/flamenco go 1.18 diff --git a/internal/manager/api_impl/api_impl.go b/internal/manager/api_impl/api_impl.go index a6335a47..842b12d6 100644 --- a/internal/manager/api_impl/api_impl.go +++ b/internal/manager/api_impl/api_impl.go @@ -25,12 +25,12 @@ import ( "context" "fmt" + "git.blender.org/flamenco/internal/manager/job_compilers" + "git.blender.org/flamenco/internal/manager/persistence" + "git.blender.org/flamenco/internal/manager/task_state_machine" + "git.blender.org/flamenco/pkg/api" "github.com/labstack/echo/v4" "github.com/rs/zerolog" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/job_compilers" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/persistence" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/task_state_machine" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" ) type Flamenco struct { @@ -44,7 +44,7 @@ type Flamenco struct { var _ api.ServerInterface = (*Flamenco)(nil) // Generate mock implementations of these interfaces. -//go:generate go run github.com/golang/mock/mockgen -destination mocks/api_impl_mock.gen.go -package mocks gitlab.com/blender/flamenco-ng-poc/internal/manager/api_impl PersistenceService,JobCompiler,LogStorage,ConfigService,TaskStateMachine +//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,JobCompiler,LogStorage,ConfigService,TaskStateMachine 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 1e055e83..397a682e 100644 --- a/internal/manager/api_impl/jobs.go +++ b/internal/manager/api_impl/jobs.go @@ -25,11 +25,11 @@ import ( "fmt" "net/http" + "git.blender.org/flamenco/internal/manager/persistence" + "git.blender.org/flamenco/pkg/api" "github.com/google/uuid" "github.com/labstack/echo/v4" "github.com/rs/zerolog" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/persistence" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" ) func (f *Flamenco) GetJobTypes(e echo.Context) error { diff --git a/internal/manager/api_impl/jobs_test.go b/internal/manager/api_impl/jobs_test.go index b8eb679e..a41818a5 100644 --- a/internal/manager/api_impl/jobs_test.go +++ b/internal/manager/api_impl/jobs_test.go @@ -24,10 +24,10 @@ import ( "context" "testing" + "git.blender.org/flamenco/internal/manager/persistence" + "git.blender.org/flamenco/pkg/api" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/persistence" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" ) func ptr[T any](value T) *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 2c4cd764..b186fc3f 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: gitlab.com/blender/flamenco-ng-poc/internal/manager/api_impl (interfaces: PersistenceService,JobCompiler,LogStorage,ConfigService,TaskStateMachine) +// Source: git.blender.org/flamenco/internal/manager/api_impl (interfaces: PersistenceService,JobCompiler,LogStorage,ConfigService,TaskStateMachine) // Package mocks is a generated GoMock package. package mocks @@ -8,12 +8,12 @@ import ( context "context" reflect "reflect" + config "git.blender.org/flamenco/internal/manager/config" + job_compilers "git.blender.org/flamenco/internal/manager/job_compilers" + 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 "gitlab.com/blender/flamenco-ng-poc/internal/manager/config" - job_compilers "gitlab.com/blender/flamenco-ng-poc/internal/manager/job_compilers" - persistence "gitlab.com/blender/flamenco-ng-poc/internal/manager/persistence" - api "gitlab.com/blender/flamenco-ng-poc/pkg/api" ) // MockPersistenceService is a mock of PersistenceService interface. diff --git a/internal/manager/api_impl/support_test.go b/internal/manager/api_impl/support_test.go index 08dfdf6a..5ab6faf3 100644 --- a/internal/manager/api_impl/support_test.go +++ b/internal/manager/api_impl/support_test.go @@ -29,10 +29,11 @@ import ( "github.com/golang/mock/gomock" "github.com/labstack/echo/v4" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/api_impl/mocks" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/persistence" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" "gorm.io/gorm" + + "git.blender.org/flamenco/internal/manager/api_impl/mocks" + "git.blender.org/flamenco/internal/manager/persistence" + "git.blender.org/flamenco/pkg/api" ) type mockedFlamenco struct { diff --git a/internal/manager/api_impl/varrepl.go b/internal/manager/api_impl/varrepl.go index 87b32e01..1aa578de 100644 --- a/internal/manager/api_impl/varrepl.go +++ b/internal/manager/api_impl/varrepl.go @@ -21,9 +21,9 @@ package api_impl * ***** END GPL LICENSE BLOCK ***** */ import ( - "gitlab.com/blender/flamenco-ng-poc/internal/manager/config" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/persistence" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + "git.blender.org/flamenco/internal/manager/config" + "git.blender.org/flamenco/internal/manager/persistence" + "git.blender.org/flamenco/pkg/api" ) type VariableReplacer interface { diff --git a/internal/manager/api_impl/varrepl_test.go b/internal/manager/api_impl/varrepl_test.go index 8cd4c5b1..f7043097 100644 --- a/internal/manager/api_impl/varrepl_test.go +++ b/internal/manager/api_impl/varrepl_test.go @@ -24,9 +24,10 @@ import ( "testing" "github.com/stretchr/testify/assert" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/config" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/persistence" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + + "git.blender.org/flamenco/internal/manager/config" + "git.blender.org/flamenco/internal/manager/persistence" + "git.blender.org/flamenco/pkg/api" ) func varreplTestTask() api.AssignedTask { diff --git a/internal/manager/api_impl/worker_auth.go b/internal/manager/api_impl/worker_auth.go index 4b2f703f..14cdff6f 100644 --- a/internal/manager/api_impl/worker_auth.go +++ b/internal/manager/api_impl/worker_auth.go @@ -27,8 +27,9 @@ import ( oapi_middle "github.com/deepmap/oapi-codegen/pkg/middleware" "github.com/getkin/kin-openapi/openapi3filter" "github.com/labstack/echo/v4" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/persistence" "golang.org/x/crypto/bcrypt" + + "git.blender.org/flamenco/internal/manager/persistence" ) type workerContextKey string diff --git a/internal/manager/api_impl/workers.go b/internal/manager/api_impl/workers.go index ab57e3f1..6ef0e272 100644 --- a/internal/manager/api_impl/workers.go +++ b/internal/manager/api_impl/workers.go @@ -32,8 +32,8 @@ import ( "github.com/rs/zerolog" "golang.org/x/crypto/bcrypt" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/persistence" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + "git.blender.org/flamenco/internal/manager/persistence" + "git.blender.org/flamenco/pkg/api" ) // RegisterWorker registers a new worker and stores it in the database. diff --git a/internal/manager/api_impl/workers_test.go b/internal/manager/api_impl/workers_test.go index 7044e756..a843ace5 100644 --- a/internal/manager/api_impl/workers_test.go +++ b/internal/manager/api_impl/workers_test.go @@ -29,8 +29,9 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/persistence" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + + "git.blender.org/flamenco/internal/manager/persistence" + "git.blender.org/flamenco/pkg/api" ) func TestTaskScheduleHappy(t *testing.T) { diff --git a/internal/manager/config/defaults.go b/internal/manager/config/defaults.go index 34d6fb38..f5cd6d99 100644 --- a/internal/manager/config/defaults.go +++ b/internal/manager/config/defaults.go @@ -23,7 +23,7 @@ package config import ( "time" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + "git.blender.org/flamenco/pkg/api" ) // The default configuration, use DefaultConfig() to obtain a copy. diff --git a/internal/manager/job_compilers/author.go b/internal/manager/job_compilers/author.go index c97afd9a..d7cdea1f 100644 --- a/internal/manager/job_compilers/author.go +++ b/internal/manager/job_compilers/author.go @@ -28,7 +28,8 @@ import ( "github.com/dop251/goja" "github.com/google/uuid" "github.com/rs/zerolog/log" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + + "git.blender.org/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 65d6159e..030b630b 100644 --- a/internal/manager/job_compilers/job_compilers.go +++ b/internal/manager/job_compilers/job_compilers.go @@ -31,7 +31,8 @@ import ( "github.com/dop251/goja_nodejs/require" "github.com/google/uuid" "github.com/rs/zerolog/log" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + + "git.blender.org/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 b7ab6562..e5bba10b 100644 --- a/internal/manager/job_compilers/job_compilers_test.go +++ b/internal/manager/job_compilers/job_compilers_test.go @@ -29,7 +29,8 @@ import ( "github.com/benbjohnson/clock" "github.com/stretchr/testify/assert" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + + "git.blender.org/flamenco/pkg/api" ) func exampleSubmittedJob() api.SubmittedJob { diff --git a/internal/manager/persistence/db.go b/internal/manager/persistence/db.go index 1d784875..e978eb8b 100644 --- a/internal/manager/persistence/db.go +++ b/internal/manager/persistence/db.go @@ -27,7 +27,7 @@ import ( "github.com/rs/zerolog/log" "gorm.io/gorm" - sqlite "gitlab.com/blender/flamenco-ng-poc/pkg/gorm-modernc-sqlite" + sqlite "git.blender.org/flamenco/pkg/gorm-modernc-sqlite" ) // DB provides the database interface. diff --git a/internal/manager/persistence/jobs.go b/internal/manager/persistence/jobs.go index 8706f912..dac02859 100644 --- a/internal/manager/persistence/jobs.go +++ b/internal/manager/persistence/jobs.go @@ -27,9 +27,10 @@ import ( "errors" "fmt" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/job_compilers" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" "gorm.io/gorm" + + "git.blender.org/flamenco/internal/manager/job_compilers" + "git.blender.org/flamenco/pkg/api" ) type Job struct { diff --git a/internal/manager/persistence/jobs_test.go b/internal/manager/persistence/jobs_test.go index 6deb31f0..ec9fbcdf 100644 --- a/internal/manager/persistence/jobs_test.go +++ b/internal/manager/persistence/jobs_test.go @@ -26,9 +26,10 @@ import ( "time" "github.com/stretchr/testify/assert" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/job_compilers" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" "golang.org/x/net/context" + + "git.blender.org/flamenco/internal/manager/job_compilers" + "git.blender.org/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 e77ea9f5..a3506156 100644 --- a/internal/manager/persistence/task_scheduler.go +++ b/internal/manager/persistence/task_scheduler.go @@ -25,8 +25,9 @@ import ( "fmt" "github.com/rs/zerolog/log" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" "gorm.io/gorm" + + "git.blender.org/flamenco/pkg/api" ) var ( diff --git a/internal/manager/persistence/task_scheduler_test.go b/internal/manager/persistence/task_scheduler_test.go index 488a21f4..0d294a4e 100644 --- a/internal/manager/persistence/task_scheduler_test.go +++ b/internal/manager/persistence/task_scheduler_test.go @@ -27,8 +27,9 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/assert" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/job_compilers" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + + "git.blender.org/flamenco/internal/manager/job_compilers" + "git.blender.org/flamenco/pkg/api" ) func TestNoTasks(t *testing.T) { diff --git a/internal/manager/persistence/workers.go b/internal/manager/persistence/workers.go index 04a19374..e97b8199 100644 --- a/internal/manager/persistence/workers.go +++ b/internal/manager/persistence/workers.go @@ -25,8 +25,9 @@ import ( "fmt" "strings" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" "gorm.io/gorm" + + "git.blender.org/flamenco/pkg/api" ) type Worker struct { diff --git a/internal/manager/persistence/workers_test.go b/internal/manager/persistence/workers_test.go index 9d879a01..9e28de62 100644 --- a/internal/manager/persistence/workers_test.go +++ b/internal/manager/persistence/workers_test.go @@ -27,8 +27,9 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/assert" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" "golang.org/x/net/context" + + "git.blender.org/flamenco/pkg/api" ) func TestCreateFetchWorker(t *testing.T) { 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 5a0b7d8b..def73e23 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: gitlab.com/blender/flamenco-ng-poc/internal/manager/task_state_machine (interfaces: PersistenceService) +// Source: git.blender.org/flamenco/internal/manager/task_state_machine (interfaces: PersistenceService) // 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 "gitlab.com/blender/flamenco-ng-poc/internal/manager/persistence" - api "gitlab.com/blender/flamenco-ng-poc/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 69c89e94..9d29a580 100644 --- a/internal/manager/task_state_machine/task_state_machine.go +++ b/internal/manager/task_state_machine/task_state_machine.go @@ -26,8 +26,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/persistence" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + + "git.blender.org/flamenco/internal/manager/persistence" + "git.blender.org/flamenco/pkg/api" ) // taskFailJobPercentage is the percentage of a job's tasks that need to fail to @@ -40,7 +41,7 @@ type StateMachine struct { } // Generate mock implementations of these interfaces. -//go:generate go run github.com/golang/mock/mockgen -destination mocks/interfaces_mock.gen.go -package mocks gitlab.com/blender/flamenco-ng-poc/internal/manager/task_state_machine PersistenceService +//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 type PersistenceService interface { SaveTask(ctx context.Context, task *persistence.Task) error 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 1471daa2..137e86a9 100644 --- a/internal/manager/task_state_machine/task_state_machine_test.go +++ b/internal/manager/task_state_machine/task_state_machine_test.go @@ -30,9 +30,9 @@ import ( "github.com/stretchr/testify/assert" "gorm.io/gorm" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/persistence" - "gitlab.com/blender/flamenco-ng-poc/internal/manager/task_state_machine/mocks" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + "git.blender.org/flamenco/internal/manager/persistence" + "git.blender.org/flamenco/internal/manager/task_state_machine/mocks" + "git.blender.org/flamenco/pkg/api" ) type StateMachineMocks struct { diff --git a/internal/worker/client.go b/internal/worker/client.go index 8507f57c..72b4381c 100644 --- a/internal/worker/client.go +++ b/internal/worker/client.go @@ -21,11 +21,11 @@ package worker * ***** END GPL LICENSE BLOCK ***** */ import ( - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + "git.blender.org/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 gitlab.com/blender/flamenco-ng-poc/internal/worker FlamencoClient +//go:generate go run github.com/golang/mock/mockgen -destination mocks/client.gen.go -package mocks git.blender.org/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 afe04572..56bdc361 100644 --- a/internal/worker/command_blender.go +++ b/internal/worker/command_blender.go @@ -32,7 +32,8 @@ import ( "github.com/google/shlex" "github.com/rs/zerolog" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + + "git.blender.org/flamenco/pkg/api" ) // The buffer size used to read stdout/stderr output from Blender. diff --git a/internal/worker/command_blender_test.go b/internal/worker/command_blender_test.go index ef9820d1..87daeeb3 100644 --- a/internal/worker/command_blender_test.go +++ b/internal/worker/command_blender_test.go @@ -7,7 +7,8 @@ import ( "github.com/golang/mock/gomock" "github.com/rs/zerolog" "github.com/stretchr/testify/assert" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + + "git.blender.org/flamenco/pkg/api" ) /* ***** BEGIN GPL LICENSE BLOCK ***** diff --git a/internal/worker/command_exe.go b/internal/worker/command_exe.go index 3850ba17..fb45997d 100644 --- a/internal/worker/command_exe.go +++ b/internal/worker/command_exe.go @@ -29,7 +29,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + + "git.blender.org/flamenco/pkg/api" ) type CommandExecutor struct { @@ -46,7 +47,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 gitlab.com/blender/flamenco-ng-poc/internal/worker CommandListener +//go:generate go run github.com/golang/mock/mockgen -destination mocks/command_listener.gen.go -package mocks git.blender.org/flamenco/internal/worker CommandListener // CommandListener sends the result of commands (log, output files) to the Manager. type CommandListener interface { @@ -63,7 +64,7 @@ type TimeService interface { Now() time.Time } -//go:generate go run github.com/golang/mock/mockgen -destination mocks/cli_runner.gen.go -package mocks gitlab.com/blender/flamenco-ng-poc/internal/worker CommandLineRunner +//go:generate go run github.com/golang/mock/mockgen -destination mocks/cli_runner.gen.go -package mocks git.blender.org/flamenco/internal/worker CommandLineRunner // CommandLineRunner is an interface around exec.CommandContext(). type CommandLineRunner interface { CommandContext(ctx context.Context, name string, arg ...string) *exec.Cmd diff --git a/internal/worker/command_exe_test.go b/internal/worker/command_exe_test.go index 5ce41923..0bf60f08 100644 --- a/internal/worker/command_exe_test.go +++ b/internal/worker/command_exe_test.go @@ -26,8 +26,9 @@ import ( "github.com/benbjohnson/clock" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "gitlab.com/blender/flamenco-ng-poc/internal/worker/mocks" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + + "git.blender.org/flamenco/internal/worker/mocks" + "git.blender.org/flamenco/pkg/api" ) type CommandExecutorMocks struct { diff --git a/internal/worker/command_misc.go b/internal/worker/command_misc.go index da21a415..467b8ddd 100644 --- a/internal/worker/command_misc.go +++ b/internal/worker/command_misc.go @@ -30,7 +30,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + + "git.blender.org/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 48fa1c46..d0c5ac72 100644 --- a/internal/worker/command_misc_test.go +++ b/internal/worker/command_misc_test.go @@ -27,7 +27,8 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + + "git.blender.org/flamenco/pkg/api" ) func TestCommandEcho(t *testing.T) { diff --git a/internal/worker/listener.go b/internal/worker/listener.go index 671644d1..e18df56b 100644 --- a/internal/worker/listener.go +++ b/internal/worker/listener.go @@ -29,7 +29,8 @@ import ( "time" "github.com/rs/zerolog/log" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + + "git.blender.org/flamenco/pkg/api" ) var _ CommandListener = (*Listener)(nil) diff --git a/internal/worker/log_chunker_test.go b/internal/worker/log_chunker_test.go index d2cba7ee..e3a23b9c 100644 --- a/internal/worker/log_chunker_test.go +++ b/internal/worker/log_chunker_test.go @@ -8,7 +8,8 @@ import ( "github.com/benbjohnson/clock" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "gitlab.com/blender/flamenco-ng-poc/internal/worker/mocks" + + "git.blender.org/flamenco/internal/worker/mocks" ) /* ***** BEGIN GPL LICENSE BLOCK ***** diff --git a/internal/worker/mocks/cli_runner.gen.go b/internal/worker/mocks/cli_runner.gen.go index 9e1244bb..9df5a2d5 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: gitlab.com/blender/flamenco-ng-poc/internal/worker (interfaces: CommandLineRunner) +// Source: git.blender.org/flamenco/internal/worker (interfaces: CommandLineRunner) // Package mocks is a generated GoMock package. package mocks diff --git a/internal/worker/mocks/client.gen.go b/internal/worker/mocks/client.gen.go index 65253bce..b940cc68 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: gitlab.com/blender/flamenco-ng-poc/internal/worker (interfaces: FlamencoClient) +// Source: git.blender.org/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 "gitlab.com/blender/flamenco-ng-poc/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 a1bc44d9..1581422e 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: gitlab.com/blender/flamenco-ng-poc/internal/worker (interfaces: CommandListener) +// Source: git.blender.org/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 aad9c53c..353ecc60 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: gitlab.com/blender/flamenco-ng-poc/internal/worker (interfaces: TaskExecutionListener) +// Source: git.blender.org/flamenco/internal/worker (interfaces: TaskExecutionListener) // Package mocks is a generated GoMock package. package mocks diff --git a/internal/worker/registration.go b/internal/worker/registration.go index 18bde96f..a5cd5da2 100644 --- a/internal/worker/registration.go +++ b/internal/worker/registration.go @@ -31,8 +31,9 @@ import ( "time" "github.com/rs/zerolog/log" - "gitlab.com/blender/flamenco-ng-poc/internal/appinfo" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + + "git.blender.org/flamenco/internal/appinfo" + "git.blender.org/flamenco/pkg/api" ) var ( diff --git a/internal/worker/state_asleep.go b/internal/worker/state_asleep.go index 3bfe1ee5..adaa18ff 100644 --- a/internal/worker/state_asleep.go +++ b/internal/worker/state_asleep.go @@ -25,7 +25,8 @@ import ( "time" "github.com/rs/zerolog/log" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + + "git.blender.org/flamenco/pkg/api" ) const durationSleepCheck = 3 * time.Second diff --git a/internal/worker/state_awake.go b/internal/worker/state_awake.go index 164b7c90..ef540edd 100644 --- a/internal/worker/state_awake.go +++ b/internal/worker/state_awake.go @@ -26,7 +26,8 @@ import ( "time" "github.com/rs/zerolog/log" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + + "git.blender.org/flamenco/pkg/api" ) const ( diff --git a/internal/worker/state_shutdown.go b/internal/worker/state_shutdown.go index 10064a83..36177517 100644 --- a/internal/worker/state_shutdown.go +++ b/internal/worker/state_shutdown.go @@ -25,7 +25,8 @@ import ( "os" "github.com/rs/zerolog/log" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + + "git.blender.org/flamenco/pkg/api" ) func (w *Worker) gotoStateShutdown(context.Context) { diff --git a/internal/worker/statemachine.go b/internal/worker/statemachine.go index 689e470b..cfbde842 100644 --- a/internal/worker/statemachine.go +++ b/internal/worker/statemachine.go @@ -24,7 +24,8 @@ import ( "context" "github.com/rs/zerolog/log" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + + "git.blender.org/flamenco/pkg/api" ) func (w *Worker) setupStateMachine() { diff --git a/internal/worker/statemonitor.go b/internal/worker/statemonitor.go index a9cc5614..b93bb7c0 100644 --- a/internal/worker/statemonitor.go +++ b/internal/worker/statemonitor.go @@ -25,7 +25,8 @@ import ( "net/http" "github.com/rs/zerolog/log" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + + "git.blender.org/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 546cb64b..aba6e70b 100644 --- a/internal/worker/task_executor.go +++ b/internal/worker/task_executor.go @@ -25,7 +25,8 @@ import ( "fmt" "github.com/rs/zerolog/log" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + + "git.blender.org/flamenco/pkg/api" ) type CommandRunner interface { @@ -33,7 +34,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 gitlab.com/blender/flamenco-ng-poc/internal/worker TaskExecutionListener +//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 // 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 c84330b0..79524dd5 100644 --- a/internal/worker/upstream_buffer.go +++ b/internal/worker/upstream_buffer.go @@ -31,9 +31,9 @@ import ( "time" "github.com/rs/zerolog/log" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" - _ "modernc.org/sqlite" + + "git.blender.org/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 5c522277..55ae3347 100644 --- a/internal/worker/upstream_buffer_test.go +++ b/internal/worker/upstream_buffer_test.go @@ -29,10 +29,10 @@ import ( "github.com/benbjohnson/clock" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - "gitlab.com/blender/flamenco-ng-poc/internal/worker/mocks" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" - _ "modernc.org/sqlite" + + "git.blender.org/flamenco/internal/worker/mocks" + "git.blender.org/flamenco/pkg/api" ) const testBufferDBFilename = "test-flamenco-worker.db" diff --git a/internal/worker/worker.go b/internal/worker/worker.go index 789b5a4d..97b9f463 100644 --- a/internal/worker/worker.go +++ b/internal/worker/worker.go @@ -25,7 +25,8 @@ import ( "sync" "github.com/rs/zerolog/log" - "gitlab.com/blender/flamenco-ng-poc/pkg/api" + + "git.blender.org/flamenco/pkg/api" ) // Worker performs regular Flamenco Worker operations.