diff --git a/Makefile b/Makefile index 82cb028..f20d89d 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ all: wdcli wdcli: - go generate ./internal/component/static/ + go generate ./internal/dis/component/static/ go build -o ./wdcli ./cmd/wdcli deps: diff --git a/cmd/backup.go b/cmd/backup.go index a849c5c..4b0c5fb 100644 --- a/cmd/backup.go +++ b/cmd/backup.go @@ -3,7 +3,7 @@ package cmd import ( wisski_distillery "github.com/FAU-CDI/wisski-distillery" "github.com/FAU-CDI/wisski-distillery/internal/cli" - "github.com/FAU-CDI/wisski-distillery/internal/component/exporter" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/exporter" "github.com/FAU-CDI/wisski-distillery/pkg/logging" "github.com/tkw1536/goprogram/exit" ) diff --git a/cmd/purge.go b/cmd/purge.go index 70714e9..fc0ca66 100644 --- a/cmd/purge.go +++ b/cmd/purge.go @@ -3,7 +3,7 @@ package cmd import ( wisski_distillery "github.com/FAU-CDI/wisski-distillery" "github.com/FAU-CDI/wisski-distillery/internal/cli" - "github.com/FAU-CDI/wisski-distillery/internal/component/instances" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/instances" "github.com/FAU-CDI/wisski-distillery/pkg/logging" "github.com/tkw1536/goprogram/exit" ) diff --git a/cmd/reserve.go b/cmd/reserve.go index 73df3c2..706b943 100644 --- a/cmd/reserve.go +++ b/cmd/reserve.go @@ -3,7 +3,7 @@ package cmd import ( wisski_distillery "github.com/FAU-CDI/wisski-distillery" "github.com/FAU-CDI/wisski-distillery/internal/cli" - "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" "github.com/FAU-CDI/wisski-distillery/pkg/fsx" "github.com/FAU-CDI/wisski-distillery/pkg/logging" "github.com/tkw1536/goprogram/exit" diff --git a/cmd/snapshot.go b/cmd/snapshot.go index 6844bcc..0915c0b 100644 --- a/cmd/snapshot.go +++ b/cmd/snapshot.go @@ -3,7 +3,7 @@ package cmd import ( wisski_distillery "github.com/FAU-CDI/wisski-distillery" "github.com/FAU-CDI/wisski-distillery/internal/cli" - "github.com/FAU-CDI/wisski-distillery/internal/component/exporter" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/exporter" "github.com/tkw1536/goprogram/exit" ) diff --git a/cmd/system_update.go b/cmd/system_update.go index 99613c1..c526af1 100644 --- a/cmd/system_update.go +++ b/cmd/system_update.go @@ -6,7 +6,7 @@ import ( wisski_distillery "github.com/FAU-CDI/wisski-distillery" "github.com/FAU-CDI/wisski-distillery/internal/cli" - "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" "github.com/FAU-CDI/wisski-distillery/pkg/environment" "github.com/FAU-CDI/wisski-distillery/pkg/fsx" "github.com/FAU-CDI/wisski-distillery/pkg/logging" diff --git a/internal/dis/component.go b/internal/dis/component.go index 59b5743..782e2f6 100644 --- a/internal/dis/component.go +++ b/internal/dis/component.go @@ -1,7 +1,7 @@ package dis import ( - "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" "github.com/FAU-CDI/wisski-distillery/pkg/lazy" "github.com/tkw1536/goprogram/lib/collection" ) diff --git a/internal/component/backup.go b/internal/dis/component/backup.go similarity index 100% rename from internal/component/backup.go rename to internal/dis/component/backup.go diff --git a/internal/component/component.go b/internal/dis/component/component.go similarity index 100% rename from internal/component/component.go rename to internal/dis/component/component.go diff --git a/internal/component/control/control.env b/internal/dis/component/control/control.env similarity index 100% rename from internal/component/control/control.env rename to internal/dis/component/control/control.env diff --git a/internal/component/control/control.go b/internal/dis/component/control/control.go similarity index 96% rename from internal/component/control/control.go rename to internal/dis/component/control/control.go index 28c135c..7215a39 100644 --- a/internal/component/control/control.go +++ b/internal/dis/component/control/control.go @@ -5,7 +5,7 @@ import ( "path/filepath" "github.com/FAU-CDI/wisski-distillery/internal/bootstrap" - "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" "github.com/FAU-CDI/wisski-distillery/pkg/environment" ) diff --git a/internal/component/control/control/Dockerfile b/internal/dis/component/control/control/Dockerfile similarity index 100% rename from internal/component/control/control/Dockerfile rename to internal/dis/component/control/control/Dockerfile diff --git a/internal/component/control/control/docker-compose.yml b/internal/dis/component/control/control/docker-compose.yml similarity index 100% rename from internal/component/control/control/docker-compose.yml rename to internal/dis/component/control/control/docker-compose.yml diff --git a/internal/component/control/server.go b/internal/dis/component/control/server.go similarity index 100% rename from internal/component/control/server.go rename to internal/dis/component/control/server.go diff --git a/internal/component/exporter/backup.go b/internal/dis/component/exporter/backup.go similarity index 98% rename from internal/component/exporter/backup.go rename to internal/dis/component/exporter/backup.go index 41ccd71..46597d7 100644 --- a/internal/component/exporter/backup.go +++ b/internal/dis/component/exporter/backup.go @@ -6,7 +6,7 @@ import ( "path/filepath" "time" - "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" "github.com/FAU-CDI/wisski-distillery/internal/wisski" "github.com/FAU-CDI/wisski-distillery/pkg/environment" diff --git a/internal/component/exporter/exporter.go b/internal/dis/component/exporter/exporter.go similarity index 89% rename from internal/component/exporter/exporter.go rename to internal/dis/component/exporter/exporter.go index c65d21e..ae89e3d 100644 --- a/internal/component/exporter/exporter.go +++ b/internal/dis/component/exporter/exporter.go @@ -5,11 +5,11 @@ import ( "path/filepath" "time" - "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" - "github.com/FAU-CDI/wisski-distillery/internal/component/exporter/logger" - "github.com/FAU-CDI/wisski-distillery/internal/component/instances" - "github.com/FAU-CDI/wisski-distillery/internal/component/sql" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/exporter/logger" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/instances" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/sql" "github.com/FAU-CDI/wisski-distillery/pkg/environment" "github.com/FAU-CDI/wisski-distillery/pkg/fsx" "github.com/FAU-CDI/wisski-distillery/pkg/password" diff --git a/internal/component/exporter/extras_bookkeeping.go b/internal/dis/component/exporter/extras_bookkeeping.go similarity index 91% rename from internal/component/exporter/extras_bookkeeping.go rename to internal/dis/component/exporter/extras_bookkeeping.go index 2199094..026df1b 100644 --- a/internal/component/exporter/extras_bookkeeping.go +++ b/internal/dis/component/exporter/extras_bookkeeping.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" "github.com/FAU-CDI/wisski-distillery/internal/models" ) diff --git a/internal/component/exporter/extras_config.go b/internal/dis/component/exporter/extras_config.go similarity index 92% rename from internal/component/exporter/extras_config.go rename to internal/dis/component/exporter/extras_config.go index bd51c60..2ba25df 100644 --- a/internal/component/exporter/extras_config.go +++ b/internal/dis/component/exporter/extras_config.go @@ -3,7 +3,7 @@ package exporter import ( "path/filepath" - "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" ) // Config implements backing up configuration diff --git a/internal/component/exporter/extras_filesystem.go b/internal/dis/component/exporter/extras_filesystem.go similarity index 91% rename from internal/component/exporter/extras_filesystem.go rename to internal/dis/component/exporter/extras_filesystem.go index 1ca0043..e91f0c4 100644 --- a/internal/component/exporter/extras_filesystem.go +++ b/internal/dis/component/exporter/extras_filesystem.go @@ -1,7 +1,7 @@ package exporter import ( - "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" "github.com/FAU-CDI/wisski-distillery/internal/models" ) diff --git a/internal/component/exporter/extras_pathbuilders.go b/internal/dis/component/exporter/extras_pathbuilders.go similarity index 85% rename from internal/component/exporter/extras_pathbuilders.go rename to internal/dis/component/exporter/extras_pathbuilders.go index 24636ad..c8c7d60 100644 --- a/internal/component/exporter/extras_pathbuilders.go +++ b/internal/dis/component/exporter/extras_pathbuilders.go @@ -3,8 +3,8 @@ package exporter import ( "io" - "github.com/FAU-CDI/wisski-distillery/internal/component" - "github.com/FAU-CDI/wisski-distillery/internal/component/instances" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/instances" "github.com/FAU-CDI/wisski-distillery/internal/models" ) diff --git a/internal/component/exporter/iface.go b/internal/dis/component/exporter/iface.go similarity index 100% rename from internal/component/exporter/iface.go rename to internal/dis/component/exporter/iface.go diff --git a/internal/component/exporter/log.go b/internal/dis/component/exporter/log.go similarity index 100% rename from internal/component/exporter/log.go rename to internal/dis/component/exporter/log.go diff --git a/internal/component/exporter/logger/logger.go b/internal/dis/component/exporter/logger/logger.go similarity index 93% rename from internal/component/exporter/logger/logger.go rename to internal/dis/component/exporter/logger/logger.go index ca9fafd..f71bfbe 100644 --- a/internal/component/exporter/logger/logger.go +++ b/internal/dis/component/exporter/logger/logger.go @@ -1,8 +1,8 @@ package logger import ( - "github.com/FAU-CDI/wisski-distillery/internal/component" - "github.com/FAU-CDI/wisski-distillery/internal/component/sql" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/sql" "github.com/FAU-CDI/wisski-distillery/internal/models" "github.com/FAU-CDI/wisski-distillery/pkg/environment" "github.com/tkw1536/goprogram/lib/collection" diff --git a/internal/component/exporter/manifest.go b/internal/dis/component/exporter/manifest.go similarity index 100% rename from internal/component/exporter/manifest.go rename to internal/dis/component/exporter/manifest.go diff --git a/internal/component/exporter/prune.go b/internal/dis/component/exporter/prune.go similarity index 100% rename from internal/component/exporter/prune.go rename to internal/dis/component/exporter/prune.go diff --git a/internal/component/exporter/report.go b/internal/dis/component/exporter/report.go similarity index 100% rename from internal/component/exporter/report.go rename to internal/dis/component/exporter/report.go diff --git a/internal/component/exporter/snapshot.go b/internal/dis/component/exporter/snapshot.go similarity index 98% rename from internal/component/exporter/snapshot.go rename to internal/dis/component/exporter/snapshot.go index c4ae1f0..597aa74 100644 --- a/internal/component/exporter/snapshot.go +++ b/internal/dis/component/exporter/snapshot.go @@ -6,7 +6,7 @@ import ( "path/filepath" "time" - "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" "github.com/FAU-CDI/wisski-distillery/internal/models" "github.com/FAU-CDI/wisski-distillery/internal/wisski" "github.com/FAU-CDI/wisski-distillery/pkg/logging" diff --git a/internal/component/home/home.go b/internal/dis/component/home/home.go similarity index 92% rename from internal/component/home/home.go rename to internal/dis/component/home/home.go index 0ad27bb..636c4b5 100644 --- a/internal/component/home/home.go +++ b/internal/dis/component/home/home.go @@ -6,8 +6,8 @@ import ( "net/http" "time" - "github.com/FAU-CDI/wisski-distillery/internal/component" - "github.com/FAU-CDI/wisski-distillery/internal/component/instances" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/instances" "github.com/FAU-CDI/wisski-distillery/pkg/lazy" "github.com/tkw1536/goprogram/stream" ) diff --git a/internal/component/home/home.html b/internal/dis/component/home/home.html similarity index 100% rename from internal/component/home/home.html rename to internal/dis/component/home/home.html diff --git a/internal/component/home/public.go b/internal/dis/component/home/public.go similarity index 96% rename from internal/component/home/public.go rename to internal/dis/component/home/public.go index 6e3b093..a51c2f1 100644 --- a/internal/component/home/public.go +++ b/internal/dis/component/home/public.go @@ -7,7 +7,7 @@ import ( _ "embed" - "github.com/FAU-CDI/wisski-distillery/internal/component/static" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/static" "github.com/FAU-CDI/wisski-distillery/internal/wisski" "github.com/FAU-CDI/wisski-distillery/pkg/timex" "github.com/tkw1536/goprogram/stream" diff --git a/internal/component/home/redirect.go b/internal/dis/component/home/redirect.go similarity index 100% rename from internal/component/home/redirect.go rename to internal/dis/component/home/redirect.go diff --git a/internal/component/info/html/index.html b/internal/dis/component/info/html/index.html similarity index 100% rename from internal/component/info/html/index.html rename to internal/dis/component/info/html/index.html diff --git a/internal/component/info/html/instance.html b/internal/dis/component/info/html/instance.html similarity index 100% rename from internal/component/info/html/instance.html rename to internal/dis/component/info/html/instance.html diff --git a/internal/component/info/index.go b/internal/dis/component/info/index.go similarity index 95% rename from internal/component/info/index.go rename to internal/dis/component/info/index.go index 6e7de2e..4d64e0f 100644 --- a/internal/component/info/index.go +++ b/internal/dis/component/info/index.go @@ -6,8 +6,8 @@ import ( _ "embed" - "github.com/FAU-CDI/wisski-distillery/internal/component/static" "github.com/FAU-CDI/wisski-distillery/internal/config" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/static" "github.com/FAU-CDI/wisski-distillery/internal/models" "github.com/FAU-CDI/wisski-distillery/internal/wisski" "golang.org/x/sync/errgroup" diff --git a/internal/component/info/info.go b/internal/dis/component/info/info.go similarity index 82% rename from internal/component/info/info.go rename to internal/dis/component/info/info.go index 1e61d4c..8903a43 100644 --- a/internal/component/info/info.go +++ b/internal/dis/component/info/info.go @@ -4,11 +4,11 @@ import ( "context" "net/http" - "github.com/FAU-CDI/wisski-distillery/internal/component" - "github.com/FAU-CDI/wisski-distillery/internal/component/exporter" - "github.com/FAU-CDI/wisski-distillery/internal/component/exporter/logger" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/exporter" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/exporter/logger" - "github.com/FAU-CDI/wisski-distillery/internal/component/instances" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/instances" "github.com/FAU-CDI/wisski-distillery/pkg/httpx" "github.com/tkw1536/goprogram/stream" ) diff --git a/internal/component/info/instance.go b/internal/dis/component/info/instance.go similarity index 88% rename from internal/component/info/instance.go rename to internal/dis/component/info/instance.go index 0547793..64d273c 100644 --- a/internal/component/info/instance.go +++ b/internal/dis/component/info/instance.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/FAU-CDI/wisski-distillery/internal/component/instances" - "github.com/FAU-CDI/wisski-distillery/internal/component/static" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/instances" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/static" "github.com/FAU-CDI/wisski-distillery/internal/models" "github.com/FAU-CDI/wisski-distillery/internal/wisski" "github.com/FAU-CDI/wisski-distillery/pkg/httpx" diff --git a/internal/component/info/socket.go b/internal/dis/component/info/socket.go similarity index 96% rename from internal/component/info/socket.go rename to internal/dis/component/info/socket.go index aa811a9..6999128 100644 --- a/internal/component/info/socket.go +++ b/internal/dis/component/info/socket.go @@ -1,7 +1,7 @@ package info import ( - "github.com/FAU-CDI/wisski-distillery/internal/component/exporter" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/exporter" "github.com/FAU-CDI/wisski-distillery/internal/wisski" "github.com/FAU-CDI/wisski-distillery/pkg/httpx" "github.com/tkw1536/goprogram/status" diff --git a/internal/component/installable.go b/internal/dis/component/installable.go similarity index 100% rename from internal/component/installable.go rename to internal/dis/component/installable.go diff --git a/internal/component/instances/create.go b/internal/dis/component/instances/create.go similarity index 100% rename from internal/component/instances/create.go rename to internal/dis/component/instances/create.go diff --git a/internal/component/instances/instances.go b/internal/dis/component/instances/instances.go similarity index 92% rename from internal/component/instances/instances.go rename to internal/dis/component/instances/instances.go index 62b79fc..5e868a5 100644 --- a/internal/component/instances/instances.go +++ b/internal/dis/component/instances/instances.go @@ -4,12 +4,12 @@ import ( "errors" "path/filepath" - "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" - "github.com/FAU-CDI/wisski-distillery/internal/component/exporter/logger" - "github.com/FAU-CDI/wisski-distillery/internal/component/meta" - "github.com/FAU-CDI/wisski-distillery/internal/component/sql" - "github.com/FAU-CDI/wisski-distillery/internal/component/triplestore" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/exporter/logger" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/meta" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/sql" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/triplestore" "github.com/FAU-CDI/wisski-distillery/internal/models" "github.com/FAU-CDI/wisski-distillery/internal/wisski" "github.com/tkw1536/goprogram/exit" diff --git a/internal/component/instances/runtime.go b/internal/dis/component/instances/runtime.go similarity index 100% rename from internal/component/instances/runtime.go rename to internal/dis/component/instances/runtime.go diff --git a/internal/component/instances/runtime/README b/internal/dis/component/instances/runtime/README similarity index 100% rename from internal/component/instances/runtime/README rename to internal/dis/component/instances/runtime/README diff --git a/internal/component/instances/runtime/blind_update.sh b/internal/dis/component/instances/runtime/blind_update.sh similarity index 100% rename from internal/component/instances/runtime/blind_update.sh rename to internal/dis/component/instances/runtime/blind_update.sh diff --git a/internal/component/instances/runtime/create_admin.sh b/internal/dis/component/instances/runtime/create_admin.sh similarity index 100% rename from internal/component/instances/runtime/create_admin.sh rename to internal/dis/component/instances/runtime/create_admin.sh diff --git a/internal/component/instances/runtime/cron.sh b/internal/dis/component/instances/runtime/cron.sh similarity index 100% rename from internal/component/instances/runtime/cron.sh rename to internal/dis/component/instances/runtime/cron.sh diff --git a/internal/component/instances/runtime/install_colorbox.sh b/internal/dis/component/instances/runtime/install_colorbox.sh similarity index 100% rename from internal/component/instances/runtime/install_colorbox.sh rename to internal/dis/component/instances/runtime/install_colorbox.sh diff --git a/internal/component/instances/runtime/patch_easyrdf.sh b/internal/dis/component/instances/runtime/patch_easyrdf.sh similarity index 100% rename from internal/component/instances/runtime/patch_easyrdf.sh rename to internal/dis/component/instances/runtime/patch_easyrdf.sh diff --git a/internal/component/instances/runtime/patch_triples.sh b/internal/dis/component/instances/runtime/patch_triples.sh similarity index 100% rename from internal/component/instances/runtime/patch_triples.sh rename to internal/dis/component/instances/runtime/patch_triples.sh diff --git a/internal/component/instances/runtime/use_wisski.sh b/internal/dis/component/instances/runtime/use_wisski.sh similarity index 100% rename from internal/component/instances/runtime/use_wisski.sh rename to internal/dis/component/instances/runtime/use_wisski.sh diff --git a/internal/component/instances/runtime/wisski_2x_3x.sh b/internal/dis/component/instances/runtime/wisski_2x_3x.sh similarity index 100% rename from internal/component/instances/runtime/wisski_2x_3x.sh rename to internal/dis/component/instances/runtime/wisski_2x_3x.sh diff --git a/internal/component/meta/meta.go b/internal/dis/component/meta/meta.go similarity index 84% rename from internal/component/meta/meta.go rename to internal/dis/component/meta/meta.go index 363b582..615f82e 100644 --- a/internal/component/meta/meta.go +++ b/internal/dis/component/meta/meta.go @@ -3,8 +3,8 @@ package meta import ( "sync" - "github.com/FAU-CDI/wisski-distillery/internal/component" - "github.com/FAU-CDI/wisski-distillery/internal/component/sql" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/sql" ) // Component meta is responsible for managing metadata per WissKI Instance diff --git a/internal/component/meta/provision.go b/internal/dis/component/meta/provision.go similarity index 100% rename from internal/component/meta/provision.go rename to internal/dis/component/meta/provision.go diff --git a/internal/component/meta/storage.go b/internal/dis/component/meta/storage.go similarity index 98% rename from internal/component/meta/storage.go rename to internal/dis/component/meta/storage.go index be72821..7bb9994 100644 --- a/internal/component/meta/storage.go +++ b/internal/dis/component/meta/storage.go @@ -4,7 +4,7 @@ import ( "encoding/json" "errors" - "github.com/FAU-CDI/wisski-distillery/internal/component/sql" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/sql" "github.com/FAU-CDI/wisski-distillery/internal/models" "github.com/tkw1536/goprogram/lib/collection" "gorm.io/gorm" diff --git a/internal/component/provision.go b/internal/dis/component/provision.go similarity index 100% rename from internal/component/provision.go rename to internal/dis/component/provision.go diff --git a/internal/component/resolver/prefixes.go b/internal/dis/component/resolver/prefixes.go similarity index 100% rename from internal/component/resolver/prefixes.go rename to internal/dis/component/resolver/prefixes.go diff --git a/internal/component/resolver/resolver.go b/internal/dis/component/resolver/resolver.go similarity index 93% rename from internal/component/resolver/resolver.go rename to internal/dis/component/resolver/resolver.go index c40d4f9..51d019c 100644 --- a/internal/component/resolver/resolver.go +++ b/internal/dis/component/resolver/resolver.go @@ -9,8 +9,8 @@ import ( "github.com/FAU-CDI/wdresolve" "github.com/FAU-CDI/wdresolve/resolvers" - "github.com/FAU-CDI/wisski-distillery/internal/component" - "github.com/FAU-CDI/wisski-distillery/internal/component/instances" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/instances" "github.com/FAU-CDI/wisski-distillery/pkg/lazy" "github.com/tkw1536/goprogram/stream" ) diff --git a/internal/component/server.go b/internal/dis/component/server.go similarity index 100% rename from internal/component/server.go rename to internal/dis/component/server.go diff --git a/internal/component/sql/backup.go b/internal/dis/component/sql/backup.go similarity index 90% rename from internal/component/sql/backup.go rename to internal/dis/component/sql/backup.go index 94760ad..e654562 100644 --- a/internal/component/sql/backup.go +++ b/internal/dis/component/sql/backup.go @@ -4,7 +4,7 @@ import ( "errors" "io" - "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" ) var errSQLBackup = errors.New("SQLBackup: Mysqldump returned non-zero exit code") diff --git a/internal/component/sql/connect.go b/internal/dis/component/sql/connect.go similarity index 100% rename from internal/component/sql/connect.go rename to internal/dis/component/sql/connect.go diff --git a/internal/component/sql/provision.go b/internal/dis/component/sql/provision.go similarity index 100% rename from internal/component/sql/provision.go rename to internal/dis/component/sql/provision.go diff --git a/internal/component/sql/snapshot.go b/internal/dis/component/sql/snapshot.go similarity index 93% rename from internal/component/sql/snapshot.go rename to internal/dis/component/sql/snapshot.go index 5abc807..195f910 100644 --- a/internal/component/sql/snapshot.go +++ b/internal/dis/component/sql/snapshot.go @@ -3,7 +3,7 @@ package sql import ( "io" - "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" "github.com/FAU-CDI/wisski-distillery/internal/models" "github.com/tkw1536/goprogram/stream" ) diff --git a/internal/component/sql/sql.env b/internal/dis/component/sql/sql.env similarity index 100% rename from internal/component/sql/sql.env rename to internal/dis/component/sql/sql.env diff --git a/internal/component/sql/sql.go b/internal/dis/component/sql/sql.go similarity index 94% rename from internal/component/sql/sql.go rename to internal/dis/component/sql/sql.go index d0cee20..bd053b2 100644 --- a/internal/component/sql/sql.go +++ b/internal/dis/component/sql/sql.go @@ -6,7 +6,7 @@ import ( "path/filepath" "time" - "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" "github.com/FAU-CDI/wisski-distillery/pkg/environment" "github.com/FAU-CDI/wisski-distillery/pkg/lazy" ) diff --git a/internal/component/sql/sql/docker-compose.yml b/internal/dis/component/sql/sql/docker-compose.yml similarity index 100% rename from internal/component/sql/sql/docker-compose.yml rename to internal/dis/component/sql/sql/docker-compose.yml diff --git a/internal/component/sql/update.go b/internal/dis/component/sql/update.go similarity index 100% rename from internal/component/sql/update.go rename to internal/dis/component/sql/update.go diff --git a/internal/component/ssh/ssh.env b/internal/dis/component/ssh/ssh.env similarity index 100% rename from internal/component/ssh/ssh.env rename to internal/dis/component/ssh/ssh.env diff --git a/internal/component/ssh/ssh.go b/internal/dis/component/ssh/ssh.go similarity index 92% rename from internal/component/ssh/ssh.go rename to internal/dis/component/ssh/ssh.go index 9967726..decd976 100644 --- a/internal/component/ssh/ssh.go +++ b/internal/dis/component/ssh/ssh.go @@ -4,7 +4,7 @@ import ( "embed" "path/filepath" - "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" "github.com/FAU-CDI/wisski-distillery/pkg/environment" ) diff --git a/internal/component/ssh/ssh/docker-compose.yml b/internal/dis/component/ssh/ssh/docker-compose.yml similarity index 100% rename from internal/component/ssh/ssh/docker-compose.yml rename to internal/dis/component/ssh/ssh/docker-compose.yml diff --git a/internal/component/stack.go b/internal/dis/component/stack.go similarity index 100% rename from internal/component/stack.go rename to internal/dis/component/stack.go diff --git a/internal/component/static/assets.go b/internal/dis/component/static/assets.go similarity index 100% rename from internal/component/static/assets.go rename to internal/dis/component/static/assets.go diff --git a/internal/component/static/assets_dist.go b/internal/dis/component/static/assets_dist.go similarity index 100% rename from internal/component/static/assets_dist.go rename to internal/dis/component/static/assets_dist.go diff --git a/internal/component/static/build.mjs b/internal/dis/component/static/build.mjs similarity index 100% rename from internal/component/static/build.mjs rename to internal/dis/component/static/build.mjs diff --git a/internal/component/static/dist/ControlIndex.613b02c2.js b/internal/dis/component/static/dist/ControlIndex.613b02c2.js similarity index 100% rename from internal/component/static/dist/ControlIndex.613b02c2.js rename to internal/dis/component/static/dist/ControlIndex.613b02c2.js diff --git a/internal/component/static/dist/ControlIndex.6d2ae968.css b/internal/dis/component/static/dist/ControlIndex.6d2ae968.css similarity index 100% rename from internal/component/static/dist/ControlIndex.6d2ae968.css rename to internal/dis/component/static/dist/ControlIndex.6d2ae968.css diff --git a/internal/component/static/dist/ControlIndex.6d59e220.css b/internal/dis/component/static/dist/ControlIndex.6d59e220.css similarity index 100% rename from internal/component/static/dist/ControlIndex.6d59e220.css rename to internal/dis/component/static/dist/ControlIndex.6d59e220.css diff --git a/internal/component/static/dist/ControlIndex.cfbf936d.js b/internal/dis/component/static/dist/ControlIndex.cfbf936d.js similarity index 100% rename from internal/component/static/dist/ControlIndex.cfbf936d.js rename to internal/dis/component/static/dist/ControlIndex.cfbf936d.js diff --git a/internal/component/static/dist/ControlInstance.38d394c2.css b/internal/dis/component/static/dist/ControlInstance.38d394c2.css similarity index 100% rename from internal/component/static/dist/ControlInstance.38d394c2.css rename to internal/dis/component/static/dist/ControlInstance.38d394c2.css diff --git a/internal/component/static/dist/ControlInstance.66b95713.js b/internal/dis/component/static/dist/ControlInstance.66b95713.js similarity index 100% rename from internal/component/static/dist/ControlInstance.66b95713.js rename to internal/dis/component/static/dist/ControlInstance.66b95713.js diff --git a/internal/component/static/dist/ControlInstance.9cc7166d.js b/internal/dis/component/static/dist/ControlInstance.9cc7166d.js similarity index 100% rename from internal/component/static/dist/ControlInstance.9cc7166d.js rename to internal/dis/component/static/dist/ControlInstance.9cc7166d.js diff --git a/internal/component/static/dist/HomeHome.38d394c2.css b/internal/dis/component/static/dist/HomeHome.38d394c2.css similarity index 100% rename from internal/component/static/dist/HomeHome.38d394c2.css rename to internal/dis/component/static/dist/HomeHome.38d394c2.css diff --git a/internal/component/static/dist/HomeHome.38d394c2.js b/internal/dis/component/static/dist/HomeHome.38d394c2.js similarity index 100% rename from internal/component/static/dist/HomeHome.38d394c2.js rename to internal/dis/component/static/dist/HomeHome.38d394c2.js diff --git a/internal/component/static/dist/HomeHome.a75f04fa.css b/internal/dis/component/static/dist/HomeHome.a75f04fa.css similarity index 100% rename from internal/component/static/dist/HomeHome.a75f04fa.css rename to internal/dis/component/static/dist/HomeHome.a75f04fa.css diff --git a/internal/component/static/package.json b/internal/dis/component/static/package.json similarity index 100% rename from internal/component/static/package.json rename to internal/dis/component/static/package.json diff --git a/internal/component/static/src/base/index.css b/internal/dis/component/static/src/base/index.css similarity index 100% rename from internal/component/static/src/base/index.css rename to internal/dis/component/static/src/base/index.css diff --git a/internal/component/static/src/base/index.ts b/internal/dis/component/static/src/base/index.ts similarity index 100% rename from internal/component/static/src/base/index.ts rename to internal/dis/component/static/src/base/index.ts diff --git a/internal/component/static/src/entry/ControlIndex/index.css b/internal/dis/component/static/src/entry/ControlIndex/index.css similarity index 100% rename from internal/component/static/src/entry/ControlIndex/index.css rename to internal/dis/component/static/src/entry/ControlIndex/index.css diff --git a/internal/component/static/src/entry/ControlIndex/index.ts b/internal/dis/component/static/src/entry/ControlIndex/index.ts similarity index 100% rename from internal/component/static/src/entry/ControlIndex/index.ts rename to internal/dis/component/static/src/entry/ControlIndex/index.ts diff --git a/internal/component/static/src/entry/ControlInstance/index.css b/internal/dis/component/static/src/entry/ControlInstance/index.css similarity index 100% rename from internal/component/static/src/entry/ControlInstance/index.css rename to internal/dis/component/static/src/entry/ControlInstance/index.css diff --git a/internal/component/static/src/entry/ControlInstance/index.ts b/internal/dis/component/static/src/entry/ControlInstance/index.ts similarity index 100% rename from internal/component/static/src/entry/ControlInstance/index.ts rename to internal/dis/component/static/src/entry/ControlInstance/index.ts diff --git a/internal/component/static/src/entry/HomeHome/index.css b/internal/dis/component/static/src/entry/HomeHome/index.css similarity index 100% rename from internal/component/static/src/entry/HomeHome/index.css rename to internal/dis/component/static/src/entry/HomeHome/index.css diff --git a/internal/component/static/src/entry/HomeHome/index.ts b/internal/dis/component/static/src/entry/HomeHome/index.ts similarity index 100% rename from internal/component/static/src/entry/HomeHome/index.ts rename to internal/dis/component/static/src/entry/HomeHome/index.ts diff --git a/internal/component/static/src/lib/autolink/index.css b/internal/dis/component/static/src/lib/autolink/index.css similarity index 100% rename from internal/component/static/src/lib/autolink/index.css rename to internal/dis/component/static/src/lib/autolink/index.css diff --git a/internal/component/static/src/lib/autolink/index.ts b/internal/dis/component/static/src/lib/autolink/index.ts similarity index 100% rename from internal/component/static/src/lib/autolink/index.ts rename to internal/dis/component/static/src/lib/autolink/index.ts diff --git a/internal/component/static/src/lib/highlight/index.ts b/internal/dis/component/static/src/lib/highlight/index.ts similarity index 100% rename from internal/component/static/src/lib/highlight/index.ts rename to internal/dis/component/static/src/lib/highlight/index.ts diff --git a/internal/component/static/src/lib/remote/index.css b/internal/dis/component/static/src/lib/remote/index.css similarity index 100% rename from internal/component/static/src/lib/remote/index.css rename to internal/dis/component/static/src/lib/remote/index.css diff --git a/internal/component/static/src/lib/remote/index.ts b/internal/dis/component/static/src/lib/remote/index.ts similarity index 100% rename from internal/component/static/src/lib/remote/index.ts rename to internal/dis/component/static/src/lib/remote/index.ts diff --git a/internal/component/static/src/lib/remote/socket.ts b/internal/dis/component/static/src/lib/remote/socket.ts similarity index 100% rename from internal/component/static/src/lib/remote/socket.ts rename to internal/dis/component/static/src/lib/remote/socket.ts diff --git a/internal/component/static/static.go b/internal/dis/component/static/static.go similarity index 90% rename from internal/component/static/static.go rename to internal/dis/component/static/static.go index e54e3c5..99a91bf 100644 --- a/internal/component/static/static.go +++ b/internal/dis/component/static/static.go @@ -7,7 +7,7 @@ import ( "io/fs" "net/http" - "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" "github.com/tkw1536/goprogram/stream" ) diff --git a/internal/component/static/tsconfig.json b/internal/dis/component/static/tsconfig.json similarity index 100% rename from internal/component/static/tsconfig.json rename to internal/dis/component/static/tsconfig.json diff --git a/internal/component/static/yarn.lock b/internal/dis/component/static/yarn.lock similarity index 100% rename from internal/component/static/yarn.lock rename to internal/dis/component/static/yarn.lock diff --git a/internal/component/triplestore/backup.go b/internal/dis/component/triplestore/backup.go similarity index 93% rename from internal/component/triplestore/backup.go rename to internal/dis/component/triplestore/backup.go index a1a03ed..de90a32 100644 --- a/internal/component/triplestore/backup.go +++ b/internal/dis/component/triplestore/backup.go @@ -4,7 +4,7 @@ import ( "encoding/json" "io" - "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" ) func (ts *Triplestore) BackupName() string { return "triplestore" } diff --git a/internal/component/triplestore/create-repo.ttl b/internal/dis/component/triplestore/create-repo.ttl similarity index 100% rename from internal/component/triplestore/create-repo.ttl rename to internal/dis/component/triplestore/create-repo.ttl diff --git a/internal/component/triplestore/database.go b/internal/dis/component/triplestore/database.go similarity index 100% rename from internal/component/triplestore/database.go rename to internal/dis/component/triplestore/database.go diff --git a/internal/component/triplestore/provision.go b/internal/dis/component/triplestore/provision.go similarity index 100% rename from internal/component/triplestore/provision.go rename to internal/dis/component/triplestore/provision.go diff --git a/internal/component/triplestore/snapshot.go b/internal/dis/component/triplestore/snapshot.go similarity index 94% rename from internal/component/triplestore/snapshot.go rename to internal/dis/component/triplestore/snapshot.go index 8adea00..c2d395b 100644 --- a/internal/component/triplestore/snapshot.go +++ b/internal/dis/component/triplestore/snapshot.go @@ -4,7 +4,7 @@ import ( "io" "net/http" - "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" "github.com/FAU-CDI/wisski-distillery/internal/models" "github.com/pkg/errors" ) diff --git a/internal/component/triplestore/triplestore.env b/internal/dis/component/triplestore/triplestore.env similarity index 100% rename from internal/component/triplestore/triplestore.env rename to internal/dis/component/triplestore/triplestore.env diff --git a/internal/component/triplestore/triplestore.go b/internal/dis/component/triplestore/triplestore.go similarity index 95% rename from internal/component/triplestore/triplestore.go rename to internal/dis/component/triplestore/triplestore.go index 4e396d4..b9c26da 100644 --- a/internal/component/triplestore/triplestore.go +++ b/internal/dis/component/triplestore/triplestore.go @@ -6,7 +6,7 @@ import ( "path/filepath" "time" - "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" "github.com/FAU-CDI/wisski-distillery/pkg/environment" ) diff --git a/internal/component/triplestore/triplestore/.dockerignore b/internal/dis/component/triplestore/triplestore/.dockerignore similarity index 100% rename from internal/component/triplestore/triplestore/.dockerignore rename to internal/dis/component/triplestore/triplestore/.dockerignore diff --git a/internal/component/triplestore/triplestore/Dockerfile b/internal/dis/component/triplestore/triplestore/Dockerfile similarity index 100% rename from internal/component/triplestore/triplestore/Dockerfile rename to internal/dis/component/triplestore/triplestore/Dockerfile diff --git a/internal/component/triplestore/triplestore/docker-compose.yml b/internal/dis/component/triplestore/triplestore/docker-compose.yml similarity index 100% rename from internal/component/triplestore/triplestore/docker-compose.yml rename to internal/dis/component/triplestore/triplestore/docker-compose.yml diff --git a/internal/component/triplestore/triplestore/entrypoint.sh b/internal/dis/component/triplestore/triplestore/entrypoint.sh similarity index 100% rename from internal/component/triplestore/triplestore/entrypoint.sh rename to internal/dis/component/triplestore/triplestore/entrypoint.sh diff --git a/internal/component/triplestore/update.go b/internal/dis/component/triplestore/update.go similarity index 100% rename from internal/component/triplestore/update.go rename to internal/dis/component/triplestore/update.go diff --git a/internal/component/web/web-http/docker-compose.yml b/internal/dis/component/web/web-http/docker-compose.yml similarity index 100% rename from internal/component/web/web-http/docker-compose.yml rename to internal/dis/component/web/web-http/docker-compose.yml diff --git a/internal/component/web/web-https/docker-compose.yml b/internal/dis/component/web/web-https/docker-compose.yml similarity index 100% rename from internal/component/web/web-https/docker-compose.yml rename to internal/dis/component/web/web-https/docker-compose.yml diff --git a/internal/component/web/web.env b/internal/dis/component/web/web.env similarity index 100% rename from internal/component/web/web.env rename to internal/dis/component/web/web.env diff --git a/internal/component/web/web.go b/internal/dis/component/web/web.go similarity index 96% rename from internal/component/web/web.go rename to internal/dis/component/web/web.go index 05b76c1..fdaef07 100644 --- a/internal/component/web/web.go +++ b/internal/dis/component/web/web.go @@ -4,7 +4,7 @@ import ( "embed" "path/filepath" - "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" "github.com/FAU-CDI/wisski-distillery/pkg/environment" ) diff --git a/internal/dis/distillery.go b/internal/dis/distillery.go index 1deb89d..574a608 100644 --- a/internal/dis/distillery.go +++ b/internal/dis/distillery.go @@ -6,20 +6,20 @@ import ( "sync" "time" - "github.com/FAU-CDI/wisski-distillery/internal/component" - "github.com/FAU-CDI/wisski-distillery/internal/component/control" - "github.com/FAU-CDI/wisski-distillery/internal/component/exporter" - "github.com/FAU-CDI/wisski-distillery/internal/component/exporter/logger" - "github.com/FAU-CDI/wisski-distillery/internal/component/home" - "github.com/FAU-CDI/wisski-distillery/internal/component/info" - "github.com/FAU-CDI/wisski-distillery/internal/component/instances" - "github.com/FAU-CDI/wisski-distillery/internal/component/meta" - "github.com/FAU-CDI/wisski-distillery/internal/component/resolver" - "github.com/FAU-CDI/wisski-distillery/internal/component/sql" - "github.com/FAU-CDI/wisski-distillery/internal/component/ssh" - "github.com/FAU-CDI/wisski-distillery/internal/component/static" - "github.com/FAU-CDI/wisski-distillery/internal/component/triplestore" - "github.com/FAU-CDI/wisski-distillery/internal/component/web" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/control" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/exporter" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/exporter/logger" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/home" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/info" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/instances" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/meta" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/resolver" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/sql" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/ssh" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/static" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/triplestore" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/web" "github.com/FAU-CDI/wisski-distillery/pkg/lazy" ) diff --git a/internal/dis/init.go b/internal/dis/init.go index 18fdacc..945a70b 100644 --- a/internal/dis/init.go +++ b/internal/dis/init.go @@ -2,8 +2,8 @@ package dis import ( "github.com/FAU-CDI/wisski-distillery/internal/cli" - "github.com/FAU-CDI/wisski-distillery/internal/component" "github.com/FAU-CDI/wisski-distillery/internal/config" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" "github.com/FAU-CDI/wisski-distillery/pkg/environment" "github.com/tkw1536/goprogram/exit" ) diff --git a/internal/wisski/meta.go b/internal/wisski/meta.go index 84e2037..83e103e 100644 --- a/internal/wisski/meta.go +++ b/internal/wisski/meta.go @@ -1,6 +1,6 @@ package wisski -import "github.com/FAU-CDI/wisski-distillery/internal/component/meta" +import "github.com/FAU-CDI/wisski-distillery/internal/dis/component/meta" func (wisski *WissKI) storage() *meta.Storage { return wisski.Meta.Storage(wisski.Slug) diff --git a/internal/wisski/prefix.go b/internal/wisski/prefix.go index 0e00330..bf7e3dd 100644 --- a/internal/wisski/prefix.go +++ b/internal/wisski/prefix.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strings" - "github.com/FAU-CDI/wisski-distillery/internal/component/meta" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/meta" "github.com/FAU-CDI/wisski-distillery/pkg/fsx" "github.com/tkw1536/goprogram/lib/collection" diff --git a/internal/wisski/stack.go b/internal/wisski/stack.go index 1d7bdd9..863bfd6 100644 --- a/internal/wisski/stack.go +++ b/internal/wisski/stack.go @@ -5,8 +5,8 @@ import ( "path/filepath" "time" - "github.com/FAU-CDI/wisski-distillery/internal/component" - "github.com/FAU-CDI/wisski-distillery/internal/component/meta" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/meta" "github.com/tkw1536/goprogram/stream" ) diff --git a/internal/wisski/update.go b/internal/wisski/update.go index abc8a9c..efed605 100644 --- a/internal/wisski/update.go +++ b/internal/wisski/update.go @@ -3,7 +3,7 @@ package wisski import ( "time" - "github.com/FAU-CDI/wisski-distillery/internal/component/meta" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/meta" "github.com/FAU-CDI/wisski-distillery/pkg/environment" "github.com/tkw1536/goprogram/exit" "github.com/tkw1536/goprogram/stream" diff --git a/internal/wisski/wisski.go b/internal/wisski/wisski.go index cf1f78c..28c3aa0 100644 --- a/internal/wisski/wisski.go +++ b/internal/wisski/wisski.go @@ -2,12 +2,12 @@ package wisski import ( - "github.com/FAU-CDI/wisski-distillery/internal/component" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component" - "github.com/FAU-CDI/wisski-distillery/internal/component/exporter/logger" - "github.com/FAU-CDI/wisski-distillery/internal/component/meta" - "github.com/FAU-CDI/wisski-distillery/internal/component/sql" - "github.com/FAU-CDI/wisski-distillery/internal/component/triplestore" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/exporter/logger" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/meta" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/sql" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/triplestore" "github.com/FAU-CDI/wisski-distillery/internal/models" )