From 1b0bc521664664e4d8c69909872c09d7ad0d9544 Mon Sep 17 00:00:00 2001
From: Semyon Krestyaninov <krestyaninov@perx.ru>
Date: Thu, 17 Oct 2024 08:53:30 +0300
Subject: [PATCH] pkg extension moved from pkg
---
{pkg/extension => extension}/action.go | 0
{pkg/extension => extension}/action_handler.go | 0
{pkg/extension => extension}/action_handler_test.go | 0
{pkg/extension => extension}/action_test.go | 8 ++++----
{pkg/extension => extension}/action_url.go | 0
{pkg/extension => extension}/action_url_test.go | 0
{pkg/extension => extension}/client.go | 0
{pkg/extension => extension}/extension.go | 0
{pkg/extension => extension}/extension_test.go | 0
{pkg/extension => extension}/key.go | 0
{pkg/extension => extension}/manager.go | 0
{pkg/extension => extension}/manager_client.go | 0
.../middleware/access_logging_middleware.go | 4 ++--
.../middleware/error_logging_middleware.go | 4 ++--
{pkg/extension => extension}/middleware/middleware.go | 4 ++--
.../middleware/recovering_middleware.go | 4 ++--
.../middleware/telemetry_middleware.go | 4 ++--
{pkg/extension => extension}/mocks/Extension.go | 2 +-
{pkg/extension => extension}/mocks/Manager.go | 2 +-
{pkg/extension => extension}/mocks/Storage.go | 0
{pkg/extension => extension}/schema.go | 0
{pkg/extension => extension}/schema_test.go | 0
{pkg/extension => extension}/server.go | 0
{pkg/extension => extension}/server_test.go | 0
{pkg/extension => extension}/service/doc.go | 0
{pkg/extension => extension}/service/extension.go | 2 +-
{pkg/extension => extension}/service/extension_test.go | 2 +-
{pkg/extension => extension}/service/registrar.go | 2 +-
{pkg/extension => extension}/storage.go | 0
29 files changed, 19 insertions(+), 19 deletions(-)
rename {pkg/extension => extension}/action.go (100%)
rename {pkg/extension => extension}/action_handler.go (100%)
rename {pkg/extension => extension}/action_handler_test.go (100%)
rename {pkg/extension => extension}/action_test.go (99%)
rename {pkg/extension => extension}/action_url.go (100%)
rename {pkg/extension => extension}/action_url_test.go (100%)
rename {pkg/extension => extension}/client.go (100%)
rename {pkg/extension => extension}/extension.go (100%)
rename {pkg/extension => extension}/extension_test.go (100%)
rename {pkg/extension => extension}/key.go (100%)
rename {pkg/extension => extension}/manager.go (100%)
rename {pkg/extension => extension}/manager_client.go (100%)
rename {pkg/extension => extension}/middleware/access_logging_middleware.go (95%)
rename {pkg/extension => extension}/middleware/error_logging_middleware.go (93%)
rename {pkg/extension => extension}/middleware/middleware.go (73%)
rename {pkg/extension => extension}/middleware/recovering_middleware.go (94%)
rename {pkg/extension => extension}/middleware/telemetry_middleware.go (98%)
rename {pkg/extension => extension}/mocks/Extension.go (98%)
rename {pkg/extension => extension}/mocks/Manager.go (99%)
rename {pkg/extension => extension}/mocks/Storage.go (100%)
rename {pkg/extension => extension}/schema.go (100%)
rename {pkg/extension => extension}/schema_test.go (100%)
rename {pkg/extension => extension}/server.go (100%)
rename {pkg/extension => extension}/server_test.go (100%)
rename {pkg/extension => extension}/service/doc.go (100%)
rename {pkg/extension => extension}/service/extension.go (99%)
rename {pkg/extension => extension}/service/extension_test.go (98%)
rename {pkg/extension => extension}/service/registrar.go (98%)
rename {pkg/extension => extension}/storage.go (100%)
diff --git a/pkg/extension/action.go b/extension/action.go
similarity index 100%
rename from pkg/extension/action.go
rename to extension/action.go
diff --git a/pkg/extension/action_handler.go b/extension/action_handler.go
similarity index 100%
rename from pkg/extension/action_handler.go
rename to extension/action_handler.go
diff --git a/pkg/extension/action_handler_test.go b/extension/action_handler_test.go
similarity index 100%
rename from pkg/extension/action_handler_test.go
rename to extension/action_handler_test.go
diff --git a/pkg/extension/action_test.go b/extension/action_test.go
similarity index 99%
rename from pkg/extension/action_test.go
rename to extension/action_test.go
index d714a399..4f3a71ca 100644
--- a/pkg/extension/action_test.go
+++ b/extension/action_test.go
@@ -13,7 +13,7 @@ func TestActionToProto(t *testing.T) {
var pbAction *pb.Action
err := gofakeit.Struct(&pbAction)
require.NoError(t, err)
-
+
action := ActionFromPB(pbAction)
result := ActionToPB(action)
require.Equal(t, pbAction, result)
@@ -52,7 +52,7 @@ func TestActionRequestToProto(t *testing.T) {
var pbAction *pb.ActionRequest
err := gofakeit.Struct(&pbAction)
require.NoError(t, err)
-
+
action := ActionRequestFromPB(pbAction)
result := ActionRequestToPB(action)
require.Equal(t, pbAction, result)
@@ -71,12 +71,12 @@ func TestActionResponseToProto(t *testing.T) {
var pbAction *pb.ActionResponse
err := gofakeit.Struct(&pbAction)
require.NoError(t, err)
-
+
action := ActionResponseFromPB(pbAction)
result := ActionResponseToPB(action)
require.Equal(t, pbAction, result)
})
-
+
t.Run("Action is nil", func(t *testing.T) {
var pbAction *pb.ActionResponse
action := ActionResponseFromPB(pbAction)
diff --git a/pkg/extension/action_url.go b/extension/action_url.go
similarity index 100%
rename from pkg/extension/action_url.go
rename to extension/action_url.go
diff --git a/pkg/extension/action_url_test.go b/extension/action_url_test.go
similarity index 100%
rename from pkg/extension/action_url_test.go
rename to extension/action_url_test.go
diff --git a/pkg/extension/client.go b/extension/client.go
similarity index 100%
rename from pkg/extension/client.go
rename to extension/client.go
diff --git a/pkg/extension/extension.go b/extension/extension.go
similarity index 100%
rename from pkg/extension/extension.go
rename to extension/extension.go
diff --git a/pkg/extension/extension_test.go b/extension/extension_test.go
similarity index 100%
rename from pkg/extension/extension_test.go
rename to extension/extension_test.go
diff --git a/pkg/extension/key.go b/extension/key.go
similarity index 100%
rename from pkg/extension/key.go
rename to extension/key.go
diff --git a/pkg/extension/manager.go b/extension/manager.go
similarity index 100%
rename from pkg/extension/manager.go
rename to extension/manager.go
diff --git a/pkg/extension/manager_client.go b/extension/manager_client.go
similarity index 100%
rename from pkg/extension/manager_client.go
rename to extension/manager_client.go
diff --git a/pkg/extension/middleware/access_logging_middleware.go b/extension/middleware/access_logging_middleware.go
similarity index 95%
rename from pkg/extension/middleware/access_logging_middleware.go
rename to extension/middleware/access_logging_middleware.go
index 0fbd63de..4fdf8d3b 100644
--- a/pkg/extension/middleware/access_logging_middleware.go
+++ b/extension/middleware/access_logging_middleware.go
@@ -4,14 +4,14 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/extension -i Manager -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/extension -i Manager -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l ""
import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/extension"
"git.perx.ru/perxis/perxis-go/pkg/auth"
- "git.perx.ru/perxis/perxis-go/pkg/extension"
"go.uber.org/zap"
)
diff --git a/pkg/extension/middleware/error_logging_middleware.go b/extension/middleware/error_logging_middleware.go
similarity index 93%
rename from pkg/extension/middleware/error_logging_middleware.go
rename to extension/middleware/error_logging_middleware.go
index 47400379..d9dcfe79 100644
--- a/pkg/extension/middleware/error_logging_middleware.go
+++ b/extension/middleware/error_logging_middleware.go
@@ -4,12 +4,12 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/extension -i Manager -t ../../../assets/templates/middleware/error_log -o error_logging_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/extension -i Manager -t ../../../assets/templates/middleware/error_log -o error_logging_middleware.go -l ""
import (
"context"
- "git.perx.ru/perxis/perxis-go/pkg/extension"
+ "git.perx.ru/perxis/perxis-go/extension"
"go.uber.org/zap"
)
diff --git a/pkg/extension/middleware/middleware.go b/extension/middleware/middleware.go
similarity index 73%
rename from pkg/extension/middleware/middleware.go
rename to extension/middleware/middleware.go
index f308b6a1..c45e9e3f 100644
--- a/pkg/extension/middleware/middleware.go
+++ b/extension/middleware/middleware.go
@@ -4,10 +4,10 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/extension -i Manager -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/extension -i Manager -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l ""
import (
- "git.perx.ru/perxis/perxis-go/pkg/extension"
+ "git.perx.ru/perxis/perxis-go/extension"
"go.uber.org/zap"
)
diff --git a/pkg/extension/middleware/recovering_middleware.go b/extension/middleware/recovering_middleware.go
similarity index 94%
rename from pkg/extension/middleware/recovering_middleware.go
rename to extension/middleware/recovering_middleware.go
index 54b78da4..0bbe10a6 100644
--- a/pkg/extension/middleware/recovering_middleware.go
+++ b/extension/middleware/recovering_middleware.go
@@ -4,13 +4,13 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/extension -i Manager -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/extension -i Manager -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
import (
"context"
"fmt"
- "git.perx.ru/perxis/perxis-go/pkg/extension"
+ "git.perx.ru/perxis/perxis-go/extension"
"go.uber.org/zap"
)
diff --git a/pkg/extension/middleware/telemetry_middleware.go b/extension/middleware/telemetry_middleware.go
similarity index 98%
rename from pkg/extension/middleware/telemetry_middleware.go
rename to extension/middleware/telemetry_middleware.go
index 7302cab3..8cacfe26 100644
--- a/pkg/extension/middleware/telemetry_middleware.go
+++ b/extension/middleware/telemetry_middleware.go
@@ -4,15 +4,15 @@
package middleware
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/extension -i Manager -t ../../../assets/templates/middleware/telemetry_default -o telemetry_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/extension -i Manager -t ../../../assets/templates/middleware/telemetry_default -o telemetry_middleware.go -l ""
import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/extension"
oid "git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/auth"
- "git.perx.ru/perxis/perxis-go/pkg/extension"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
diff --git a/pkg/extension/mocks/Extension.go b/extension/mocks/Extension.go
similarity index 98%
rename from pkg/extension/mocks/Extension.go
rename to extension/mocks/Extension.go
index e5482a2d..ec2b6631 100644
--- a/pkg/extension/mocks/Extension.go
+++ b/extension/mocks/Extension.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- extension "git.perx.ru/perxis/perxis-go/pkg/extension"
+ extension "git.perx.ru/perxis/perxis-go/extension"
extensions "git.perx.ru/perxis/perxis-go/proto/extensions"
mock "github.com/stretchr/testify/mock"
diff --git a/pkg/extension/mocks/Manager.go b/extension/mocks/Manager.go
similarity index 99%
rename from pkg/extension/mocks/Manager.go
rename to extension/mocks/Manager.go
index 84fdb40c..95f33d7e 100644
--- a/pkg/extension/mocks/Manager.go
+++ b/extension/mocks/Manager.go
@@ -5,7 +5,7 @@ package mocks
import (
context "context"
- extension "git.perx.ru/perxis/perxis-go/pkg/extension"
+ extension "git.perx.ru/perxis/perxis-go/extension"
extensions "git.perx.ru/perxis/perxis-go/proto/extensions"
mock "github.com/stretchr/testify/mock"
diff --git a/pkg/extension/mocks/Storage.go b/extension/mocks/Storage.go
similarity index 100%
rename from pkg/extension/mocks/Storage.go
rename to extension/mocks/Storage.go
diff --git a/pkg/extension/schema.go b/extension/schema.go
similarity index 100%
rename from pkg/extension/schema.go
rename to extension/schema.go
diff --git a/pkg/extension/schema_test.go b/extension/schema_test.go
similarity index 100%
rename from pkg/extension/schema_test.go
rename to extension/schema_test.go
diff --git a/pkg/extension/server.go b/extension/server.go
similarity index 100%
rename from pkg/extension/server.go
rename to extension/server.go
diff --git a/pkg/extension/server_test.go b/extension/server_test.go
similarity index 100%
rename from pkg/extension/server_test.go
rename to extension/server_test.go
diff --git a/pkg/extension/service/doc.go b/extension/service/doc.go
similarity index 100%
rename from pkg/extension/service/doc.go
rename to extension/service/doc.go
diff --git a/pkg/extension/service/extension.go b/extension/service/extension.go
similarity index 99%
rename from pkg/extension/service/extension.go
rename to extension/service/extension.go
index 5d57e56c..5651f11b 100644
--- a/pkg/extension/service/extension.go
+++ b/extension/service/extension.go
@@ -4,10 +4,10 @@ import (
"context"
"fmt"
+ "git.perx.ru/perxis/perxis-go/extension"
"git.perx.ru/perxis/perxis-go/pkg/clients"
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/content"
- "git.perx.ru/perxis/perxis-go/pkg/extension"
"git.perx.ru/perxis/perxis-go/pkg/roles"
"git.perx.ru/perxis/perxis-go/pkg/setup"
"go.uber.org/zap"
diff --git a/pkg/extension/service/extension_test.go b/extension/service/extension_test.go
similarity index 98%
rename from pkg/extension/service/extension_test.go
rename to extension/service/extension_test.go
index d96712dd..138548f6 100644
--- a/pkg/extension/service/extension_test.go
+++ b/extension/service/extension_test.go
@@ -4,7 +4,7 @@ import (
"context"
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/extension"
+ "git.perx.ru/perxis/perxis-go/extension"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/extension/service/registrar.go b/extension/service/registrar.go
similarity index 98%
rename from pkg/extension/service/registrar.go
rename to extension/service/registrar.go
index 28da7d37..8a396832 100644
--- a/pkg/extension/service/registrar.go
+++ b/extension/service/registrar.go
@@ -4,8 +4,8 @@ import (
"context"
"time"
+ "git.perx.ru/perxis/perxis-go/extension"
"git.perx.ru/perxis/perxis-go/pkg/auth"
- "git.perx.ru/perxis/perxis-go/pkg/extension"
retry "github.com/avast/retry-go/v4"
"go.uber.org/zap"
)
diff --git a/pkg/extension/storage.go b/extension/storage.go
similarity index 100%
rename from pkg/extension/storage.go
rename to extension/storage.go
--
GitLab