Move presenters in their own subpackages for manager & publisher (#151)

teran · Aug 17, 2024 · 476640f · 476640f
1 parent 95aa76b
commit 476640f
Show file tree

Hide file tree

Showing 24 changed files with 10 additions and 10 deletions.
diff --git a/Dockerfile.publisher b/Dockerfile.publisher
@@ -7,7 +7,7 @@ FROM scratch
 
 COPY --from=certificates /etc/ssl/cert.pem /etc/ssl/cert.pem
 COPY --chmod=0755 --chown=root:root dist/archived-publisher_linux_amd64_v3/archived-publisher /archived-publisher
-COPY --chmod=0644 --chown=root:root presenter/publisher/html/templates /templates
+COPY --chmod=0644 --chown=root:root publisher/presenter/html/templates /templates
 
 ENV HTML_TEMPLATE_DIR=/templates
 ENV STATIC_DIR=/static

diff --git a/cli/service/pb_mock.go b/cli/service/pb_mock.go
@@ -3,7 +3,7 @@ package service
 import (
 	"context"
 
-	v1proto "github.com/teran/archived/presenter/manager/grpc/proto/v1"
+	v1proto "github.com/teran/archived/manager/presenter/grpc/proto/v1"
 	"github.com/teran/archived/repositories/blob/mock"
 	"google.golang.org/grpc"
 )

diff --git a/cli/service/service.go b/cli/service/service.go
@@ -18,7 +18,7 @@ import (
 
 	cache "github.com/teran/archived/cli/service/stat_cache"
 	"github.com/teran/archived/cli/yum"
-	v1proto "github.com/teran/archived/presenter/manager/grpc/proto/v1"
+	v1proto "github.com/teran/archived/manager/presenter/grpc/proto/v1"
 )
 
 type Service interface {

diff --git a/cmd/cli/main.go b/cmd/cli/main.go
@@ -18,7 +18,7 @@ import (
 	"github.com/teran/archived/cli/router"
 	"github.com/teran/archived/cli/service"
 	"github.com/teran/archived/cli/service/stat_cache/local"
-	v1proto "github.com/teran/archived/presenter/manager/grpc/proto/v1"
+	v1proto "github.com/teran/archived/manager/presenter/grpc/proto/v1"
 )
 
 var (

diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -24,7 +24,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	grpcManagePresenter "github.com/teran/archived/presenter/manager/grpc"
+	grpcManagePresenter "github.com/teran/archived/manager/presenter/grpc"
 	awsBlobRepo "github.com/teran/archived/repositories/blob/aws"
 	"github.com/teran/archived/repositories/metadata/postgresql"
 	"github.com/teran/archived/service"

diff --git a/cmd/publisher/main.go b/cmd/publisher/main.go
@@ -20,7 +20,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"golang.org/x/sync/errgroup"
 
-	htmlPresenter "github.com/teran/archived/presenter/publisher/html"
+	htmlPresenter "github.com/teran/archived/publisher/presenter/html"
 	awsBlobRepo "github.com/teran/archived/repositories/blob/aws"
 	"github.com/teran/archived/repositories/cache/metadata/memcache"
 	"github.com/teran/archived/repositories/metadata/postgresql"

diff --git a/presenter/manager/grpc/handlers.go → manager/presenter/grpc/handlers.go b/presenter/manager/grpc/handlers.go → manager/presenter/grpc/handlers.go
@@ -7,7 +7,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	v1 "github.com/teran/archived/presenter/manager/grpc/proto/v1"
+	v1 "github.com/teran/archived/manager/presenter/grpc/proto/v1"
 	"github.com/teran/archived/service"
 	ptr "github.com/teran/go-ptr"
 )

diff --git a/presenter/manager/grpc/handlers_test.go → manager/presenter/grpc/handlers_test.go b/presenter/manager/grpc/handlers_test.go → manager/presenter/grpc/handlers_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/stretchr/testify/suite"
 	grpctest "github.com/teran/go-grpctest"
 
+	v1pb "github.com/teran/archived/manager/presenter/grpc/proto/v1"
 	"github.com/teran/archived/models"
-	v1pb "github.com/teran/archived/presenter/manager/grpc/proto/v1"
 	"github.com/teran/archived/service"
 )
 

diff --git a/...enter/manager/grpc/proto/v1/manager.proto → ...ger/presenter/grpc/proto/v1/manager.proto b/...enter/manager/grpc/proto/v1/manager.proto → ...ger/presenter/grpc/proto/v1/manager.proto
@@ -1,8 +1,8 @@
 syntax = "proto3";
 
-package presenter.manager.grpc.proto.v1;
+package manager.presenter.grpc.proto.v1;
 
-option go_package = "github.com/teran/archived/presenter/manager/grpc/proto/v1";
+option go_package = "github.com/teran/archived/manager/presenter/grpc/proto/v1";
 
 message CreateContainerRequest {
   string name = 1;

diff --git a/presenter/manager/grpc/proto/v1/proto.go → manager/presenter/grpc/proto/v1/proto.go b/presenter/manager/grpc/proto/v1/proto.go → manager/presenter/grpc/proto/v1/proto.go
diff --git a/presenter/publisher/html/handlers.go → publisher/presenter/html/handlers.go b/presenter/publisher/html/handlers.go → publisher/presenter/html/handlers.go
diff --git a/presenter/publisher/html/handlers_test.go → publisher/presenter/html/handlers_test.go b/presenter/publisher/html/handlers_test.go → publisher/presenter/html/handlers_test.go
diff --git a/presenter/publisher/html/renderer.go → publisher/presenter/html/renderer.go b/presenter/publisher/html/renderer.go → publisher/presenter/html/renderer.go
diff --git a/presenter/publisher/html/templates/404.html → publisher/presenter/html/templates/404.html b/presenter/publisher/html/templates/404.html → publisher/presenter/html/templates/404.html
diff --git a/presenter/publisher/html/templates/5xx.html → publisher/presenter/html/templates/5xx.html b/presenter/publisher/html/templates/5xx.html → publisher/presenter/html/templates/5xx.html
diff --git a/...ter/publisher/html/templates/_common.html → ...her/presenter/html/templates/_common.html b/...ter/publisher/html/templates/_common.html → ...her/presenter/html/templates/_common.html
diff --git a/...lisher/html/templates/container-list.html → ...senter/html/templates/container-list.html b/...lisher/html/templates/container-list.html → ...senter/html/templates/container-list.html
diff --git a/...publisher/html/templates/object-list.html → ...presenter/html/templates/object-list.html b/...publisher/html/templates/object-list.html → ...presenter/html/templates/object-list.html
diff --git a/...ublisher/html/templates/version-list.html → ...resenter/html/templates/version-list.html b/...ublisher/html/templates/version-list.html → ...resenter/html/templates/version-list.html
diff --git a/...r/publisher/html/testdata/404.html.sample → ...r/presenter/html/testdata/404.html.sample b/...r/publisher/html/testdata/404.html.sample → ...r/presenter/html/testdata/404.html.sample
diff --git a/...r/publisher/html/testdata/5xx.html.sample → ...r/presenter/html/testdata/5xx.html.sample b/...r/publisher/html/testdata/5xx.html.sample → ...r/presenter/html/testdata/5xx.html.sample
diff --git a/...publisher/html/testdata/index.html.sample → ...presenter/html/testdata/index.html.sample b/...publisher/html/testdata/index.html.sample → ...presenter/html/testdata/index.html.sample
diff --git a/...blisher/html/testdata/objects.html.sample → ...esenter/html/testdata/objects.html.sample b/...blisher/html/testdata/objects.html.sample → ...esenter/html/testdata/objects.html.sample
diff --git a/...lisher/html/testdata/versions.html.sample → ...senter/html/testdata/versions.html.sample b/...lisher/html/testdata/versions.html.sample → ...senter/html/testdata/versions.html.sample