From 165b1ef14cd03d069432222979fe6562c23e5000 Mon Sep 17 00:00:00 2001 From: Daniel Sonck Date: Tue, 9 Jul 2024 20:21:20 +0200 Subject: [PATCH 1/3] chore: make all packages unique and resolvable - Create a workspace for the monorepo - Rename all modules to be unique and matching their import paths This is a preparation for enabling gci sorting later on --- api/cache/file_cache.go | 7 +++--- api/cache/group_cache.go | 7 +++--- api/cache/organization_cache.go | 7 +++--- api/cache/snapshot_cache.go | 7 +++--- api/cache/task_cache.go | 7 +++--- api/cache/workspace_cache.go | 7 +++--- api/client/language_client.go | 5 ++-- api/client/mosaic_client.go | 7 +++--- api/client/pipeline_client.go | 3 ++- api/client/watermark_client.go | 5 ++-- api/errorpkg/error_creators.go | 3 ++- api/errorpkg/error_handler.go | 3 ++- api/go.mod | 2 +- api/guard/file_guard.go | 8 +++---- api/guard/group_guard.go | 8 +++---- api/guard/organization_guard.go | 8 +++---- api/guard/workspace_guard.go | 8 +++---- api/infra/file_identifier.go | 3 ++- api/infra/mail.go | 5 ++-- api/infra/postgres.go | 2 +- api/infra/redis.go | 3 ++- api/infra/s3.go | 5 ++-- api/infra/search.go | 2 +- api/main.go | 8 +++---- api/repo/file_repo.go | 9 ++++---- api/repo/group_repo.go | 9 ++++---- api/repo/invitation_repo.go | 9 ++++---- api/repo/organization_repo.go | 9 ++++---- api/repo/permission_repo.go | 5 ++-- api/repo/snapshot_repo.go | 11 +++++---- api/repo/task_repo.go | 9 ++++---- api/repo/user_repo.go | 7 +++--- api/repo/workspace_repo.go | 9 ++++---- api/router/file_router.go | 15 ++++++------ api/router/group_router.go | 5 ++-- api/router/health_router.go | 3 ++- api/router/insights_router.go | 9 ++++---- api/router/invitation_router.go | 5 ++-- api/router/mosaic_router.go | 9 ++++---- api/router/organization_router.go | 5 ++-- api/router/snapshot_router.go | 7 +++--- api/router/storage_router.go | 4 ++-- api/router/task_router.go | 7 +++--- api/router/user_router.go | 5 ++-- api/router/validation.go | 2 +- api/router/watermark_router.go | 9 ++++---- api/router/workspace_router.go | 5 ++-- api/search/file_search.go | 7 +++--- api/search/group_search.go | 7 +++--- api/search/organization_search.go | 7 +++--- api/search/task_search.go | 7 +++--- api/search/user_search.go | 7 +++--- api/search/workspace_search.go | 7 +++--- api/service/file_service.go | 21 +++++++++-------- api/service/group_service.go | 15 ++++++------ api/service/insights_service.go | 19 ++++++++-------- api/service/invitation_service.go | 15 ++++++------ api/service/mosaic_service.go | 19 ++++++++-------- api/service/organization_service.go | 19 ++++++++-------- api/service/snapshot_service.go | 21 +++++++++-------- api/service/storage_service.go | 8 +++---- api/service/task_service.go | 13 ++++++----- api/service/types.go | 5 ++-- api/service/user_service.go | 13 ++++++----- api/service/watermark_service.go | 19 ++++++++-------- api/service/workspace_service.go | 19 ++++++++-------- conversion/client/api_client.go | 3 ++- conversion/client/language_client.go | 5 ++-- conversion/client/mosaic_client.go | 5 ++-- conversion/client/watermark_client.go | 5 ++-- conversion/go.mod | 2 +- conversion/identifier/pipeline_identifier.go | 4 ++-- conversion/infra/command.go | 5 ++-- conversion/infra/s3.go | 3 ++- conversion/main.go | 10 ++++---- conversion/model/types.go | 2 +- conversion/pipeline/audio_video_pipeline.go | 13 ++++++----- conversion/pipeline/dispatcher.go | 11 +++++---- conversion/pipeline/glb_pipeline.go | 13 ++++++----- conversion/pipeline/image_pipeline.go | 15 ++++++------ conversion/pipeline/insights_pipeline.go | 13 ++++++----- conversion/pipeline/mosaic_pipeline.go | 13 ++++++----- conversion/pipeline/office_pipeline.go | 13 ++++++----- conversion/pipeline/pdf_pipeline.go | 15 ++++++------ conversion/pipeline/watermark_pipeline.go | 13 ++++++----- conversion/pipeline/zip_pipeline.go | 13 ++++++----- conversion/processor/glb_processor.go | 5 ++-- conversion/processor/gltf_processor.go | 2 +- conversion/processor/image_processor.go | 11 +++++---- conversion/processor/ocr_processor.go | 5 ++-- conversion/processor/office_processor.go | 7 +++--- conversion/processor/pdf_processor.go | 7 +++--- conversion/processor/video_processor.go | 7 +++--- conversion/processor/zip_processor.go | 2 +- conversion/router/health_router.go | 5 ++-- conversion/router/pipeline_router.go | 8 +++---- conversion/runtime/scheduler.go | 7 +++--- go.work | 8 +++++++ go.work.sum | 24 ++++++++++++++++++++ mosaic/builder/mosaic_builder.go | 3 ++- mosaic/go.mod | 2 +- mosaic/infra/s3.go | 3 ++- mosaic/main.go | 8 +++---- mosaic/router/health_router.go | 3 ++- mosaic/router/mosaic_router.go | 9 ++++---- mosaic/service/mosaic_service.go | 11 +++++---- ui/go.mod | 2 +- ui/main.go | 3 ++- 108 files changed, 490 insertions(+), 373 deletions(-) create mode 100644 go.work create mode 100644 go.work.sum diff --git a/api/cache/file_cache.go b/api/cache/file_cache.go index 2df797281..8cb8fe894 100644 --- a/api/cache/file_cache.go +++ b/api/cache/file_cache.go @@ -12,9 +12,10 @@ package cache import ( "encoding/json" - "voltaserve/infra" - "voltaserve/model" - "voltaserve/repo" + + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/model" + "github.com/kouprlabs/voltaserve/api/repo" ) type FileCache struct { diff --git a/api/cache/group_cache.go b/api/cache/group_cache.go index 7e40041a4..b4d9cb66a 100644 --- a/api/cache/group_cache.go +++ b/api/cache/group_cache.go @@ -12,9 +12,10 @@ package cache import ( "encoding/json" - "voltaserve/infra" - "voltaserve/model" - "voltaserve/repo" + + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/model" + "github.com/kouprlabs/voltaserve/api/repo" ) type GroupCache struct { diff --git a/api/cache/organization_cache.go b/api/cache/organization_cache.go index b35450666..f27adba7a 100644 --- a/api/cache/organization_cache.go +++ b/api/cache/organization_cache.go @@ -12,9 +12,10 @@ package cache import ( "encoding/json" - "voltaserve/infra" - "voltaserve/model" - "voltaserve/repo" + + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/model" + "github.com/kouprlabs/voltaserve/api/repo" ) type OrganizationCache struct { diff --git a/api/cache/snapshot_cache.go b/api/cache/snapshot_cache.go index 0ad2f0d72..05b3aaf44 100644 --- a/api/cache/snapshot_cache.go +++ b/api/cache/snapshot_cache.go @@ -12,9 +12,10 @@ package cache import ( "encoding/json" - "voltaserve/infra" - "voltaserve/model" - "voltaserve/repo" + + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/model" + "github.com/kouprlabs/voltaserve/api/repo" ) type SnapshotCache struct { diff --git a/api/cache/task_cache.go b/api/cache/task_cache.go index a85818024..9abb5e33f 100644 --- a/api/cache/task_cache.go +++ b/api/cache/task_cache.go @@ -12,9 +12,10 @@ package cache import ( "encoding/json" - "voltaserve/infra" - "voltaserve/model" - "voltaserve/repo" + + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/model" + "github.com/kouprlabs/voltaserve/api/repo" ) type TaskCache struct { diff --git a/api/cache/workspace_cache.go b/api/cache/workspace_cache.go index 6e7730d38..a6c007f59 100644 --- a/api/cache/workspace_cache.go +++ b/api/cache/workspace_cache.go @@ -12,9 +12,10 @@ package cache import ( "encoding/json" - "voltaserve/infra" - "voltaserve/model" - "voltaserve/repo" + + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/model" + "github.com/kouprlabs/voltaserve/api/repo" ) type WorkspaceCache struct { diff --git a/api/client/language_client.go b/api/client/language_client.go index 33835ca66..a6f7f38ae 100644 --- a/api/client/language_client.go +++ b/api/client/language_client.go @@ -16,8 +16,9 @@ import ( "fmt" "io" "net/http" - "voltaserve/config" - "voltaserve/log" + + "github.com/kouprlabs/voltaserve/api/config" + "github.com/kouprlabs/voltaserve/api/log" ) type LanguageClient struct { diff --git a/api/client/mosaic_client.go b/api/client/mosaic_client.go index 02ef5b362..8297af5dc 100644 --- a/api/client/mosaic_client.go +++ b/api/client/mosaic_client.go @@ -18,9 +18,10 @@ import ( "mime/multipart" "net/http" "os" - "voltaserve/config" - "voltaserve/errorpkg" - "voltaserve/log" + + "github.com/kouprlabs/voltaserve/api/config" + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/log" ) type MosaicClient struct { diff --git a/api/client/pipeline_client.go b/api/client/pipeline_client.go index 2ef538adc..3183958d1 100644 --- a/api/client/pipeline_client.go +++ b/api/client/pipeline_client.go @@ -15,7 +15,8 @@ import ( "encoding/json" "fmt" "net/http" - "voltaserve/config" + + "github.com/kouprlabs/voltaserve/api/config" ) type PipelineClient struct { diff --git a/api/client/watermark_client.go b/api/client/watermark_client.go index 0a7e53ea7..c3b840dca 100644 --- a/api/client/watermark_client.go +++ b/api/client/watermark_client.go @@ -17,8 +17,9 @@ import ( "mime/multipart" "net/http" "os" - "voltaserve/config" - "voltaserve/log" + + "github.com/kouprlabs/voltaserve/api/config" + "github.com/kouprlabs/voltaserve/api/log" ) type WatermarkClient struct { diff --git a/api/errorpkg/error_creators.go b/api/errorpkg/error_creators.go index 1d563ae9e..c1dab9830 100644 --- a/api/errorpkg/error_creators.go +++ b/api/errorpkg/error_creators.go @@ -14,7 +14,8 @@ import ( "fmt" "net/http" "strings" - "voltaserve/model" + + "github.com/kouprlabs/voltaserve/api/model" "github.com/go-playground/validator/v10" ) diff --git a/api/errorpkg/error_handler.go b/api/errorpkg/error_handler.go index 4965f293a..a90b2685d 100644 --- a/api/errorpkg/error_handler.go +++ b/api/errorpkg/error_handler.go @@ -13,7 +13,8 @@ package errorpkg import ( "errors" "net/http" - "voltaserve/log" + + "github.com/kouprlabs/voltaserve/api/log" "github.com/gofiber/fiber/v2" ) diff --git a/api/go.mod b/api/go.mod index ffb7cecf8..9ff05bbab 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,4 +1,4 @@ -module voltaserve +module github.com/kouprlabs/voltaserve/api go 1.22 diff --git a/api/guard/file_guard.go b/api/guard/file_guard.go index 384791ea3..84459cdef 100644 --- a/api/guard/file_guard.go +++ b/api/guard/file_guard.go @@ -11,10 +11,10 @@ package guard import ( - "voltaserve/cache" - "voltaserve/errorpkg" - "voltaserve/log" - "voltaserve/model" + "github.com/kouprlabs/voltaserve/api/cache" + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/log" + "github.com/kouprlabs/voltaserve/api/model" ) type FileGuard struct { diff --git a/api/guard/group_guard.go b/api/guard/group_guard.go index 1e0c215b6..4b904de1f 100644 --- a/api/guard/group_guard.go +++ b/api/guard/group_guard.go @@ -11,10 +11,10 @@ package guard import ( - "voltaserve/cache" - "voltaserve/errorpkg" - "voltaserve/log" - "voltaserve/model" + "github.com/kouprlabs/voltaserve/api/cache" + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/log" + "github.com/kouprlabs/voltaserve/api/model" ) type GroupGuard struct { diff --git a/api/guard/organization_guard.go b/api/guard/organization_guard.go index 2612cf8e9..bcfba945b 100644 --- a/api/guard/organization_guard.go +++ b/api/guard/organization_guard.go @@ -11,10 +11,10 @@ package guard import ( - "voltaserve/cache" - "voltaserve/errorpkg" - "voltaserve/log" - "voltaserve/model" + "github.com/kouprlabs/voltaserve/api/cache" + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/log" + "github.com/kouprlabs/voltaserve/api/model" ) type OrganizationGuard struct { diff --git a/api/guard/workspace_guard.go b/api/guard/workspace_guard.go index 285e4c496..fa0709021 100644 --- a/api/guard/workspace_guard.go +++ b/api/guard/workspace_guard.go @@ -11,10 +11,10 @@ package guard import ( - "voltaserve/cache" - "voltaserve/errorpkg" - "voltaserve/log" - "voltaserve/model" + "github.com/kouprlabs/voltaserve/api/cache" + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/log" + "github.com/kouprlabs/voltaserve/api/model" ) type WorkspaceGuard struct { diff --git a/api/infra/file_identifier.go b/api/infra/file_identifier.go index ee1977ae7..d0152c3a5 100644 --- a/api/infra/file_identifier.go +++ b/api/infra/file_identifier.go @@ -15,7 +15,8 @@ import ( "encoding/json" "path/filepath" "strings" - "voltaserve/config" + + "github.com/kouprlabs/voltaserve/api/config" ) type FileIdentifier struct { diff --git a/api/infra/mail.go b/api/infra/mail.go index 90dbcb724..c0939ebae 100644 --- a/api/infra/mail.go +++ b/api/infra/mail.go @@ -16,8 +16,9 @@ import ( "io" "os" "path/filepath" - "voltaserve/config" - "voltaserve/log" + + "github.com/kouprlabs/voltaserve/api/config" + "github.com/kouprlabs/voltaserve/api/log" "gopkg.in/gomail.v2" "sigs.k8s.io/yaml" diff --git a/api/infra/postgres.go b/api/infra/postgres.go index cc7ba3836..b0dc7ed4a 100644 --- a/api/infra/postgres.go +++ b/api/infra/postgres.go @@ -11,7 +11,7 @@ package infra import ( - "voltaserve/config" + "github.com/kouprlabs/voltaserve/api/config" "gorm.io/driver/postgres" "gorm.io/gorm" diff --git a/api/infra/redis.go b/api/infra/redis.go index bcdee4d4c..606b8bf2c 100644 --- a/api/infra/redis.go +++ b/api/infra/redis.go @@ -13,7 +13,8 @@ package infra import ( "context" "strings" - "voltaserve/config" + + "github.com/kouprlabs/voltaserve/api/config" "github.com/redis/go-redis/v9" ) diff --git a/api/infra/s3.go b/api/infra/s3.go index f96de5352..5c5e1dae1 100644 --- a/api/infra/s3.go +++ b/api/infra/s3.go @@ -15,8 +15,9 @@ import ( "context" "io" "strings" - "voltaserve/config" - "voltaserve/errorpkg" + + "github.com/kouprlabs/voltaserve/api/config" + "github.com/kouprlabs/voltaserve/api/errorpkg" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" diff --git a/api/infra/search.go b/api/infra/search.go index fdf93db32..53189ae17 100644 --- a/api/infra/search.go +++ b/api/infra/search.go @@ -11,7 +11,7 @@ package infra import ( - "voltaserve/config" + "github.com/kouprlabs/voltaserve/api/config" "github.com/meilisearch/meilisearch-go" ) diff --git a/api/main.go b/api/main.go index b930f35b0..a564e74e4 100644 --- a/api/main.go +++ b/api/main.go @@ -18,10 +18,10 @@ import ( "github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2/middleware/cors" - "voltaserve/config" - "voltaserve/errorpkg" - "voltaserve/helper" - "voltaserve/router" + "github.com/kouprlabs/voltaserve/api/config" + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/helper" + "github.com/kouprlabs/voltaserve/api/router" jwtware "github.com/gofiber/contrib/jwt" "github.com/joho/godotenv" diff --git a/api/repo/file_repo.go b/api/repo/file_repo.go index bf2f9d286..2bc2cd4e4 100644 --- a/api/repo/file_repo.go +++ b/api/repo/file_repo.go @@ -13,10 +13,11 @@ package repo import ( "errors" "time" - "voltaserve/errorpkg" - "voltaserve/helper" - "voltaserve/infra" - "voltaserve/model" + + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/helper" + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/model" "gorm.io/gorm" ) diff --git a/api/repo/group_repo.go b/api/repo/group_repo.go index 1fe0bcd60..cf1683968 100644 --- a/api/repo/group_repo.go +++ b/api/repo/group_repo.go @@ -13,10 +13,11 @@ package repo import ( "errors" "time" - "voltaserve/errorpkg" - "voltaserve/helper" - "voltaserve/infra" - "voltaserve/model" + + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/helper" + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/model" "gorm.io/gorm" ) diff --git a/api/repo/invitation_repo.go b/api/repo/invitation_repo.go index e157e215e..18b50ee60 100644 --- a/api/repo/invitation_repo.go +++ b/api/repo/invitation_repo.go @@ -13,10 +13,11 @@ package repo import ( "errors" "time" - "voltaserve/errorpkg" - "voltaserve/helper" - "voltaserve/infra" - "voltaserve/model" + + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/helper" + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/model" "gorm.io/gorm" ) diff --git a/api/repo/organization_repo.go b/api/repo/organization_repo.go index 85038fcb5..b3d80fd78 100644 --- a/api/repo/organization_repo.go +++ b/api/repo/organization_repo.go @@ -13,10 +13,11 @@ package repo import ( "errors" "time" - "voltaserve/errorpkg" - "voltaserve/helper" - "voltaserve/infra" - "voltaserve/model" + + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/helper" + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/model" "gorm.io/gorm" ) diff --git a/api/repo/permission_repo.go b/api/repo/permission_repo.go index c456200d0..1c46cc8f2 100644 --- a/api/repo/permission_repo.go +++ b/api/repo/permission_repo.go @@ -12,8 +12,9 @@ package repo import ( "time" - "voltaserve/infra" - "voltaserve/model" + + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/model" "gorm.io/gorm" ) diff --git a/api/repo/snapshot_repo.go b/api/repo/snapshot_repo.go index 77fa0e8a9..a73c30d62 100644 --- a/api/repo/snapshot_repo.go +++ b/api/repo/snapshot_repo.go @@ -14,11 +14,12 @@ import ( "encoding/json" "errors" "time" - "voltaserve/errorpkg" - "voltaserve/helper" - "voltaserve/infra" - "voltaserve/log" - "voltaserve/model" + + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/helper" + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/log" + "github.com/kouprlabs/voltaserve/api/model" "gorm.io/datatypes" "gorm.io/gorm" diff --git a/api/repo/task_repo.go b/api/repo/task_repo.go index 9aef9564c..5dd736712 100644 --- a/api/repo/task_repo.go +++ b/api/repo/task_repo.go @@ -14,10 +14,11 @@ import ( "encoding/json" "errors" "time" - "voltaserve/errorpkg" - "voltaserve/infra" - "voltaserve/log" - "voltaserve/model" + + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/log" + "github.com/kouprlabs/voltaserve/api/model" "gorm.io/datatypes" "gorm.io/gorm" diff --git a/api/repo/user_repo.go b/api/repo/user_repo.go index d93b4f2ff..041b4ac17 100644 --- a/api/repo/user_repo.go +++ b/api/repo/user_repo.go @@ -12,9 +12,10 @@ package repo import ( "errors" - "voltaserve/errorpkg" - "voltaserve/infra" - "voltaserve/model" + + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/model" "gorm.io/gorm" ) diff --git a/api/repo/workspace_repo.go b/api/repo/workspace_repo.go index 9ac123cdf..48af06a79 100644 --- a/api/repo/workspace_repo.go +++ b/api/repo/workspace_repo.go @@ -13,10 +13,11 @@ package repo import ( "errors" "time" - "voltaserve/errorpkg" - "voltaserve/helper" - "voltaserve/infra" - "voltaserve/model" + + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/helper" + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/model" "gorm.io/gorm" ) diff --git a/api/router/file_router.go b/api/router/file_router.go index 7cebb6dc2..37627a848 100644 --- a/api/router/file_router.go +++ b/api/router/file_router.go @@ -23,13 +23,14 @@ import ( "strconv" "strings" "sync" - "voltaserve/config" - "voltaserve/errorpkg" - "voltaserve/helper" - "voltaserve/infra" - "voltaserve/log" - "voltaserve/model" - "voltaserve/service" + + "github.com/kouprlabs/voltaserve/api/config" + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/helper" + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/log" + "github.com/kouprlabs/voltaserve/api/model" + "github.com/kouprlabs/voltaserve/api/service" "github.com/go-playground/validator/v10" "github.com/gofiber/fiber/v2" diff --git a/api/router/group_router.go b/api/router/group_router.go index 6c293c7d3..1c228c92d 100644 --- a/api/router/group_router.go +++ b/api/router/group_router.go @@ -14,8 +14,9 @@ import ( "net/http" "net/url" "strconv" - "voltaserve/errorpkg" - "voltaserve/service" + + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/service" "github.com/go-playground/validator/v10" "github.com/gofiber/fiber/v2" diff --git a/api/router/health_router.go b/api/router/health_router.go index 7aa8f9daf..aeb3cbdee 100644 --- a/api/router/health_router.go +++ b/api/router/health_router.go @@ -12,7 +12,8 @@ package router import ( "net/http" - "voltaserve/infra" + + "github.com/kouprlabs/voltaserve/api/infra" "github.com/gofiber/fiber/v2" ) diff --git a/api/router/insights_router.go b/api/router/insights_router.go index 257c86ca2..130f5d8ed 100644 --- a/api/router/insights_router.go +++ b/api/router/insights_router.go @@ -17,10 +17,11 @@ import ( "net/url" "path/filepath" "strconv" - "voltaserve/config" - "voltaserve/errorpkg" - "voltaserve/infra" - "voltaserve/service" + + "github.com/kouprlabs/voltaserve/api/config" + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/service" "github.com/go-playground/validator/v10" "github.com/gofiber/fiber/v2" diff --git a/api/router/invitation_router.go b/api/router/invitation_router.go index ae4f0355c..0bc9023ac 100644 --- a/api/router/invitation_router.go +++ b/api/router/invitation_router.go @@ -13,8 +13,9 @@ package router import ( "net/http" "strconv" - "voltaserve/errorpkg" - "voltaserve/service" + + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/service" "github.com/go-playground/validator/v10" "github.com/gofiber/fiber/v2" diff --git a/api/router/mosaic_router.go b/api/router/mosaic_router.go index 349686217..98ccd0519 100644 --- a/api/router/mosaic_router.go +++ b/api/router/mosaic_router.go @@ -15,10 +15,11 @@ import ( "fmt" "net/http" "strconv" - "voltaserve/config" - "voltaserve/errorpkg" - "voltaserve/infra" - "voltaserve/service" + + "github.com/kouprlabs/voltaserve/api/config" + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/service" "github.com/gofiber/fiber/v2" "github.com/golang-jwt/jwt/v5" diff --git a/api/router/organization_router.go b/api/router/organization_router.go index 8edbe43ba..364429fe1 100644 --- a/api/router/organization_router.go +++ b/api/router/organization_router.go @@ -14,8 +14,9 @@ import ( "net/http" "net/url" "strconv" - "voltaserve/errorpkg" - "voltaserve/service" + + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/service" "github.com/go-playground/validator/v10" "github.com/gofiber/fiber/v2" diff --git a/api/router/snapshot_router.go b/api/router/snapshot_router.go index 691606202..f23c0b167 100644 --- a/api/router/snapshot_router.go +++ b/api/router/snapshot_router.go @@ -13,9 +13,10 @@ package router import ( "net/http" "strconv" - "voltaserve/config" - "voltaserve/errorpkg" - "voltaserve/service" + + "github.com/kouprlabs/voltaserve/api/config" + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/service" "github.com/go-playground/validator/v10" "github.com/gofiber/fiber/v2" diff --git a/api/router/storage_router.go b/api/router/storage_router.go index 510dea61b..682c9e1f7 100644 --- a/api/router/storage_router.go +++ b/api/router/storage_router.go @@ -11,8 +11,8 @@ package router import ( - "voltaserve/errorpkg" - "voltaserve/service" + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/service" "github.com/gofiber/fiber/v2" ) diff --git a/api/router/task_router.go b/api/router/task_router.go index b8873521a..0738095b0 100644 --- a/api/router/task_router.go +++ b/api/router/task_router.go @@ -14,9 +14,10 @@ import ( "net/http" "net/url" "strconv" - "voltaserve/config" - "voltaserve/errorpkg" - "voltaserve/service" + + "github.com/kouprlabs/voltaserve/api/config" + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/service" "github.com/go-playground/validator/v10" "github.com/gofiber/fiber/v2" diff --git a/api/router/user_router.go b/api/router/user_router.go index 5b76bd60f..3638863da 100644 --- a/api/router/user_router.go +++ b/api/router/user_router.go @@ -13,8 +13,9 @@ package router import ( "net/url" "strconv" - "voltaserve/errorpkg" - "voltaserve/service" + + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/service" "github.com/gofiber/fiber/v2" ) diff --git a/api/router/validation.go b/api/router/validation.go index abb1bb5b6..f8a4d1b33 100644 --- a/api/router/validation.go +++ b/api/router/validation.go @@ -10,7 +10,7 @@ package router -import "voltaserve/service" +import "github.com/kouprlabs/voltaserve/api/service" func IsValidSortBy(value string) bool { return value == "" || diff --git a/api/router/watermark_router.go b/api/router/watermark_router.go index e85f670d1..079c8f05c 100644 --- a/api/router/watermark_router.go +++ b/api/router/watermark_router.go @@ -15,10 +15,11 @@ import ( "fmt" "net/http" "path/filepath" - "voltaserve/config" - "voltaserve/errorpkg" - "voltaserve/infra" - "voltaserve/service" + + "github.com/kouprlabs/voltaserve/api/config" + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/service" "github.com/gofiber/fiber/v2" "github.com/golang-jwt/jwt/v5" diff --git a/api/router/workspace_router.go b/api/router/workspace_router.go index acebd677f..d7e94268e 100644 --- a/api/router/workspace_router.go +++ b/api/router/workspace_router.go @@ -14,8 +14,9 @@ import ( "net/http" "net/url" "strconv" - "voltaserve/errorpkg" - "voltaserve/service" + + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/service" "github.com/go-playground/validator/v10" "github.com/gofiber/fiber/v2" diff --git a/api/search/file_search.go b/api/search/file_search.go index 4874f7402..c74ccbeef 100644 --- a/api/search/file_search.go +++ b/api/search/file_search.go @@ -12,9 +12,10 @@ package search import ( "encoding/json" - "voltaserve/infra" - "voltaserve/model" - "voltaserve/repo" + + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/model" + "github.com/kouprlabs/voltaserve/api/repo" "github.com/minio/minio-go/v7" ) diff --git a/api/search/group_search.go b/api/search/group_search.go index 377c4d1a3..62e291327 100644 --- a/api/search/group_search.go +++ b/api/search/group_search.go @@ -12,9 +12,10 @@ package search import ( "encoding/json" - "voltaserve/infra" - "voltaserve/model" - "voltaserve/repo" + + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/model" + "github.com/kouprlabs/voltaserve/api/repo" ) type GroupSearch struct { diff --git a/api/search/organization_search.go b/api/search/organization_search.go index 2013de5b5..fcc168ff1 100644 --- a/api/search/organization_search.go +++ b/api/search/organization_search.go @@ -12,9 +12,10 @@ package search import ( "encoding/json" - "voltaserve/infra" - "voltaserve/model" - "voltaserve/repo" + + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/model" + "github.com/kouprlabs/voltaserve/api/repo" ) type OrganizationSearch struct { diff --git a/api/search/task_search.go b/api/search/task_search.go index 86e070d4f..31c43a186 100644 --- a/api/search/task_search.go +++ b/api/search/task_search.go @@ -12,9 +12,10 @@ package search import ( "encoding/json" - "voltaserve/infra" - "voltaserve/model" - "voltaserve/repo" + + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/model" + "github.com/kouprlabs/voltaserve/api/repo" ) type TaskSearch struct { diff --git a/api/search/user_search.go b/api/search/user_search.go index 02efe292f..d4f5bdc3e 100644 --- a/api/search/user_search.go +++ b/api/search/user_search.go @@ -12,9 +12,10 @@ package search import ( "encoding/json" - "voltaserve/infra" - "voltaserve/model" - "voltaserve/repo" + + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/model" + "github.com/kouprlabs/voltaserve/api/repo" ) type UserSearch struct { diff --git a/api/search/workspace_search.go b/api/search/workspace_search.go index e40a61feb..ddba5fb28 100644 --- a/api/search/workspace_search.go +++ b/api/search/workspace_search.go @@ -12,9 +12,10 @@ package search import ( "encoding/json" - "voltaserve/infra" - "voltaserve/model" - "voltaserve/repo" + + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/model" + "github.com/kouprlabs/voltaserve/api/repo" ) type WorkspaceSearch struct { diff --git a/api/service/file_service.go b/api/service/file_service.go index 3e2cce0c1..d550516a7 100644 --- a/api/service/file_service.go +++ b/api/service/file_service.go @@ -18,16 +18,17 @@ import ( "sort" "strings" "time" - "voltaserve/cache" - "voltaserve/client" - "voltaserve/config" - "voltaserve/errorpkg" - "voltaserve/guard" - "voltaserve/helper" - "voltaserve/infra" - "voltaserve/model" - "voltaserve/repo" - "voltaserve/search" + + "github.com/kouprlabs/voltaserve/api/cache" + "github.com/kouprlabs/voltaserve/api/client" + "github.com/kouprlabs/voltaserve/api/config" + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/guard" + "github.com/kouprlabs/voltaserve/api/helper" + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/model" + "github.com/kouprlabs/voltaserve/api/repo" + "github.com/kouprlabs/voltaserve/api/search" "github.com/minio/minio-go/v7" "github.com/reactivex/rxgo/v2" diff --git a/api/service/group_service.go b/api/service/group_service.go index 10f5cbb5f..2c83e055b 100644 --- a/api/service/group_service.go +++ b/api/service/group_service.go @@ -13,13 +13,14 @@ package service import ( "sort" "time" - "voltaserve/cache" - "voltaserve/config" - "voltaserve/guard" - "voltaserve/helper" - "voltaserve/model" - "voltaserve/repo" - "voltaserve/search" + + "github.com/kouprlabs/voltaserve/api/cache" + "github.com/kouprlabs/voltaserve/api/config" + "github.com/kouprlabs/voltaserve/api/guard" + "github.com/kouprlabs/voltaserve/api/helper" + "github.com/kouprlabs/voltaserve/api/model" + "github.com/kouprlabs/voltaserve/api/repo" + "github.com/kouprlabs/voltaserve/api/search" ) type GroupService struct { diff --git a/api/service/insights_service.go b/api/service/insights_service.go index 299ce6060..d997def8c 100644 --- a/api/service/insights_service.go +++ b/api/service/insights_service.go @@ -16,15 +16,16 @@ import ( "fmt" "sort" "strings" - "voltaserve/cache" - "voltaserve/client" - "voltaserve/errorpkg" - "voltaserve/guard" - "voltaserve/helper" - "voltaserve/infra" - "voltaserve/log" - "voltaserve/model" - "voltaserve/repo" + + "github.com/kouprlabs/voltaserve/api/cache" + "github.com/kouprlabs/voltaserve/api/client" + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/guard" + "github.com/kouprlabs/voltaserve/api/helper" + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/log" + "github.com/kouprlabs/voltaserve/api/model" + "github.com/kouprlabs/voltaserve/api/repo" "github.com/minio/minio-go/v7" ) diff --git a/api/service/invitation_service.go b/api/service/invitation_service.go index 6428967d7..ada2992b9 100644 --- a/api/service/invitation_service.go +++ b/api/service/invitation_service.go @@ -14,13 +14,14 @@ import ( "sort" "strings" "time" - "voltaserve/cache" - "voltaserve/config" - "voltaserve/errorpkg" - "voltaserve/guard" - "voltaserve/infra" - "voltaserve/model" - "voltaserve/repo" + + "github.com/kouprlabs/voltaserve/api/cache" + "github.com/kouprlabs/voltaserve/api/config" + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/guard" + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/model" + "github.com/kouprlabs/voltaserve/api/repo" ) type InvitationService struct { diff --git a/api/service/mosaic_service.go b/api/service/mosaic_service.go index 35b34abb2..16424c2bc 100644 --- a/api/service/mosaic_service.go +++ b/api/service/mosaic_service.go @@ -13,15 +13,16 @@ package service import ( "bytes" "path/filepath" - "voltaserve/cache" - "voltaserve/client" - "voltaserve/errorpkg" - "voltaserve/guard" - "voltaserve/helper" - "voltaserve/infra" - "voltaserve/log" - "voltaserve/model" - "voltaserve/repo" + + "github.com/kouprlabs/voltaserve/api/cache" + "github.com/kouprlabs/voltaserve/api/client" + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/guard" + "github.com/kouprlabs/voltaserve/api/helper" + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/log" + "github.com/kouprlabs/voltaserve/api/model" + "github.com/kouprlabs/voltaserve/api/repo" ) type MosaicService struct { diff --git a/api/service/organization_service.go b/api/service/organization_service.go index d7b34b116..cf939361a 100644 --- a/api/service/organization_service.go +++ b/api/service/organization_service.go @@ -13,15 +13,16 @@ package service import ( "sort" "time" - "voltaserve/cache" - "voltaserve/config" - "voltaserve/errorpkg" - "voltaserve/guard" - "voltaserve/helper" - "voltaserve/log" - "voltaserve/model" - "voltaserve/repo" - "voltaserve/search" + + "github.com/kouprlabs/voltaserve/api/cache" + "github.com/kouprlabs/voltaserve/api/config" + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/guard" + "github.com/kouprlabs/voltaserve/api/helper" + "github.com/kouprlabs/voltaserve/api/log" + "github.com/kouprlabs/voltaserve/api/model" + "github.com/kouprlabs/voltaserve/api/repo" + "github.com/kouprlabs/voltaserve/api/search" ) type OrganizationService struct { diff --git a/api/service/snapshot_service.go b/api/service/snapshot_service.go index c99fce34b..572de44d5 100644 --- a/api/service/snapshot_service.go +++ b/api/service/snapshot_service.go @@ -14,16 +14,17 @@ import ( "path/filepath" "sort" "time" - "voltaserve/cache" - "voltaserve/client" - "voltaserve/config" - "voltaserve/errorpkg" - "voltaserve/guard" - "voltaserve/helper" - "voltaserve/log" - "voltaserve/model" - "voltaserve/repo" - "voltaserve/search" + + "github.com/kouprlabs/voltaserve/api/cache" + "github.com/kouprlabs/voltaserve/api/client" + "github.com/kouprlabs/voltaserve/api/config" + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/guard" + "github.com/kouprlabs/voltaserve/api/helper" + "github.com/kouprlabs/voltaserve/api/log" + "github.com/kouprlabs/voltaserve/api/model" + "github.com/kouprlabs/voltaserve/api/repo" + "github.com/kouprlabs/voltaserve/api/search" ) type SnapshotService struct { diff --git a/api/service/storage_service.go b/api/service/storage_service.go index 987c6d32f..d9ed60131 100644 --- a/api/service/storage_service.go +++ b/api/service/storage_service.go @@ -11,10 +11,10 @@ package service import ( - "voltaserve/cache" - "voltaserve/guard" - "voltaserve/model" - "voltaserve/repo" + "github.com/kouprlabs/voltaserve/api/cache" + "github.com/kouprlabs/voltaserve/api/guard" + "github.com/kouprlabs/voltaserve/api/model" + "github.com/kouprlabs/voltaserve/api/repo" ) type StorageService struct { diff --git a/api/service/task_service.go b/api/service/task_service.go index 7e15bfd7f..07cd0966d 100644 --- a/api/service/task_service.go +++ b/api/service/task_service.go @@ -13,12 +13,13 @@ package service import ( "sort" "time" - "voltaserve/cache" - "voltaserve/errorpkg" - "voltaserve/helper" - "voltaserve/model" - "voltaserve/repo" - "voltaserve/search" + + "github.com/kouprlabs/voltaserve/api/cache" + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/helper" + "github.com/kouprlabs/voltaserve/api/model" + "github.com/kouprlabs/voltaserve/api/repo" + "github.com/kouprlabs/voltaserve/api/search" ) type TaskService struct { diff --git a/api/service/types.go b/api/service/types.go index af6ec02d5..2b4cf35c0 100644 --- a/api/service/types.go +++ b/api/service/types.go @@ -12,8 +12,9 @@ package service import ( "bytes" - "voltaserve/infra" - "voltaserve/model" + + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/model" ) type DownloadResult struct { diff --git a/api/service/user_service.go b/api/service/user_service.go index 8f3388ea5..629a62c65 100644 --- a/api/service/user_service.go +++ b/api/service/user_service.go @@ -12,12 +12,13 @@ package service import ( "sort" - "voltaserve/cache" - "voltaserve/config" - "voltaserve/guard" - "voltaserve/model" - "voltaserve/repo" - "voltaserve/search" + + "github.com/kouprlabs/voltaserve/api/cache" + "github.com/kouprlabs/voltaserve/api/config" + "github.com/kouprlabs/voltaserve/api/guard" + "github.com/kouprlabs/voltaserve/api/model" + "github.com/kouprlabs/voltaserve/api/repo" + "github.com/kouprlabs/voltaserve/api/search" ) type UserService struct { diff --git a/api/service/watermark_service.go b/api/service/watermark_service.go index e7242b070..43edb6af9 100644 --- a/api/service/watermark_service.go +++ b/api/service/watermark_service.go @@ -12,15 +12,16 @@ package service import ( "bytes" - "voltaserve/cache" - "voltaserve/client" - "voltaserve/errorpkg" - "voltaserve/guard" - "voltaserve/helper" - "voltaserve/infra" - "voltaserve/log" - "voltaserve/model" - "voltaserve/repo" + + "github.com/kouprlabs/voltaserve/api/cache" + "github.com/kouprlabs/voltaserve/api/client" + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/guard" + "github.com/kouprlabs/voltaserve/api/helper" + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/log" + "github.com/kouprlabs/voltaserve/api/model" + "github.com/kouprlabs/voltaserve/api/repo" "github.com/minio/minio-go/v7" ) diff --git a/api/service/workspace_service.go b/api/service/workspace_service.go index f585a9ead..e3260fcbc 100644 --- a/api/service/workspace_service.go +++ b/api/service/workspace_service.go @@ -14,15 +14,16 @@ import ( "sort" "strings" "time" - "voltaserve/cache" - "voltaserve/config" - "voltaserve/errorpkg" - "voltaserve/guard" - "voltaserve/helper" - "voltaserve/infra" - "voltaserve/model" - "voltaserve/repo" - "voltaserve/search" + + "github.com/kouprlabs/voltaserve/api/cache" + "github.com/kouprlabs/voltaserve/api/config" + "github.com/kouprlabs/voltaserve/api/errorpkg" + "github.com/kouprlabs/voltaserve/api/guard" + "github.com/kouprlabs/voltaserve/api/helper" + "github.com/kouprlabs/voltaserve/api/infra" + "github.com/kouprlabs/voltaserve/api/model" + "github.com/kouprlabs/voltaserve/api/repo" + "github.com/kouprlabs/voltaserve/api/search" "github.com/google/uuid" ) diff --git a/conversion/client/api_client.go b/conversion/client/api_client.go index 34b140f05..b09ee0a57 100644 --- a/conversion/client/api_client.go +++ b/conversion/client/api_client.go @@ -16,7 +16,8 @@ import ( "fmt" "io" "net/http" - "voltaserve/config" + + "github.com/kouprlabs/voltaserve/conversion/config" ) type APIClient struct { diff --git a/conversion/client/language_client.go b/conversion/client/language_client.go index 205339a80..4ef5e8425 100644 --- a/conversion/client/language_client.go +++ b/conversion/client/language_client.go @@ -16,8 +16,9 @@ import ( "fmt" "io" "net/http" - "voltaserve/config" - "voltaserve/infra" + + "github.com/kouprlabs/voltaserve/conversion/config" + "github.com/kouprlabs/voltaserve/conversion/infra" ) type LanguageClient struct { diff --git a/conversion/client/mosaic_client.go b/conversion/client/mosaic_client.go index 3b3b087cc..3ded36be1 100644 --- a/conversion/client/mosaic_client.go +++ b/conversion/client/mosaic_client.go @@ -19,8 +19,9 @@ import ( "mime/multipart" "net/http" "os" - "voltaserve/config" - "voltaserve/infra" + + "github.com/kouprlabs/voltaserve/conversion/config" + "github.com/kouprlabs/voltaserve/conversion/infra" ) type MosaicClient struct { diff --git a/conversion/client/watermark_client.go b/conversion/client/watermark_client.go index 9eeb5f595..25ba81ba5 100644 --- a/conversion/client/watermark_client.go +++ b/conversion/client/watermark_client.go @@ -19,8 +19,9 @@ import ( "mime/multipart" "net/http" "os" - "voltaserve/config" - "voltaserve/infra" + + "github.com/kouprlabs/voltaserve/conversion/config" + "github.com/kouprlabs/voltaserve/conversion/infra" ) type WatermarkClient struct { diff --git a/conversion/go.mod b/conversion/go.mod index 2bf5b8367..d2399ba43 100644 --- a/conversion/go.mod +++ b/conversion/go.mod @@ -1,4 +1,4 @@ -module voltaserve +module github.com/kouprlabs/voltaserve/conversion go 1.22 diff --git a/conversion/identifier/pipeline_identifier.go b/conversion/identifier/pipeline_identifier.go index d55b9c213..591346fd1 100644 --- a/conversion/identifier/pipeline_identifier.go +++ b/conversion/identifier/pipeline_identifier.go @@ -11,8 +11,8 @@ package identifier import ( - "voltaserve/client" - "voltaserve/model" + "github.com/kouprlabs/voltaserve/conversion/client" + "github.com/kouprlabs/voltaserve/conversion/model" ) type PipelineIdentifier struct { diff --git a/conversion/infra/command.go b/conversion/infra/command.go index bbe72e470..b3728be33 100644 --- a/conversion/infra/command.go +++ b/conversion/infra/command.go @@ -17,8 +17,9 @@ import ( "os/exec" "sync" "time" - "voltaserve/config" - "voltaserve/helper" + + "github.com/kouprlabs/voltaserve/conversion/config" + "github.com/kouprlabs/voltaserve/conversion/helper" ) var commandMutex sync.Mutex diff --git a/conversion/infra/s3.go b/conversion/infra/s3.go index 15a66cda6..ad1745ead 100644 --- a/conversion/infra/s3.go +++ b/conversion/infra/s3.go @@ -16,7 +16,8 @@ import ( "errors" "io" "strings" - "voltaserve/config" + + "github.com/kouprlabs/voltaserve/conversion/config" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" diff --git a/conversion/main.go b/conversion/main.go index bde720351..aa81e60b2 100644 --- a/conversion/main.go +++ b/conversion/main.go @@ -15,11 +15,11 @@ import ( "fmt" "os" - "voltaserve/config" - "voltaserve/errorpkg" - "voltaserve/helper" - "voltaserve/router" - "voltaserve/runtime" + "github.com/kouprlabs/voltaserve/conversion/config" + "github.com/kouprlabs/voltaserve/conversion/errorpkg" + "github.com/kouprlabs/voltaserve/conversion/helper" + "github.com/kouprlabs/voltaserve/conversion/router" + "github.com/kouprlabs/voltaserve/conversion/runtime" "github.com/gofiber/fiber/v2" "github.com/joho/godotenv" diff --git a/conversion/model/types.go b/conversion/model/types.go index 347d13c76..9e918d50a 100644 --- a/conversion/model/types.go +++ b/conversion/model/types.go @@ -10,7 +10,7 @@ package model -import "voltaserve/client" +import "github.com/kouprlabs/voltaserve/conversion/client" type Pipeline interface { Run(client.PipelineRunOptions) error diff --git a/conversion/pipeline/audio_video_pipeline.go b/conversion/pipeline/audio_video_pipeline.go index 8a1f28b4e..b2dadeaa0 100644 --- a/conversion/pipeline/audio_video_pipeline.go +++ b/conversion/pipeline/audio_video_pipeline.go @@ -13,12 +13,13 @@ package pipeline import ( "os" "path/filepath" - "voltaserve/client" - "voltaserve/config" - "voltaserve/helper" - "voltaserve/infra" - "voltaserve/model" - "voltaserve/processor" + + "github.com/kouprlabs/voltaserve/conversion/client" + "github.com/kouprlabs/voltaserve/conversion/config" + "github.com/kouprlabs/voltaserve/conversion/helper" + "github.com/kouprlabs/voltaserve/conversion/infra" + "github.com/kouprlabs/voltaserve/conversion/model" + "github.com/kouprlabs/voltaserve/conversion/processor" "github.com/minio/minio-go/v7" ) diff --git a/conversion/pipeline/dispatcher.go b/conversion/pipeline/dispatcher.go index dc2b2a6bc..c3fa0ac01 100644 --- a/conversion/pipeline/dispatcher.go +++ b/conversion/pipeline/dispatcher.go @@ -12,11 +12,12 @@ package pipeline import ( "errors" - "voltaserve/client" - "voltaserve/errorpkg" - "voltaserve/helper" - "voltaserve/identifier" - "voltaserve/model" + + "github.com/kouprlabs/voltaserve/conversion/client" + "github.com/kouprlabs/voltaserve/conversion/errorpkg" + "github.com/kouprlabs/voltaserve/conversion/helper" + "github.com/kouprlabs/voltaserve/conversion/identifier" + "github.com/kouprlabs/voltaserve/conversion/model" ) type Dispatcher struct { diff --git a/conversion/pipeline/glb_pipeline.go b/conversion/pipeline/glb_pipeline.go index a83d1d868..0a4f7798e 100644 --- a/conversion/pipeline/glb_pipeline.go +++ b/conversion/pipeline/glb_pipeline.go @@ -13,12 +13,13 @@ package pipeline import ( "os" "path/filepath" - "voltaserve/client" - "voltaserve/config" - "voltaserve/helper" - "voltaserve/infra" - "voltaserve/model" - "voltaserve/processor" + + "github.com/kouprlabs/voltaserve/conversion/client" + "github.com/kouprlabs/voltaserve/conversion/config" + "github.com/kouprlabs/voltaserve/conversion/helper" + "github.com/kouprlabs/voltaserve/conversion/infra" + "github.com/kouprlabs/voltaserve/conversion/model" + "github.com/kouprlabs/voltaserve/conversion/processor" "github.com/minio/minio-go/v7" ) diff --git a/conversion/pipeline/image_pipeline.go b/conversion/pipeline/image_pipeline.go index 8d46d3298..57126ea15 100644 --- a/conversion/pipeline/image_pipeline.go +++ b/conversion/pipeline/image_pipeline.go @@ -13,13 +13,14 @@ package pipeline import ( "os" "path/filepath" - "voltaserve/client" - "voltaserve/config" - "voltaserve/helper" - "voltaserve/identifier" - "voltaserve/infra" - "voltaserve/model" - "voltaserve/processor" + + "github.com/kouprlabs/voltaserve/conversion/client" + "github.com/kouprlabs/voltaserve/conversion/config" + "github.com/kouprlabs/voltaserve/conversion/helper" + "github.com/kouprlabs/voltaserve/conversion/identifier" + "github.com/kouprlabs/voltaserve/conversion/infra" + "github.com/kouprlabs/voltaserve/conversion/model" + "github.com/kouprlabs/voltaserve/conversion/processor" "github.com/minio/minio-go/v7" ) diff --git a/conversion/pipeline/insights_pipeline.go b/conversion/pipeline/insights_pipeline.go index b886c1e9e..0cf1fd4b4 100644 --- a/conversion/pipeline/insights_pipeline.go +++ b/conversion/pipeline/insights_pipeline.go @@ -15,12 +15,13 @@ import ( "errors" "os" "path/filepath" - "voltaserve/client" - "voltaserve/helper" - "voltaserve/identifier" - "voltaserve/infra" - "voltaserve/model" - "voltaserve/processor" + + "github.com/kouprlabs/voltaserve/conversion/client" + "github.com/kouprlabs/voltaserve/conversion/helper" + "github.com/kouprlabs/voltaserve/conversion/identifier" + "github.com/kouprlabs/voltaserve/conversion/infra" + "github.com/kouprlabs/voltaserve/conversion/model" + "github.com/kouprlabs/voltaserve/conversion/processor" "github.com/minio/minio-go/v7" ) diff --git a/conversion/pipeline/mosaic_pipeline.go b/conversion/pipeline/mosaic_pipeline.go index 6fa34ec71..c0d11a625 100644 --- a/conversion/pipeline/mosaic_pipeline.go +++ b/conversion/pipeline/mosaic_pipeline.go @@ -14,12 +14,13 @@ import ( "errors" "os" "path/filepath" - "voltaserve/client" - "voltaserve/helper" - "voltaserve/identifier" - "voltaserve/infra" - "voltaserve/model" - "voltaserve/processor" + + "github.com/kouprlabs/voltaserve/conversion/client" + "github.com/kouprlabs/voltaserve/conversion/helper" + "github.com/kouprlabs/voltaserve/conversion/identifier" + "github.com/kouprlabs/voltaserve/conversion/infra" + "github.com/kouprlabs/voltaserve/conversion/model" + "github.com/kouprlabs/voltaserve/conversion/processor" "github.com/minio/minio-go/v7" ) diff --git a/conversion/pipeline/office_pipeline.go b/conversion/pipeline/office_pipeline.go index aa6ad3299..134d6d70a 100644 --- a/conversion/pipeline/office_pipeline.go +++ b/conversion/pipeline/office_pipeline.go @@ -13,12 +13,13 @@ package pipeline import ( "os" "path/filepath" - "voltaserve/client" - "voltaserve/config" - "voltaserve/helper" - "voltaserve/infra" - "voltaserve/model" - "voltaserve/processor" + + "github.com/kouprlabs/voltaserve/conversion/client" + "github.com/kouprlabs/voltaserve/conversion/config" + "github.com/kouprlabs/voltaserve/conversion/helper" + "github.com/kouprlabs/voltaserve/conversion/infra" + "github.com/kouprlabs/voltaserve/conversion/model" + "github.com/kouprlabs/voltaserve/conversion/processor" "github.com/minio/minio-go/v7" ) diff --git a/conversion/pipeline/pdf_pipeline.go b/conversion/pipeline/pdf_pipeline.go index bec7030c3..9114eb1b5 100644 --- a/conversion/pipeline/pdf_pipeline.go +++ b/conversion/pipeline/pdf_pipeline.go @@ -13,13 +13,14 @@ package pipeline import ( "os" "path/filepath" - "voltaserve/client" - "voltaserve/config" - "voltaserve/helper" - "voltaserve/identifier" - "voltaserve/infra" - "voltaserve/model" - "voltaserve/processor" + + "github.com/kouprlabs/voltaserve/conversion/client" + "github.com/kouprlabs/voltaserve/conversion/config" + "github.com/kouprlabs/voltaserve/conversion/helper" + "github.com/kouprlabs/voltaserve/conversion/identifier" + "github.com/kouprlabs/voltaserve/conversion/infra" + "github.com/kouprlabs/voltaserve/conversion/model" + "github.com/kouprlabs/voltaserve/conversion/processor" "github.com/minio/minio-go/v7" ) diff --git a/conversion/pipeline/watermark_pipeline.go b/conversion/pipeline/watermark_pipeline.go index a5d12fba9..6df18e70e 100644 --- a/conversion/pipeline/watermark_pipeline.go +++ b/conversion/pipeline/watermark_pipeline.go @@ -14,12 +14,13 @@ import ( "errors" "os" "path/filepath" - "voltaserve/client" - "voltaserve/helper" - "voltaserve/identifier" - "voltaserve/infra" - "voltaserve/model" - "voltaserve/processor" + + "github.com/kouprlabs/voltaserve/conversion/client" + "github.com/kouprlabs/voltaserve/conversion/helper" + "github.com/kouprlabs/voltaserve/conversion/identifier" + "github.com/kouprlabs/voltaserve/conversion/infra" + "github.com/kouprlabs/voltaserve/conversion/model" + "github.com/kouprlabs/voltaserve/conversion/processor" "github.com/minio/minio-go/v7" ) diff --git a/conversion/pipeline/zip_pipeline.go b/conversion/pipeline/zip_pipeline.go index b2fc5c096..fd3d6bed1 100644 --- a/conversion/pipeline/zip_pipeline.go +++ b/conversion/pipeline/zip_pipeline.go @@ -13,12 +13,13 @@ package pipeline import ( "os" "path/filepath" - "voltaserve/client" - "voltaserve/helper" - "voltaserve/identifier" - "voltaserve/infra" - "voltaserve/model" - "voltaserve/processor" + + "github.com/kouprlabs/voltaserve/conversion/client" + "github.com/kouprlabs/voltaserve/conversion/helper" + "github.com/kouprlabs/voltaserve/conversion/identifier" + "github.com/kouprlabs/voltaserve/conversion/infra" + "github.com/kouprlabs/voltaserve/conversion/model" + "github.com/kouprlabs/voltaserve/conversion/processor" "github.com/minio/minio-go/v7" ) diff --git a/conversion/processor/glb_processor.go b/conversion/processor/glb_processor.go index d646f91a0..864346a3f 100644 --- a/conversion/processor/glb_processor.go +++ b/conversion/processor/glb_processor.go @@ -12,8 +12,9 @@ package processor import ( "fmt" - "voltaserve/config" - "voltaserve/infra" + + "github.com/kouprlabs/voltaserve/conversion/config" + "github.com/kouprlabs/voltaserve/conversion/infra" ) type GLBProcessor struct { diff --git a/conversion/processor/gltf_processor.go b/conversion/processor/gltf_processor.go index 10d3b7c35..175174afa 100644 --- a/conversion/processor/gltf_processor.go +++ b/conversion/processor/gltf_processor.go @@ -11,7 +11,7 @@ package processor import ( - "voltaserve/infra" + "github.com/kouprlabs/voltaserve/conversion/infra" ) type GLTFProcessor struct { diff --git a/conversion/processor/image_processor.go b/conversion/processor/image_processor.go index 20cb5e013..ae0396f3c 100644 --- a/conversion/processor/image_processor.go +++ b/conversion/processor/image_processor.go @@ -13,11 +13,12 @@ package processor import ( "strconv" "strings" - "voltaserve/client" - "voltaserve/config" - "voltaserve/helper" - "voltaserve/identifier" - "voltaserve/infra" + + "github.com/kouprlabs/voltaserve/conversion/client" + "github.com/kouprlabs/voltaserve/conversion/config" + "github.com/kouprlabs/voltaserve/conversion/helper" + "github.com/kouprlabs/voltaserve/conversion/identifier" + "github.com/kouprlabs/voltaserve/conversion/infra" ) type ImageProcessor struct { diff --git a/conversion/processor/ocr_processor.go b/conversion/processor/ocr_processor.go index 393e03e2e..ad731e1d3 100644 --- a/conversion/processor/ocr_processor.go +++ b/conversion/processor/ocr_processor.go @@ -12,8 +12,9 @@ package processor import ( "fmt" - "voltaserve/config" - "voltaserve/infra" + + "github.com/kouprlabs/voltaserve/conversion/config" + "github.com/kouprlabs/voltaserve/conversion/infra" ) type OCRProcessor struct { diff --git a/conversion/processor/office_processor.go b/conversion/processor/office_processor.go index 699c06c1b..87ed11cd2 100644 --- a/conversion/processor/office_processor.go +++ b/conversion/processor/office_processor.go @@ -15,9 +15,10 @@ import ( "path" "path/filepath" "strings" - "voltaserve/config" - "voltaserve/helper" - "voltaserve/infra" + + "github.com/kouprlabs/voltaserve/conversion/config" + "github.com/kouprlabs/voltaserve/conversion/helper" + "github.com/kouprlabs/voltaserve/conversion/infra" ) type OfficeProcessor struct { diff --git a/conversion/processor/pdf_processor.go b/conversion/processor/pdf_processor.go index af56767f3..a35c6183f 100644 --- a/conversion/processor/pdf_processor.go +++ b/conversion/processor/pdf_processor.go @@ -16,9 +16,10 @@ import ( "path/filepath" "strconv" "strings" - "voltaserve/config" - "voltaserve/helper" - "voltaserve/infra" + + "github.com/kouprlabs/voltaserve/conversion/config" + "github.com/kouprlabs/voltaserve/conversion/helper" + "github.com/kouprlabs/voltaserve/conversion/infra" ) type PDFProcessor struct { diff --git a/conversion/processor/video_processor.go b/conversion/processor/video_processor.go index 0951de8ba..6e383bef9 100644 --- a/conversion/processor/video_processor.go +++ b/conversion/processor/video_processor.go @@ -13,9 +13,10 @@ package processor import ( "os" "path/filepath" - "voltaserve/config" - "voltaserve/helper" - "voltaserve/infra" + + "github.com/kouprlabs/voltaserve/conversion/config" + "github.com/kouprlabs/voltaserve/conversion/helper" + "github.com/kouprlabs/voltaserve/conversion/infra" ) type VideoProcessor struct { diff --git a/conversion/processor/zip_processor.go b/conversion/processor/zip_processor.go index c1c2cffb4..7ea5ab59c 100644 --- a/conversion/processor/zip_processor.go +++ b/conversion/processor/zip_processor.go @@ -11,7 +11,7 @@ package processor import ( - "voltaserve/infra" + "github.com/kouprlabs/voltaserve/conversion/infra" ) type ZIPProcessor struct { diff --git a/conversion/router/health_router.go b/conversion/router/health_router.go index 310263187..ab9a02012 100644 --- a/conversion/router/health_router.go +++ b/conversion/router/health_router.go @@ -12,8 +12,9 @@ package router import ( "net/http" - "voltaserve/client" - "voltaserve/infra" + + "github.com/kouprlabs/voltaserve/conversion/client" + "github.com/kouprlabs/voltaserve/conversion/infra" "github.com/gofiber/fiber/v2" ) diff --git a/conversion/router/pipeline_router.go b/conversion/router/pipeline_router.go index 793321aba..d43bdbb11 100644 --- a/conversion/router/pipeline_router.go +++ b/conversion/router/pipeline_router.go @@ -11,10 +11,10 @@ package router import ( - "voltaserve/client" - "voltaserve/config" - "voltaserve/errorpkg" - "voltaserve/runtime" + "github.com/kouprlabs/voltaserve/conversion/client" + "github.com/kouprlabs/voltaserve/conversion/config" + "github.com/kouprlabs/voltaserve/conversion/errorpkg" + "github.com/kouprlabs/voltaserve/conversion/runtime" "github.com/go-playground/validator/v10" "github.com/gofiber/fiber/v2" diff --git a/conversion/runtime/scheduler.go b/conversion/runtime/scheduler.go index 792e0f288..36fd9f5e2 100644 --- a/conversion/runtime/scheduler.go +++ b/conversion/runtime/scheduler.go @@ -13,10 +13,11 @@ package runtime import ( "runtime" "time" - "voltaserve/pipeline" - "voltaserve/client" - "voltaserve/infra" + "github.com/kouprlabs/voltaserve/conversion/pipeline" + + "github.com/kouprlabs/voltaserve/conversion/client" + "github.com/kouprlabs/voltaserve/conversion/infra" ) type Scheduler struct { diff --git a/go.work b/go.work new file mode 100644 index 000000000..34a5a3931 --- /dev/null +++ b/go.work @@ -0,0 +1,8 @@ +go 1.22.5 + +use ( + ./api + ./conversion + ./mosaic + ./ui +) diff --git a/go.work.sum b/go.work.sum new file mode 100644 index 000000000..e2fde87bb --- /dev/null +++ b/go.work.sum @@ -0,0 +1,24 @@ +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw= +github.com/philhofer/fwd v1.1.2 h1:bnDivRJ1EWPjUIRXV5KfORO897HTbpFAQddBdE8t7Gw= +github.com/philhofer/fwd v1.1.2/go.mod h1:qkPdfjR2SIEbspLqpe1tO4n5yICnr2DY7mqEx2tUTP0= +github.com/tinylib/msgp v1.1.8 h1:FCXC1xanKO4I8plpHGH2P7koL/RzZs12l/+r7vakfm0= +github.com/tinylib/msgp v1.1.8/go.mod h1:qkpG+2ldGg4xRFmx+jfTvZPxfGFhi64BcnL9vkCm/Tw= +github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2 h1:IRJeR9r1pYWsHKTRe/IInb7lYvbBVIqOgsX/u0mbOWY= +golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= +golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= +golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= +golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= diff --git a/mosaic/builder/mosaic_builder.go b/mosaic/builder/mosaic_builder.go index 97dc5ede6..37a0b3745 100644 --- a/mosaic/builder/mosaic_builder.go +++ b/mosaic/builder/mosaic_builder.go @@ -15,7 +15,8 @@ import ( "fmt" "os" "path/filepath" - "voltaserve/infra" + + "github.com/kouprlabs/voltaserve/mosaic/infra" ) const ( diff --git a/mosaic/go.mod b/mosaic/go.mod index 793e7686c..b2e114219 100644 --- a/mosaic/go.mod +++ b/mosaic/go.mod @@ -1,4 +1,4 @@ -module voltaserve +module github.com/kouprlabs/voltaserve/mosaic go 1.22 diff --git a/mosaic/infra/s3.go b/mosaic/infra/s3.go index 3e34f9a0d..b66003849 100644 --- a/mosaic/infra/s3.go +++ b/mosaic/infra/s3.go @@ -16,7 +16,8 @@ import ( "errors" "io" "strings" - "voltaserve/config" + + "github.com/kouprlabs/voltaserve/mosaic/config" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" diff --git a/mosaic/main.go b/mosaic/main.go index eee07f9f2..f92b1a8ac 100644 --- a/mosaic/main.go +++ b/mosaic/main.go @@ -14,10 +14,10 @@ import ( "fmt" "os" - "voltaserve/config" - "voltaserve/errorpkg" - "voltaserve/helper" - "voltaserve/router" + "github.com/kouprlabs/voltaserve/mosaic/config" + "github.com/kouprlabs/voltaserve/mosaic/errorpkg" + "github.com/kouprlabs/voltaserve/mosaic/helper" + "github.com/kouprlabs/voltaserve/mosaic/router" "github.com/gofiber/fiber/v2" "github.com/joho/godotenv" diff --git a/mosaic/router/health_router.go b/mosaic/router/health_router.go index d84a315d6..910677610 100644 --- a/mosaic/router/health_router.go +++ b/mosaic/router/health_router.go @@ -12,7 +12,8 @@ package router import ( "net/http" - "voltaserve/infra" + + "github.com/kouprlabs/voltaserve/mosaic/infra" "github.com/gofiber/fiber/v2" ) diff --git a/mosaic/router/mosaic_router.go b/mosaic/router/mosaic_router.go index 0d5c0b351..0e4fa5294 100644 --- a/mosaic/router/mosaic_router.go +++ b/mosaic/router/mosaic_router.go @@ -14,10 +14,11 @@ import ( "os" "path/filepath" "strconv" - "voltaserve/config" - "voltaserve/helper" - "voltaserve/infra" - "voltaserve/service" + + "github.com/kouprlabs/voltaserve/mosaic/config" + "github.com/kouprlabs/voltaserve/mosaic/helper" + "github.com/kouprlabs/voltaserve/mosaic/infra" + "github.com/kouprlabs/voltaserve/mosaic/service" "github.com/gofiber/fiber/v2" ) diff --git a/mosaic/service/mosaic_service.go b/mosaic/service/mosaic_service.go index 98a9491a8..94c6740d0 100644 --- a/mosaic/service/mosaic_service.go +++ b/mosaic/service/mosaic_service.go @@ -17,11 +17,12 @@ import ( "mime" "os" "path/filepath" - "voltaserve/builder" - "voltaserve/config" - "voltaserve/errorpkg" - "voltaserve/helper" - "voltaserve/infra" + + "github.com/kouprlabs/voltaserve/mosaic/builder" + "github.com/kouprlabs/voltaserve/mosaic/config" + "github.com/kouprlabs/voltaserve/mosaic/errorpkg" + "github.com/kouprlabs/voltaserve/mosaic/helper" + "github.com/kouprlabs/voltaserve/mosaic/infra" "github.com/minio/minio-go/v7" ) diff --git a/ui/go.mod b/ui/go.mod index d73e814c5..7348ff58c 100644 --- a/ui/go.mod +++ b/ui/go.mod @@ -1,4 +1,4 @@ -module voltaserve +module github.com/kouprlabs/voltaserve/ui go 1.22.2 diff --git a/ui/main.go b/ui/main.go index 8250d2020..0781aadc8 100644 --- a/ui/main.go +++ b/ui/main.go @@ -17,7 +17,8 @@ import ( "net/http" "net/url" "os" - "voltaserve/config" + + "github.com/kouprlabs/voltaserve/ui/config" "github.com/joho/godotenv" "github.com/labstack/echo/v4" From a1eeb499d89e2c327daca296086a47e5eef2c2db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20=C5=81oboda?= Date: Tue, 9 Jul 2024 20:32:43 +0200 Subject: [PATCH 2/3] ci: rework of pipelines --- .github/workflows/{api.yml => build-api.yml} | 2 +- .../{conversion.yml => build-conversion.yml} | 2 +- .github/workflows/{idp.yml => build-idp.yml} | 2 +- .../{language.yml => build-language.yml} | 2 +- .../{mosaic.yml => build-mosaic.yml} | 2 +- .github/workflows/{ui.yml => build-ui.yml} | 2 +- .../{webdav.yml => build-webdav.yml} | 2 +- .github/workflows/lint-api.yml | 34 +++++++++++++++++++ .github/workflows/lint-conversion.yml | 34 +++++++++++++++++++ .github/workflows/lint-idp.yml | 34 +++++++++++++++++++ .github/workflows/lint-language.yml | 34 +++++++++++++++++++ .github/workflows/lint-mosaic.yml | 34 +++++++++++++++++++ .github/workflows/lint-ui.yml | 34 +++++++++++++++++++ 13 files changed, 211 insertions(+), 7 deletions(-) rename .github/workflows/{api.yml => build-api.yml} (97%) rename .github/workflows/{conversion.yml => build-conversion.yml} (97%) rename .github/workflows/{idp.yml => build-idp.yml} (96%) rename .github/workflows/{language.yml => build-language.yml} (96%) rename .github/workflows/{mosaic.yml => build-mosaic.yml} (97%) rename .github/workflows/{ui.yml => build-ui.yml} (97%) rename .github/workflows/{webdav.yml => build-webdav.yml} (96%) create mode 100644 .github/workflows/lint-api.yml create mode 100644 .github/workflows/lint-conversion.yml create mode 100644 .github/workflows/lint-idp.yml create mode 100644 .github/workflows/lint-language.yml create mode 100644 .github/workflows/lint-mosaic.yml create mode 100644 .github/workflows/lint-ui.yml diff --git a/.github/workflows/api.yml b/.github/workflows/build-api.yml similarity index 97% rename from .github/workflows/api.yml rename to .github/workflows/build-api.yml index d02d52a71..ce58a7022 100644 --- a/.github/workflows/api.yml +++ b/.github/workflows/build-api.yml @@ -1,4 +1,4 @@ -# Copyright 2023 Anass Bouassaba. +# Copyright 2023 Anass Bouassaba, Piotr Łoboda. # # Use of this software is governed by the Business Source License # included in the file licenses/BSL.txt. diff --git a/.github/workflows/conversion.yml b/.github/workflows/build-conversion.yml similarity index 97% rename from .github/workflows/conversion.yml rename to .github/workflows/build-conversion.yml index d2c5626ad..96fac7cd8 100644 --- a/.github/workflows/conversion.yml +++ b/.github/workflows/build-conversion.yml @@ -1,4 +1,4 @@ -# Copyright 2023 Anass Bouassaba. +# Copyright 2023 Anass Bouassaba, Piotr Łoboda. # # Use of this software is governed by the Business Source License # included in the file licenses/BSL.txt. diff --git a/.github/workflows/idp.yml b/.github/workflows/build-idp.yml similarity index 96% rename from .github/workflows/idp.yml rename to .github/workflows/build-idp.yml index ff762f60e..a5908cf2a 100644 --- a/.github/workflows/idp.yml +++ b/.github/workflows/build-idp.yml @@ -1,4 +1,4 @@ -# Copyright 2023 Anass Bouassaba. +# Copyright 2023 Anass Bouassaba, Piotr Łoboda. # # Use of this software is governed by the Business Source License # included in the file licenses/BSL.txt. diff --git a/.github/workflows/language.yml b/.github/workflows/build-language.yml similarity index 96% rename from .github/workflows/language.yml rename to .github/workflows/build-language.yml index 96f892ce3..8e1f48982 100644 --- a/.github/workflows/language.yml +++ b/.github/workflows/build-language.yml @@ -1,4 +1,4 @@ -# Copyright 2023 Anass Bouassaba. +# Copyright 2023 Anass Bouassaba, Piotr Łoboda. # # Use of this software is governed by the Business Source License # included in the file licenses/BSL.txt. diff --git a/.github/workflows/mosaic.yml b/.github/workflows/build-mosaic.yml similarity index 97% rename from .github/workflows/mosaic.yml rename to .github/workflows/build-mosaic.yml index 91bb4f53d..bd97ea585 100644 --- a/.github/workflows/mosaic.yml +++ b/.github/workflows/build-mosaic.yml @@ -1,4 +1,4 @@ -# Copyright 2023 Anass Bouassaba. +# Copyright 2023 Anass Bouassaba, Piotr Łoboda. # # Use of this software is governed by the Business Source License # included in the file licenses/BSL.txt. diff --git a/.github/workflows/ui.yml b/.github/workflows/build-ui.yml similarity index 97% rename from .github/workflows/ui.yml rename to .github/workflows/build-ui.yml index 1cf496a9b..958637dcf 100644 --- a/.github/workflows/ui.yml +++ b/.github/workflows/build-ui.yml @@ -1,4 +1,4 @@ -# Copyright 2023 Anass Bouassaba. +# Copyright 2023 Anass Bouassaba, Piotr Łoboda. # # Use of this software is governed by the Business Source License # included in the file licenses/BSL.txt. diff --git a/.github/workflows/webdav.yml b/.github/workflows/build-webdav.yml similarity index 96% rename from .github/workflows/webdav.yml rename to .github/workflows/build-webdav.yml index c19f63694..db19fecc1 100644 --- a/.github/workflows/webdav.yml +++ b/.github/workflows/build-webdav.yml @@ -1,4 +1,4 @@ -# Copyright 2023 Anass Bouassaba. +# Copyright 2023 Anass Bouassaba, Piotr Łoboda. # # Use of this software is governed by the Business Source License # included in the file licenses/BSL.txt. diff --git a/.github/workflows/lint-api.yml b/.github/workflows/lint-api.yml new file mode 100644 index 000000000..9d5de7c18 --- /dev/null +++ b/.github/workflows/lint-api.yml @@ -0,0 +1,34 @@ +# Copyright 2023 Daniel Sonck, Piotr Łoboda. +# +# Use of this software is governed by the Business Source License +# included in the file licenses/BSL.txt. +# +# As of the Change Date specified in that file, in accordance with +# the Business Source License, use of this software will be governed +# by the GNU Affero General Public License v3.0 only, included in the file +# licenses/AGPL.txt. + +name: Lint voltaserve/api + +on: + pull_request: + branches: + - main + paths: + - "api/**" + +jobs: + linting: + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + + - name: Lint using Golanci lint + uses: golangci/golangci-lint-action@v6 + with: + working-directory: api + permissions: + contents: read + pull-requests: read + checks: write diff --git a/.github/workflows/lint-conversion.yml b/.github/workflows/lint-conversion.yml new file mode 100644 index 000000000..6b26d87fb --- /dev/null +++ b/.github/workflows/lint-conversion.yml @@ -0,0 +1,34 @@ +# Copyright 2023 Daniel Sonck, Piotr Łoboda. +# +# Use of this software is governed by the Business Source License +# included in the file licenses/BSL.txt. +# +# As of the Change Date specified in that file, in accordance with +# the Business Source License, use of this software will be governed +# by the GNU Affero General Public License v3.0 only, included in the file +# licenses/AGPL.txt. + +name: Lint voltaserve/conversion + +on: + pull_request: + branches: + - main + paths: + - "conversion/**" + +jobs: + linting: + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + + - name: Lint using Golanci lint + uses: golangci/golangci-lint-action@v6 + with: + working-directory: conversion + permissions: + contents: read + pull-requests: read + checks: write diff --git a/.github/workflows/lint-idp.yml b/.github/workflows/lint-idp.yml new file mode 100644 index 000000000..dae23b25b --- /dev/null +++ b/.github/workflows/lint-idp.yml @@ -0,0 +1,34 @@ +# Copyright 2023 Daniel Sonck, Piotr Łoboda. +# +# Use of this software is governed by the Business Source License +# included in the file licenses/BSL.txt. +# +# As of the Change Date specified in that file, in accordance with +# the Business Source License, use of this software will be governed +# by the GNU Affero General Public License v3.0 only, included in the file +# licenses/AGPL.txt. + +name: Lint voltaserve/idp + +on: + pull_request: + branches: + - main + paths: + - "idp/**" + +jobs: + linting: + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + + - name: Lint using Golanci lint + uses: golangci/golangci-lint-action@v6 + with: + working-directory: idp + permissions: + contents: read + pull-requests: read + checks: write diff --git a/.github/workflows/lint-language.yml b/.github/workflows/lint-language.yml new file mode 100644 index 000000000..e991b9677 --- /dev/null +++ b/.github/workflows/lint-language.yml @@ -0,0 +1,34 @@ +# Copyright 2023 Daniel Sonck, Piotr Łoboda. +# +# Use of this software is governed by the Business Source License +# included in the file licenses/BSL.txt. +# +# As of the Change Date specified in that file, in accordance with +# the Business Source License, use of this software will be governed +# by the GNU Affero General Public License v3.0 only, included in the file +# licenses/AGPL.txt. + +name: Lint voltaserve/language + +on: + pull_request: + branches: + - main + paths: + - "language/**" + +jobs: + linting: + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + + - name: Lint using Golanci lint + uses: golangci/golangci-lint-action@v6 + with: + working-directory: language + permissions: + contents: read + pull-requests: read + checks: write diff --git a/.github/workflows/lint-mosaic.yml b/.github/workflows/lint-mosaic.yml new file mode 100644 index 000000000..632c341fd --- /dev/null +++ b/.github/workflows/lint-mosaic.yml @@ -0,0 +1,34 @@ +# Copyright 2023 Daniel Sonck, Piotr Łoboda. +# +# Use of this software is governed by the Business Source License +# included in the file licenses/BSL.txt. +# +# As of the Change Date specified in that file, in accordance with +# the Business Source License, use of this software will be governed +# by the GNU Affero General Public License v3.0 only, included in the file +# licenses/AGPL.txt. + +name: Lint voltaserve/mosaic + +on: + pull_request: + branches: + - main + paths: + - "mosaic/**" + +jobs: + linting: + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + + - name: Lint using Golanci lint + uses: golangci/golangci-lint-action@v6 + with: + working-directory: mosaic + permissions: + contents: read + pull-requests: read + checks: write diff --git a/.github/workflows/lint-ui.yml b/.github/workflows/lint-ui.yml new file mode 100644 index 000000000..38245bbda --- /dev/null +++ b/.github/workflows/lint-ui.yml @@ -0,0 +1,34 @@ +# Copyright 2023 Daniel Sonck, Piotr Łoboda. +# +# Use of this software is governed by the Business Source License +# included in the file licenses/BSL.txt. +# +# As of the Change Date specified in that file, in accordance with +# the Business Source License, use of this software will be governed +# by the GNU Affero General Public License v3.0 only, included in the file +# licenses/AGPL.txt. + +name: Lint voltaserve/ui + +on: + pull_request: + branches: + - main + paths: + - "ui/**" + +jobs: + linting: + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + + - name: Lint using Golanci lint + uses: golangci/golangci-lint-action@v6 + with: + working-directory: ui + permissions: + contents: read + pull-requests: read + checks: write From 3e03c21449257aa5d33ec2f38674a6fb608a6c7e Mon Sep 17 00:00:00 2001 From: Daniel Sonck Date: Tue, 9 Jul 2024 20:44:08 +0200 Subject: [PATCH 3/3] =?UTF-8?q?docs:=20fix=20name=20of=20Dani=C3=ABl=20Son?= =?UTF-8?q?ck?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/lint-api.yml | 2 +- .github/workflows/lint-conversion.yml | 2 +- .github/workflows/lint-idp.yml | 2 +- .github/workflows/lint-language.yml | 2 +- .github/workflows/lint-mosaic.yml | 2 +- .github/workflows/lint-ui.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/lint-api.yml b/.github/workflows/lint-api.yml index 9d5de7c18..a41c3b453 100644 --- a/.github/workflows/lint-api.yml +++ b/.github/workflows/lint-api.yml @@ -1,4 +1,4 @@ -# Copyright 2023 Daniel Sonck, Piotr Łoboda. +# Copyright 2023 Daniël Sonck, Piotr Łoboda. # # Use of this software is governed by the Business Source License # included in the file licenses/BSL.txt. diff --git a/.github/workflows/lint-conversion.yml b/.github/workflows/lint-conversion.yml index 6b26d87fb..3f5451585 100644 --- a/.github/workflows/lint-conversion.yml +++ b/.github/workflows/lint-conversion.yml @@ -1,4 +1,4 @@ -# Copyright 2023 Daniel Sonck, Piotr Łoboda. +# Copyright 2023 Daniël Sonck, Piotr Łoboda. # # Use of this software is governed by the Business Source License # included in the file licenses/BSL.txt. diff --git a/.github/workflows/lint-idp.yml b/.github/workflows/lint-idp.yml index dae23b25b..3f4fe6ee8 100644 --- a/.github/workflows/lint-idp.yml +++ b/.github/workflows/lint-idp.yml @@ -1,4 +1,4 @@ -# Copyright 2023 Daniel Sonck, Piotr Łoboda. +# Copyright 2023 Daniël Sonck, Piotr Łoboda. # # Use of this software is governed by the Business Source License # included in the file licenses/BSL.txt. diff --git a/.github/workflows/lint-language.yml b/.github/workflows/lint-language.yml index e991b9677..df1ed5414 100644 --- a/.github/workflows/lint-language.yml +++ b/.github/workflows/lint-language.yml @@ -1,4 +1,4 @@ -# Copyright 2023 Daniel Sonck, Piotr Łoboda. +# Copyright 2023 Daniël Sonck, Piotr Łoboda. # # Use of this software is governed by the Business Source License # included in the file licenses/BSL.txt. diff --git a/.github/workflows/lint-mosaic.yml b/.github/workflows/lint-mosaic.yml index 632c341fd..d93bef8ca 100644 --- a/.github/workflows/lint-mosaic.yml +++ b/.github/workflows/lint-mosaic.yml @@ -1,4 +1,4 @@ -# Copyright 2023 Daniel Sonck, Piotr Łoboda. +# Copyright 2023 Daniël Sonck, Piotr Łoboda. # # Use of this software is governed by the Business Source License # included in the file licenses/BSL.txt. diff --git a/.github/workflows/lint-ui.yml b/.github/workflows/lint-ui.yml index 38245bbda..b7ee6ebf7 100644 --- a/.github/workflows/lint-ui.yml +++ b/.github/workflows/lint-ui.yml @@ -1,4 +1,4 @@ -# Copyright 2023 Daniel Sonck, Piotr Łoboda. +# Copyright 2023 Daniël Sonck, Piotr Łoboda. # # Use of this software is governed by the Business Source License # included in the file licenses/BSL.txt.