From 7dba1768a423229054168ba2bd61a8d3e4983976 Mon Sep 17 00:00:00 2001 From: Rob Watson Date: Sun, 9 Mar 2025 19:58:25 +0100 Subject: [PATCH] refactor: internal package --- {app => internal/app}/app.go | 12 ++++++------ {app => internal/app}/integration_test.go | 8 ++++---- {config => internal/config}/config.go | 2 +- {config => internal/config}/service.go | 2 +- {config => internal/config}/service_test.go | 4 ++-- {config => internal/config}/testdata/complete.yml | 0 .../config}/testdata/invalid-destination-url.yml | 0 .../testdata/multiple-invalid-destination-urls.yml | 0 {config => internal/config}/testdata/no-logfile.yml | 0 {config => internal/config}/testdata/no-name.yml | 0 {container => internal/container}/container.go | 4 ++-- {container => internal/container}/container_test.go | 6 +++--- {container => internal/container}/events.go | 0 {container => internal/container}/events_test.go | 4 ++-- .../container}/integration_test.go | 8 ++++---- {container => internal/container}/stats.go | 0 {container => internal/container}/stats_test.go | 4 ++-- .../container}/testdata/stats1.json | 0 .../container}/testdata/stats2.json | 0 {domain => internal/domain}/constants.go | 0 {domain => internal/domain}/types.go | 0 {domain => internal/domain}/types_test.go | 2 +- .../generated}/mocks/container/dockerclient_mock.go | 0 .../generated}/mocks/mediaserver/httpclient_mock.go | 0 {mediaserver => internal/mediaserver}/actor.go | 4 ++-- {mediaserver => internal/mediaserver}/api.go | 0 {mediaserver => internal/mediaserver}/api_test.go | 2 +- .../mediaserver}/integration_test.go | 6 +++--- .../multiplexer}/integration_test.go | 8 ++++---- {multiplexer => internal/multiplexer}/multiplexer.go | 4 ++-- {shortid => internal/shortid}/shortid.go | 0 {shortid => internal/shortid}/shortid_test.go | 2 +- {terminal => internal/terminal}/command.go | 0 {terminal => internal/terminal}/terminal.go | 2 +- {terminal => internal/terminal}/terminal_test.go | 2 +- {testhelpers => internal/testhelpers}/channel.go | 0 {testhelpers => internal/testhelpers}/ffmpeg.go | 0 {testhelpers => internal/testhelpers}/logging.go | 0 main.go | 6 +++--- 39 files changed, 46 insertions(+), 46 deletions(-) rename {app => internal/app}/app.go (92%) rename {app => internal/app}/integration_test.go (85%) rename {config => internal/config}/config.go (87%) rename {config => internal/config}/service.go (98%) rename {config => internal/config}/service_test.go (97%) rename {config => internal/config}/testdata/complete.yml (100%) rename {config => internal/config}/testdata/invalid-destination-url.yml (100%) rename {config => internal/config}/testdata/multiple-invalid-destination-urls.yml (100%) rename {config => internal/config}/testdata/no-logfile.yml (100%) rename {config => internal/config}/testdata/no-name.yml (100%) rename {container => internal/container}/container.go (99%) rename {container => internal/container}/container_test.go (97%) rename {container => internal/container}/events.go (100%) rename {container => internal/container}/events_test.go (90%) rename {container => internal/container}/integration_test.go (97%) rename {container => internal/container}/stats.go (100%) rename {container => internal/container}/stats_test.go (95%) rename {container => internal/container}/testdata/stats1.json (100%) rename {container => internal/container}/testdata/stats2.json (100%) rename {domain => internal/domain}/constants.go (100%) rename {domain => internal/domain}/types.go (100%) rename {domain => internal/domain}/types_test.go (93%) rename {generated => internal/generated}/mocks/container/dockerclient_mock.go (100%) rename {generated => internal/generated}/mocks/mediaserver/httpclient_mock.go (100%) rename {mediaserver => internal/mediaserver}/actor.go (98%) rename {mediaserver => internal/mediaserver}/api.go (100%) rename {mediaserver => internal/mediaserver}/api_test.go (98%) rename {mediaserver => internal/mediaserver}/integration_test.go (94%) rename {multiplexer => internal/multiplexer}/integration_test.go (92%) rename {multiplexer => internal/multiplexer}/multiplexer.go (98%) rename {shortid => internal/shortid}/shortid.go (100%) rename {shortid => internal/shortid}/shortid_test.go (84%) rename {terminal => internal/terminal}/command.go (100%) rename {terminal => internal/terminal}/terminal.go (99%) rename {terminal => internal/terminal}/terminal_test.go (97%) rename {testhelpers => internal/testhelpers}/channel.go (100%) rename {testhelpers => internal/testhelpers}/ffmpeg.go (100%) rename {testhelpers => internal/testhelpers}/logging.go (100%) diff --git a/app/app.go b/internal/app/app.go similarity index 92% rename from app/app.go rename to internal/app/app.go index df8d832..b05201c 100644 --- a/app/app.go +++ b/internal/app/app.go @@ -6,12 +6,12 @@ import ( "log/slog" "time" - "git.netflux.io/rob/octoplex/config" - "git.netflux.io/rob/octoplex/container" - "git.netflux.io/rob/octoplex/domain" - "git.netflux.io/rob/octoplex/mediaserver" - "git.netflux.io/rob/octoplex/multiplexer" - "git.netflux.io/rob/octoplex/terminal" + "git.netflux.io/rob/octoplex/internal/config" + "git.netflux.io/rob/octoplex/internal/container" + "git.netflux.io/rob/octoplex/internal/domain" + "git.netflux.io/rob/octoplex/internal/mediaserver" + "git.netflux.io/rob/octoplex/internal/multiplexer" + "git.netflux.io/rob/octoplex/internal/terminal" "github.com/gdamore/tcell/v2" ) diff --git a/app/integration_test.go b/internal/app/integration_test.go similarity index 85% rename from app/integration_test.go rename to internal/app/integration_test.go index 1d35d09..fb5d648 100644 --- a/app/integration_test.go +++ b/internal/app/integration_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "git.netflux.io/rob/octoplex/app" - "git.netflux.io/rob/octoplex/config" - "git.netflux.io/rob/octoplex/domain" - "git.netflux.io/rob/octoplex/testhelpers" + "git.netflux.io/rob/octoplex/internal/app" + "git.netflux.io/rob/octoplex/internal/config" + "git.netflux.io/rob/octoplex/internal/domain" + "git.netflux.io/rob/octoplex/internal/testhelpers" dockerclient "github.com/docker/docker/client" "github.com/gdamore/tcell/v2" "github.com/stretchr/testify/require" diff --git a/config/config.go b/internal/config/config.go similarity index 87% rename from config/config.go rename to internal/config/config.go index 9dcee0b..19d9e63 100644 --- a/config/config.go +++ b/internal/config/config.go @@ -1,6 +1,6 @@ package config -import "git.netflux.io/rob/octoplex/domain" +import "git.netflux.io/rob/octoplex/internal/domain" const defaultLogFile = domain.AppName + ".log" diff --git a/config/service.go b/internal/config/service.go similarity index 98% rename from config/service.go rename to internal/config/service.go index 09b2a26..87cf715 100644 --- a/config/service.go +++ b/internal/config/service.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "git.netflux.io/rob/octoplex/domain" + "git.netflux.io/rob/octoplex/internal/domain" "gopkg.in/yaml.v3" ) diff --git a/config/service_test.go b/internal/config/service_test.go similarity index 97% rename from config/service_test.go rename to internal/config/service_test.go index 11e5347..4f9187f 100644 --- a/config/service_test.go +++ b/internal/config/service_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" - "git.netflux.io/rob/octoplex/config" - "git.netflux.io/rob/octoplex/shortid" + "git.netflux.io/rob/octoplex/internal/config" + "git.netflux.io/rob/octoplex/internal/shortid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/config/testdata/complete.yml b/internal/config/testdata/complete.yml similarity index 100% rename from config/testdata/complete.yml rename to internal/config/testdata/complete.yml diff --git a/config/testdata/invalid-destination-url.yml b/internal/config/testdata/invalid-destination-url.yml similarity index 100% rename from config/testdata/invalid-destination-url.yml rename to internal/config/testdata/invalid-destination-url.yml diff --git a/config/testdata/multiple-invalid-destination-urls.yml b/internal/config/testdata/multiple-invalid-destination-urls.yml similarity index 100% rename from config/testdata/multiple-invalid-destination-urls.yml rename to internal/config/testdata/multiple-invalid-destination-urls.yml diff --git a/config/testdata/no-logfile.yml b/internal/config/testdata/no-logfile.yml similarity index 100% rename from config/testdata/no-logfile.yml rename to internal/config/testdata/no-logfile.yml diff --git a/config/testdata/no-name.yml b/internal/config/testdata/no-name.yml similarity index 100% rename from config/testdata/no-name.yml rename to internal/config/testdata/no-name.yml diff --git a/container/container.go b/internal/container/container.go similarity index 99% rename from container/container.go rename to internal/container/container.go index 56d73b2..28a10c7 100644 --- a/container/container.go +++ b/internal/container/container.go @@ -11,8 +11,8 @@ import ( "sync" "time" - "git.netflux.io/rob/octoplex/domain" - "git.netflux.io/rob/octoplex/shortid" + "git.netflux.io/rob/octoplex/internal/domain" + "git.netflux.io/rob/octoplex/internal/shortid" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/filters" diff --git a/container/container_test.go b/internal/container/container_test.go similarity index 97% rename from container/container_test.go rename to internal/container/container_test.go index 544767c..5dedeeb 100644 --- a/container/container_test.go +++ b/internal/container/container_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "git.netflux.io/rob/octoplex/container" - containermocks "git.netflux.io/rob/octoplex/generated/mocks/container" - "git.netflux.io/rob/octoplex/testhelpers" + "git.netflux.io/rob/octoplex/internal/container" + containermocks "git.netflux.io/rob/octoplex/internal/generated/mocks/container" + "git.netflux.io/rob/octoplex/internal/testhelpers" dockercontainer "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/filters" diff --git a/container/events.go b/internal/container/events.go similarity index 100% rename from container/events.go rename to internal/container/events.go diff --git a/container/events_test.go b/internal/container/events_test.go similarity index 90% rename from container/events_test.go rename to internal/container/events_test.go index 0bf96aa..97be628 100644 --- a/container/events_test.go +++ b/internal/container/events_test.go @@ -5,8 +5,8 @@ import ( "io" "testing" - containermocks "git.netflux.io/rob/octoplex/generated/mocks/container" - "git.netflux.io/rob/octoplex/testhelpers" + containermocks "git.netflux.io/rob/octoplex/internal/generated/mocks/container" + "git.netflux.io/rob/octoplex/internal/testhelpers" "github.com/docker/docker/api/types/events" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/container/integration_test.go b/internal/container/integration_test.go similarity index 97% rename from container/integration_test.go rename to internal/container/integration_test.go index c81dd59..a2d0c1c 100644 --- a/container/integration_test.go +++ b/internal/container/integration_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "git.netflux.io/rob/octoplex/container" - "git.netflux.io/rob/octoplex/domain" - "git.netflux.io/rob/octoplex/shortid" - "git.netflux.io/rob/octoplex/testhelpers" + "git.netflux.io/rob/octoplex/internal/container" + "git.netflux.io/rob/octoplex/internal/domain" + "git.netflux.io/rob/octoplex/internal/shortid" + "git.netflux.io/rob/octoplex/internal/testhelpers" typescontainer "github.com/docker/docker/api/types/container" "github.com/docker/docker/client" "github.com/stretchr/testify/assert" diff --git a/container/stats.go b/internal/container/stats.go similarity index 100% rename from container/stats.go rename to internal/container/stats.go diff --git a/container/stats_test.go b/internal/container/stats_test.go similarity index 95% rename from container/stats_test.go rename to internal/container/stats_test.go index a91220a..55510db 100644 --- a/container/stats_test.go +++ b/internal/container/stats_test.go @@ -7,8 +7,8 @@ import ( "io" "testing" - containermocks "git.netflux.io/rob/octoplex/generated/mocks/container" - "git.netflux.io/rob/octoplex/testhelpers" + containermocks "git.netflux.io/rob/octoplex/internal/generated/mocks/container" + "git.netflux.io/rob/octoplex/internal/testhelpers" dockercontainer "github.com/docker/docker/api/types/container" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/container/testdata/stats1.json b/internal/container/testdata/stats1.json similarity index 100% rename from container/testdata/stats1.json rename to internal/container/testdata/stats1.json diff --git a/container/testdata/stats2.json b/internal/container/testdata/stats2.json similarity index 100% rename from container/testdata/stats2.json rename to internal/container/testdata/stats2.json diff --git a/domain/constants.go b/internal/domain/constants.go similarity index 100% rename from domain/constants.go rename to internal/domain/constants.go diff --git a/domain/types.go b/internal/domain/types.go similarity index 100% rename from domain/types.go rename to internal/domain/types.go diff --git a/domain/types_test.go b/internal/domain/types_test.go similarity index 93% rename from domain/types_test.go rename to internal/domain/types_test.go index ba8b375..e5838cc 100644 --- a/domain/types_test.go +++ b/internal/domain/types_test.go @@ -3,7 +3,7 @@ package domain_test import ( "testing" - "git.netflux.io/rob/octoplex/domain" + "git.netflux.io/rob/octoplex/internal/domain" "github.com/stretchr/testify/assert" ) diff --git a/generated/mocks/container/dockerclient_mock.go b/internal/generated/mocks/container/dockerclient_mock.go similarity index 100% rename from generated/mocks/container/dockerclient_mock.go rename to internal/generated/mocks/container/dockerclient_mock.go diff --git a/generated/mocks/mediaserver/httpclient_mock.go b/internal/generated/mocks/mediaserver/httpclient_mock.go similarity index 100% rename from generated/mocks/mediaserver/httpclient_mock.go rename to internal/generated/mocks/mediaserver/httpclient_mock.go diff --git a/mediaserver/actor.go b/internal/mediaserver/actor.go similarity index 98% rename from mediaserver/actor.go rename to internal/mediaserver/actor.go index 80cc132..8ec7913 100644 --- a/mediaserver/actor.go +++ b/internal/mediaserver/actor.go @@ -12,8 +12,8 @@ import ( typescontainer "github.com/docker/docker/api/types/container" "github.com/docker/go-connections/nat" - "git.netflux.io/rob/octoplex/container" - "git.netflux.io/rob/octoplex/domain" + "git.netflux.io/rob/octoplex/internal/container" + "git.netflux.io/rob/octoplex/internal/domain" ) const ( diff --git a/mediaserver/api.go b/internal/mediaserver/api.go similarity index 100% rename from mediaserver/api.go rename to internal/mediaserver/api.go diff --git a/mediaserver/api_test.go b/internal/mediaserver/api_test.go similarity index 98% rename from mediaserver/api_test.go rename to internal/mediaserver/api_test.go index 7be4c3f..b9ed358 100644 --- a/mediaserver/api_test.go +++ b/internal/mediaserver/api_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - mocks "git.netflux.io/rob/octoplex/generated/mocks/mediaserver" + mocks "git.netflux.io/rob/octoplex/internal/generated/mocks/mediaserver" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" ) diff --git a/mediaserver/integration_test.go b/internal/mediaserver/integration_test.go similarity index 94% rename from mediaserver/integration_test.go rename to internal/mediaserver/integration_test.go index 5583c9f..151a58c 100644 --- a/mediaserver/integration_test.go +++ b/internal/mediaserver/integration_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "git.netflux.io/rob/octoplex/container" - "git.netflux.io/rob/octoplex/mediaserver" - "git.netflux.io/rob/octoplex/testhelpers" + "git.netflux.io/rob/octoplex/internal/container" + "git.netflux.io/rob/octoplex/internal/mediaserver" + "git.netflux.io/rob/octoplex/internal/testhelpers" "github.com/docker/docker/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/multiplexer/integration_test.go b/internal/multiplexer/integration_test.go similarity index 92% rename from multiplexer/integration_test.go rename to internal/multiplexer/integration_test.go index 0a42dfd..f06a630 100644 --- a/multiplexer/integration_test.go +++ b/internal/multiplexer/integration_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "git.netflux.io/rob/octoplex/container" - "git.netflux.io/rob/octoplex/mediaserver" - "git.netflux.io/rob/octoplex/multiplexer" - "git.netflux.io/rob/octoplex/testhelpers" + "git.netflux.io/rob/octoplex/internal/container" + "git.netflux.io/rob/octoplex/internal/mediaserver" + "git.netflux.io/rob/octoplex/internal/multiplexer" + "git.netflux.io/rob/octoplex/internal/testhelpers" "github.com/docker/docker/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/multiplexer/multiplexer.go b/internal/multiplexer/multiplexer.go similarity index 98% rename from multiplexer/multiplexer.go rename to internal/multiplexer/multiplexer.go index b25fa02..fd886a3 100644 --- a/multiplexer/multiplexer.go +++ b/internal/multiplexer/multiplexer.go @@ -11,8 +11,8 @@ import ( typescontainer "github.com/docker/docker/api/types/container" - "git.netflux.io/rob/octoplex/container" - "git.netflux.io/rob/octoplex/domain" + "git.netflux.io/rob/octoplex/internal/container" + "git.netflux.io/rob/octoplex/internal/domain" ) type action func() diff --git a/shortid/shortid.go b/internal/shortid/shortid.go similarity index 100% rename from shortid/shortid.go rename to internal/shortid/shortid.go diff --git a/shortid/shortid_test.go b/internal/shortid/shortid_test.go similarity index 84% rename from shortid/shortid_test.go rename to internal/shortid/shortid_test.go index 0626e9a..8288f18 100644 --- a/shortid/shortid_test.go +++ b/internal/shortid/shortid_test.go @@ -3,7 +3,7 @@ package shortid_test import ( "testing" - "git.netflux.io/rob/octoplex/shortid" + "git.netflux.io/rob/octoplex/internal/shortid" "github.com/stretchr/testify/assert" ) diff --git a/terminal/command.go b/internal/terminal/command.go similarity index 100% rename from terminal/command.go rename to internal/terminal/command.go diff --git a/terminal/terminal.go b/internal/terminal/terminal.go similarity index 99% rename from terminal/terminal.go rename to internal/terminal/terminal.go index b8a3675..b807e22 100644 --- a/terminal/terminal.go +++ b/internal/terminal/terminal.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "git.netflux.io/rob/octoplex/domain" + "git.netflux.io/rob/octoplex/internal/domain" "github.com/gdamore/tcell/v2" "github.com/rivo/tview" "golang.design/x/clipboard" diff --git a/terminal/terminal_test.go b/internal/terminal/terminal_test.go similarity index 97% rename from terminal/terminal_test.go rename to internal/terminal/terminal_test.go index 657e714..efcf07e 100644 --- a/terminal/terminal_test.go +++ b/internal/terminal/terminal_test.go @@ -3,7 +3,7 @@ package terminal import ( "testing" - "git.netflux.io/rob/octoplex/domain" + "git.netflux.io/rob/octoplex/internal/domain" "github.com/stretchr/testify/assert" ) diff --git a/testhelpers/channel.go b/internal/testhelpers/channel.go similarity index 100% rename from testhelpers/channel.go rename to internal/testhelpers/channel.go diff --git a/testhelpers/ffmpeg.go b/internal/testhelpers/ffmpeg.go similarity index 100% rename from testhelpers/ffmpeg.go rename to internal/testhelpers/ffmpeg.go diff --git a/testhelpers/logging.go b/internal/testhelpers/logging.go similarity index 100% rename from testhelpers/logging.go rename to internal/testhelpers/logging.go diff --git a/main.go b/main.go index a896f4a..879b0a2 100644 --- a/main.go +++ b/main.go @@ -10,9 +10,9 @@ import ( "runtime/debug" "syscall" - "git.netflux.io/rob/octoplex/app" - "git.netflux.io/rob/octoplex/config" - "git.netflux.io/rob/octoplex/domain" + "git.netflux.io/rob/octoplex/internal/app" + "git.netflux.io/rob/octoplex/internal/config" + "git.netflux.io/rob/octoplex/internal/domain" dockerclient "github.com/docker/docker/client" "golang.design/x/clipboard" )