Change package URL to the blender.org repository

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/)
 

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"
+	"git.blender.org/flamenco/internal/appinfo"
-	"gitlab.com/blender/flamenco-ng-poc/internal/manager/api_impl"
+	"git.blender.org/flamenco/internal/manager/api_impl"
-	"gitlab.com/blender/flamenco-ng-poc/internal/manager/config"
+	"git.blender.org/flamenco/internal/manager/config"
-	"gitlab.com/blender/flamenco-ng-poc/internal/manager/job_compilers"
+	"git.blender.org/flamenco/internal/manager/job_compilers"
-	"gitlab.com/blender/flamenco-ng-poc/internal/manager/persistence"
+	"git.blender.org/flamenco/internal/manager/persistence"
-	"gitlab.com/blender/flamenco-ng-poc/internal/manager/swagger_ui"
+	"git.blender.org/flamenco/internal/manager/swagger_ui"
-	"gitlab.com/blender/flamenco-ng-poc/internal/manager/task_logs"
+	"git.blender.org/flamenco/internal/manager/task_logs"
-	"gitlab.com/blender/flamenco-ng-poc/internal/manager/task_state_machine"
+	"git.blender.org/flamenco/internal/manager/task_state_machine"
-	"gitlab.com/blender/flamenco-ng-poc/pkg/api"
+	"git.blender.org/flamenco/pkg/api"
 )
 
 var cliArgs struct {

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"
+	"git.blender.org/flamenco/internal/appinfo"
-	"gitlab.com/blender/flamenco-ng-poc/internal/worker"
+	"git.blender.org/flamenco/internal/worker"
 )
 
 var (

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 {

go.mod

@@ -1,4 +1,4 @@
-module gitlab.com/blender/flamenco-ng-poc
+module git.blender.org/flamenco
 
 go 1.18
 

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

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 {

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 {

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.

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 {

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"
+	"git.blender.org/flamenco/internal/manager/config"
-	"gitlab.com/blender/flamenco-ng-poc/internal/manager/persistence"
+	"git.blender.org/flamenco/internal/manager/persistence"
-	"gitlab.com/blender/flamenco-ng-poc/pkg/api"
+	"git.blender.org/flamenco/pkg/api"
 )
 
 type VariableReplacer interface {

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"
+	"git.blender.org/flamenco/internal/manager/config"
-	"gitlab.com/blender/flamenco-ng-poc/pkg/api"
+	"git.blender.org/flamenco/internal/manager/persistence"
+	"git.blender.org/flamenco/pkg/api"
 )
 
 func varreplTestTask() api.AssignedTask {

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

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"
+	"git.blender.org/flamenco/internal/manager/persistence"
-	"gitlab.com/blender/flamenco-ng-poc/pkg/api"
+	"git.blender.org/flamenco/pkg/api"
 )
 
 // RegisterWorker registers a new worker and stores it in the database.

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) {

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.

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.

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")

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 {

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.

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 {

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) {

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 (

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) {

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 {

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) {

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.

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

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"
+	"git.blender.org/flamenco/internal/manager/persistence"
-	"gitlab.com/blender/flamenco-ng-poc/internal/manager/task_state_machine/mocks"
+	"git.blender.org/flamenco/internal/manager/task_state_machine/mocks"
-	"gitlab.com/blender/flamenco-ng-poc/pkg/api"
+	"git.blender.org/flamenco/pkg/api"
 )
 
 type StateMachineMocks struct {

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 {

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.

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 *****

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

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 {

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.

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) {

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)

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 *****

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

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.

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

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

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 (

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

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 (

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) {

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() {

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.

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 {

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

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"

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.