From ee3716623c07a6419338e6484982b4fd617fd8d2 Mon Sep 17 00:00:00 2001 From: b1ackd0t <28790446+rodneyosodo@users.noreply.github.com> Date: Fri, 28 Jun 2024 13:45:20 +0300 Subject: [PATCH] MG-1557 - Export `jaeger`, `metrics`, `postgres` and `apiutil` packages (#2262) Signed-off-by: Rodney Osodo <28790446+rodneyosodo@users.noreply.github.com> Signed-off-by: Rodney Osodo Signed-off-by: rodneyosodo --- auth/api/grpc/endpoint_test.go | 2 +- auth/api/grpc/requests.go | 2 +- auth/api/grpc/server.go | 2 +- auth/api/http/domains/decode.go | 2 +- auth/api/http/domains/endpoint.go | 2 +- auth/api/http/domains/endpoint_test.go | 2 +- auth/api/http/domains/requests.go | 2 +- auth/api/http/domains/transport.go | 2 +- auth/api/http/keys/endpoint_test.go | 2 +- auth/api/http/keys/requests.go | 2 +- auth/api/http/keys/requests_test.go | 2 +- auth/api/http/keys/transport.go | 2 +- auth/postgres/domains.go | 4 +- auth/postgres/key.go | 2 +- auth/postgres/setup_test.go | 4 +- bootstrap/api/endpoint.go | 2 +- bootstrap/api/endpoint_test.go | 2 +- bootstrap/api/requests.go | 2 +- bootstrap/api/requests_test.go | 2 +- bootstrap/api/transport.go | 2 +- bootstrap/postgres/configs.go | 2 +- bootstrap/postgres/setup_test.go | 2 +- certs/api/endpoint.go | 2 +- certs/api/endpoint_test.go | 2 +- certs/api/requests.go | 2 +- certs/api/transport.go | 2 +- certs/postgres/certs.go | 2 +- certs/postgres/setup_test.go | 2 +- cmd/auth/main.go | 22 +++++------ cmd/bootstrap/main.go | 16 ++++---- cmd/cassandra-reader/main.go | 10 ++--- cmd/cassandra-writer/main.go | 12 +++--- cmd/certs/main.go | 16 ++++---- cmd/coap/main.go | 16 ++++---- cmd/http/main.go | 12 +++--- cmd/influxdb-reader/main.go | 10 ++--- cmd/influxdb-writer/main.go | 8 ++-- cmd/invitations/main.go | 16 ++++---- cmd/journal/main.go | 16 ++++---- cmd/lora/main.go | 12 +++--- cmd/mongodb-reader/main.go | 10 ++--- cmd/mongodb-writer/main.go | 12 +++--- cmd/mqtt/main.go | 4 +- cmd/opcua/main.go | 12 +++--- cmd/postgres-reader/main.go | 12 +++--- cmd/postgres-writer/main.go | 14 +++---- cmd/provision/main.go | 6 +-- cmd/smpp-notifier/main.go | 14 +++---- cmd/smtp-notifier/main.go | 14 +++---- cmd/things/main.go | 22 +++++------ cmd/timescale-reader/main.go | 12 +++--- cmd/timescale-writer/main.go | 14 +++---- cmd/twins/main.go | 12 +++--- cmd/users/main.go | 18 ++++----- cmd/ws/main.go | 12 +++--- consumers/messages.go | 2 +- consumers/notifiers/api/endpoint.go | 2 +- consumers/notifiers/api/endpoint_test.go | 2 +- consumers/notifiers/api/requests.go | 2 +- consumers/notifiers/api/transport.go | 2 +- consumers/notifiers/postgres/setup_test.go | 2 +- consumers/notifiers/service.go | 7 +++- consumers/tracing/consumers.go | 2 +- consumers/writers/postgres/setup_test.go | 2 +- consumers/writers/timescale/setup_test.go | 2 +- http/api/endpoint.go | 2 +- http/api/endpoint_test.go | 2 +- http/api/request.go | 2 +- http/api/transport.go | 2 +- http/handler.go | 2 +- internal/api/common.go | 2 +- internal/api/common_test.go | 2 +- internal/groups/api/decode.go | 2 +- internal/groups/api/decode_test.go | 2 +- internal/groups/api/endpoint_test.go | 2 +- internal/groups/api/endpoints.go | 2 +- internal/groups/api/requests.go | 2 +- internal/groups/api/requests_test.go | 2 +- internal/groups/postgres/groups.go | 2 +- internal/groups/postgres/setup_test.go | 4 +- internal/groups/service.go | 2 +- internal/groups/service_test.go | 2 +- invitations/api/endpoint.go | 2 +- invitations/api/endpoint_test.go | 2 +- invitations/api/requests.go | 2 +- invitations/api/requests_test.go | 2 +- invitations/api/transport.go | 2 +- invitations/invitations.go | 2 +- invitations/invitations_test.go | 2 +- invitations/postgres/invitations.go | 2 +- invitations/postgres/setup_test.go | 4 +- invitations/service_test.go | 2 +- invitations/state.go | 2 +- invitations/state_test.go | 2 +- journal/api/endpoint.go | 2 +- journal/api/endpoint_test.go | 2 +- journal/api/requests.go | 2 +- journal/api/requests_test.go | 2 +- journal/api/transport.go | 2 +- journal/journal.go | 2 +- journal/journal_test.go | 2 +- journal/postgres/journal.go | 2 +- journal/postgres/setup_test.go | 9 ++--- mqtt/tracing/forwarder.go | 2 +- opcua/api/endpoint.go | 2 +- opcua/api/requests.go | 2 +- opcua/api/transport.go | 2 +- {internal => pkg}/apiutil/errors.go | 0 {internal => pkg}/apiutil/responses.go | 0 {internal => pkg}/apiutil/token.go | 0 {internal => pkg}/apiutil/token_test.go | 2 +- {internal => pkg}/apiutil/transport.go | 0 {internal => pkg}/apiutil/transport_test.go | 2 +- pkg/auth/client_test.go | 8 ++-- pkg/clients/postgres/clients.go | 2 +- pkg/clients/postgres/clients_test.go | 2 +- pkg/clients/postgres/setup_test.go | 4 +- pkg/clients/roles.go | 2 +- pkg/clients/roles_test.go | 2 +- {internal/clients => pkg}/jaeger/doc.go | 2 +- {internal/clients => pkg}/jaeger/provider.go | 2 + pkg/messaging/brokers/tracing/brokers_nats.go | 2 +- .../brokers/tracing/brokers_rabbitmq.go | 2 +- pkg/messaging/nats/tracing/publisher.go | 2 +- pkg/messaging/nats/tracing/pubsub.go | 2 +- pkg/messaging/rabbitmq/tracing/publisher.go | 2 +- pkg/messaging/rabbitmq/tracing/pubsub.go | 2 +- pkg/messaging/tracing/tracing.go | 2 +- {internal => pkg}/postgres/common.go | 15 ++++++++ {internal/clients => pkg}/postgres/doc.go | 0 {internal => pkg}/postgres/errors.go | 2 + .../clients => pkg}/postgres/postgres.go | 11 +++++- {internal => pkg}/postgres/tracing.go | 5 +-- pkg/prometheus/doc.go | 6 +++ {internal => pkg/prometheus}/metrics.go | 7 +++- pkg/sdk/go/bootstrap.go | 2 +- pkg/sdk/go/bootstrap_test.go | 2 +- pkg/sdk/go/certs.go | 2 +- pkg/sdk/go/certs_test.go | 2 +- pkg/sdk/go/channels_test.go | 2 +- pkg/sdk/go/consumers_test.go | 2 +- pkg/sdk/go/groups.go | 2 +- pkg/sdk/go/groups_test.go | 2 +- pkg/sdk/go/journal.go | 2 +- pkg/sdk/go/message.go | 2 +- pkg/sdk/go/message_test.go | 2 +- pkg/sdk/go/things_test.go | 2 +- pkg/sdk/go/tokens_test.go | 2 +- pkg/sdk/go/users_test.go | 2 +- {internal => pkg}/server/coap/coap.go | 34 ++++++----------- {internal => pkg}/server/coap/doc.go | 0 {internal => pkg}/server/doc.go | 1 - {internal => pkg}/server/grpc/doc.go | 0 {internal => pkg}/server/grpc/grpc.go | 30 ++++++--------- {internal => pkg}/server/http/doc.go | 0 {internal => pkg}/server/http/http.go | 38 ++++++++----------- {internal => pkg}/server/server.go | 23 ++++++++++- provision/api/endpoint.go | 2 +- provision/api/endpoint_test.go | 2 +- provision/api/requests.go | 2 +- provision/api/requests_test.go | 2 +- provision/api/transport.go | 2 +- readers/api/endpoint.go | 2 +- readers/api/endpoint_test.go | 2 +- readers/api/requests.go | 2 +- readers/api/transport.go | 2 +- things/api/grpc/endpoint_test.go | 2 +- things/api/grpc/server.go | 2 +- things/api/http/channels.go | 2 +- things/api/http/clients.go | 2 +- things/api/http/endpoints.go | 2 +- things/api/http/endpoints_test.go | 2 +- things/api/http/requests.go | 2 +- things/api/http/requests_test.go | 2 +- things/postgres/clients.go | 2 +- things/postgres/setup_test.go | 4 +- twins/api/http/endpoint.go | 2 +- twins/api/http/endpoint_twins_test.go | 2 +- twins/api/http/requests.go | 2 +- twins/api/http/transport.go | 2 +- users/api/clients.go | 2 +- users/api/endpoint_test.go | 2 +- users/api/endpoints.go | 2 +- users/api/groups.go | 2 +- users/api/requests.go | 2 +- users/api/requests_test.go | 2 +- users/postgres/clients.go | 2 +- users/postgres/setup_test.go | 4 +- 188 files changed, 437 insertions(+), 405 deletions(-) rename {internal => pkg}/apiutil/errors.go (100%) rename {internal => pkg}/apiutil/responses.go (100%) rename {internal => pkg}/apiutil/token.go (100%) rename {internal => pkg}/apiutil/token_test.go (97%) rename {internal => pkg}/apiutil/transport.go (100%) rename {internal => pkg}/apiutil/transport_test.go (99%) rename {internal/clients => pkg}/jaeger/doc.go (79%) rename {internal/clients => pkg}/jaeger/provider.go (93%) rename {internal => pkg}/postgres/common.go (70%) rename {internal/clients => pkg}/postgres/doc.go (100%) rename {internal => pkg}/postgres/errors.go (90%) rename {internal/clients => pkg}/postgres/postgres.go (87%) rename {internal => pkg}/postgres/tracing.go (96%) create mode 100644 pkg/prometheus/doc.go rename {internal => pkg/prometheus}/metrics.go (79%) rename {internal => pkg}/server/coap/coap.go (56%) rename {internal => pkg}/server/coap/doc.go (100%) rename {internal => pkg}/server/doc.go (99%) rename {internal => pkg}/server/grpc/doc.go (100%) rename {internal => pkg}/server/grpc/grpc.go (84%) rename {internal => pkg}/server/http/doc.go (100%) rename {internal => pkg}/server/http/http.go (60%) rename {internal => pkg}/server/server.go (69%) diff --git a/auth/api/grpc/endpoint_test.go b/auth/api/grpc/endpoint_test.go index aff4f0bcf..541f34a0e 100644 --- a/auth/api/grpc/endpoint_test.go +++ b/auth/api/grpc/endpoint_test.go @@ -13,8 +13,8 @@ import ( "github.com/absmach/magistrala" "github.com/absmach/magistrala/auth" grpcapi "github.com/absmach/magistrala/auth/api/grpc" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/internal/testsutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" "github.com/stretchr/testify/assert" diff --git a/auth/api/grpc/requests.go b/auth/api/grpc/requests.go index ab6fd6e28..cc21348f7 100644 --- a/auth/api/grpc/requests.go +++ b/auth/api/grpc/requests.go @@ -5,7 +5,7 @@ package grpc import ( "github.com/absmach/magistrala/auth" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" ) type identityReq struct { diff --git a/auth/api/grpc/server.go b/auth/api/grpc/server.go index 1c23473f2..21e703d41 100644 --- a/auth/api/grpc/server.go +++ b/auth/api/grpc/server.go @@ -8,7 +8,7 @@ import ( "github.com/absmach/magistrala" "github.com/absmach/magistrala/auth" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" kitgrpc "github.com/go-kit/kit/transport/grpc" diff --git a/auth/api/http/domains/decode.go b/auth/api/http/domains/decode.go index 249d1709a..929a15235 100644 --- a/auth/api/http/domains/decode.go +++ b/auth/api/http/domains/decode.go @@ -11,7 +11,7 @@ import ( "github.com/absmach/magistrala/auth" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" "github.com/go-chi/chi/v5" ) diff --git a/auth/api/http/domains/endpoint.go b/auth/api/http/domains/endpoint.go index 40a07960d..3dddb92d7 100644 --- a/auth/api/http/domains/endpoint.go +++ b/auth/api/http/domains/endpoint.go @@ -7,7 +7,7 @@ import ( "context" "github.com/absmach/magistrala/auth" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" "github.com/go-kit/kit/endpoint" diff --git a/auth/api/http/domains/endpoint_test.go b/auth/api/http/domains/endpoint_test.go index f3d596f23..0a17b8d3c 100644 --- a/auth/api/http/domains/endpoint_test.go +++ b/auth/api/http/domains/endpoint_test.go @@ -16,9 +16,9 @@ import ( "github.com/absmach/magistrala/auth" httpapi "github.com/absmach/magistrala/auth/api/http/domains" "github.com/absmach/magistrala/auth/mocks" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/internal/testsutil" mglog "github.com/absmach/magistrala/logger" + "github.com/absmach/magistrala/pkg/apiutil" mgclients "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" diff --git a/auth/api/http/domains/requests.go b/auth/api/http/domains/requests.go index 88b8894db..6a23c6e71 100644 --- a/auth/api/http/domains/requests.go +++ b/auth/api/http/domains/requests.go @@ -5,7 +5,7 @@ package domains import ( "github.com/absmach/magistrala/auth" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" ) type page struct { diff --git a/auth/api/http/domains/transport.go b/auth/api/http/domains/transport.go index caacb74db..9d78698d3 100644 --- a/auth/api/http/domains/transport.go +++ b/auth/api/http/domains/transport.go @@ -8,7 +8,7 @@ import ( "github.com/absmach/magistrala/auth" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/go-chi/chi/v5" kithttp "github.com/go-kit/kit/transport/http" "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" diff --git a/auth/api/http/keys/endpoint_test.go b/auth/api/http/keys/endpoint_test.go index a1f4fe448..f200f9f5e 100644 --- a/auth/api/http/keys/endpoint_test.go +++ b/auth/api/http/keys/endpoint_test.go @@ -18,8 +18,8 @@ import ( httpapi "github.com/absmach/magistrala/auth/api/http" "github.com/absmach/magistrala/auth/jwt" "github.com/absmach/magistrala/auth/mocks" - "github.com/absmach/magistrala/internal/apiutil" mglog "github.com/absmach/magistrala/logger" + "github.com/absmach/magistrala/pkg/apiutil" svcerr "github.com/absmach/magistrala/pkg/errors/service" "github.com/absmach/magistrala/pkg/uuid" "github.com/stretchr/testify/assert" diff --git a/auth/api/http/keys/requests.go b/auth/api/http/keys/requests.go index a9954a735..53542c60e 100644 --- a/auth/api/http/keys/requests.go +++ b/auth/api/http/keys/requests.go @@ -7,7 +7,7 @@ import ( "time" "github.com/absmach/magistrala/auth" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" ) type issueKeyReq struct { diff --git a/auth/api/http/keys/requests_test.go b/auth/api/http/keys/requests_test.go index 7ab8ae704..6172f2434 100644 --- a/auth/api/http/keys/requests_test.go +++ b/auth/api/http/keys/requests_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/absmach/magistrala/auth" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/stretchr/testify/assert" ) diff --git a/auth/api/http/keys/transport.go b/auth/api/http/keys/transport.go index c66c15c0e..9554df3ba 100644 --- a/auth/api/http/keys/transport.go +++ b/auth/api/http/keys/transport.go @@ -12,7 +12,7 @@ import ( "github.com/absmach/magistrala/auth" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" "github.com/go-chi/chi/v5" kithttp "github.com/go-kit/kit/transport/http" diff --git a/auth/postgres/domains.go b/auth/postgres/domains.go index 9952492e3..118163ae8 100644 --- a/auth/postgres/domains.go +++ b/auth/postgres/domains.go @@ -12,11 +12,11 @@ import ( "time" "github.com/absmach/magistrala/auth" - "github.com/absmach/magistrala/internal/apiutil" - "github.com/absmach/magistrala/internal/postgres" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" repoerr "github.com/absmach/magistrala/pkg/errors/repository" + "github.com/absmach/magistrala/pkg/postgres" "github.com/jackc/pgtype" "github.com/jmoiron/sqlx" ) diff --git a/auth/postgres/key.go b/auth/postgres/key.go index 0f45df5cd..8a638b29a 100644 --- a/auth/postgres/key.go +++ b/auth/postgres/key.go @@ -9,9 +9,9 @@ import ( "time" "github.com/absmach/magistrala/auth" - "github.com/absmach/magistrala/internal/postgres" "github.com/absmach/magistrala/pkg/errors" repoerr "github.com/absmach/magistrala/pkg/errors/repository" + "github.com/absmach/magistrala/pkg/postgres" ) var ( diff --git a/auth/postgres/setup_test.go b/auth/postgres/setup_test.go index d0a279552..89a6b2136 100644 --- a/auth/postgres/setup_test.go +++ b/auth/postgres/setup_test.go @@ -14,8 +14,8 @@ import ( "time" apostgres "github.com/absmach/magistrala/auth/postgres" - pgclient "github.com/absmach/magistrala/internal/clients/postgres" - "github.com/absmach/magistrala/internal/postgres" + "github.com/absmach/magistrala/pkg/postgres" + pgclient "github.com/absmach/magistrala/pkg/postgres" "github.com/jmoiron/sqlx" dockertest "github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3/docker" diff --git a/bootstrap/api/endpoint.go b/bootstrap/api/endpoint.go index 0217d339b..e36394e8b 100644 --- a/bootstrap/api/endpoint.go +++ b/bootstrap/api/endpoint.go @@ -7,7 +7,7 @@ import ( "context" "github.com/absmach/magistrala/bootstrap" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" "github.com/go-kit/kit/endpoint" ) diff --git a/bootstrap/api/endpoint_test.go b/bootstrap/api/endpoint_test.go index 36e331ab0..30200d421 100644 --- a/bootstrap/api/endpoint_test.go +++ b/bootstrap/api/endpoint_test.go @@ -21,9 +21,9 @@ import ( "github.com/absmach/magistrala/bootstrap" bsapi "github.com/absmach/magistrala/bootstrap/api" "github.com/absmach/magistrala/bootstrap/mocks" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/internal/testsutil" mglog "github.com/absmach/magistrala/logger" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" "github.com/stretchr/testify/assert" diff --git a/bootstrap/api/requests.go b/bootstrap/api/requests.go index 1a8b975b2..0600e0455 100644 --- a/bootstrap/api/requests.go +++ b/bootstrap/api/requests.go @@ -5,7 +5,7 @@ package api import ( "github.com/absmach/magistrala/bootstrap" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" ) const maxLimitSize = 100 diff --git a/bootstrap/api/requests_test.go b/bootstrap/api/requests_test.go index 3d8691510..babbb3d1c 100644 --- a/bootstrap/api/requests_test.go +++ b/bootstrap/api/requests_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/absmach/magistrala/bootstrap" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/stretchr/testify/assert" ) diff --git a/bootstrap/api/transport.go b/bootstrap/api/transport.go index a8346162c..2d593bfbc 100644 --- a/bootstrap/api/transport.go +++ b/bootstrap/api/transport.go @@ -14,7 +14,7 @@ import ( "github.com/absmach/magistrala" "github.com/absmach/magistrala/bootstrap" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" "github.com/go-chi/chi/v5" kithttp "github.com/go-kit/kit/transport/http" diff --git a/bootstrap/postgres/configs.go b/bootstrap/postgres/configs.go index 1221ff54e..528f5f545 100644 --- a/bootstrap/postgres/configs.go +++ b/bootstrap/postgres/configs.go @@ -13,10 +13,10 @@ import ( "time" "github.com/absmach/magistrala/bootstrap" - "github.com/absmach/magistrala/internal/postgres" "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" repoerr "github.com/absmach/magistrala/pkg/errors/repository" + "github.com/absmach/magistrala/pkg/postgres" "github.com/jackc/pgerrcode" "github.com/jackc/pgtype" "github.com/jackc/pgx/v5/pgconn" diff --git a/bootstrap/postgres/setup_test.go b/bootstrap/postgres/setup_test.go index e993546ec..3848cd499 100644 --- a/bootstrap/postgres/setup_test.go +++ b/bootstrap/postgres/setup_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/absmach/magistrala/bootstrap/postgres" - pgclient "github.com/absmach/magistrala/internal/clients/postgres" mglog "github.com/absmach/magistrala/logger" + pgclient "github.com/absmach/magistrala/pkg/postgres" "github.com/jmoiron/sqlx" "github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3/docker" diff --git a/certs/api/endpoint.go b/certs/api/endpoint.go index e9e62d98b..fea0c63a3 100644 --- a/certs/api/endpoint.go +++ b/certs/api/endpoint.go @@ -7,7 +7,7 @@ import ( "context" "github.com/absmach/magistrala/certs" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" "github.com/go-kit/kit/endpoint" ) diff --git a/certs/api/endpoint_test.go b/certs/api/endpoint_test.go index 7edc9c973..386c547d4 100644 --- a/certs/api/endpoint_test.go +++ b/certs/api/endpoint_test.go @@ -16,9 +16,9 @@ import ( "github.com/absmach/magistrala/certs" httpapi "github.com/absmach/magistrala/certs/api" "github.com/absmach/magistrala/certs/mocks" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/internal/testsutil" mglog "github.com/absmach/magistrala/logger" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" "github.com/stretchr/testify/assert" diff --git a/certs/api/requests.go b/certs/api/requests.go index 2ac619e40..78ac21d3a 100644 --- a/certs/api/requests.go +++ b/certs/api/requests.go @@ -6,7 +6,7 @@ package api import ( "time" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" ) const maxLimitSize = 100 diff --git a/certs/api/transport.go b/certs/api/transport.go index 012582592..d07bef577 100644 --- a/certs/api/transport.go +++ b/certs/api/transport.go @@ -12,7 +12,7 @@ import ( "github.com/absmach/magistrala" "github.com/absmach/magistrala/certs" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" "github.com/go-chi/chi/v5" kithttp "github.com/go-kit/kit/transport/http" diff --git a/certs/postgres/certs.go b/certs/postgres/certs.go index 429f1d81c..8f581ea8d 100644 --- a/certs/postgres/certs.go +++ b/certs/postgres/certs.go @@ -11,9 +11,9 @@ import ( "time" "github.com/absmach/magistrala/certs" - "github.com/absmach/magistrala/internal/postgres" "github.com/absmach/magistrala/pkg/errors" repoerr "github.com/absmach/magistrala/pkg/errors/repository" + "github.com/absmach/magistrala/pkg/postgres" "github.com/jackc/pgerrcode" "github.com/jackc/pgx/v5/pgconn" "github.com/jmoiron/sqlx" diff --git a/certs/postgres/setup_test.go b/certs/postgres/setup_test.go index 961b126d0..1281e0834 100644 --- a/certs/postgres/setup_test.go +++ b/certs/postgres/setup_test.go @@ -11,8 +11,8 @@ import ( "testing" "github.com/absmach/magistrala/certs/postgres" - pgclient "github.com/absmach/magistrala/internal/clients/postgres" mglog "github.com/absmach/magistrala/logger" + pgclient "github.com/absmach/magistrala/pkg/postgres" "github.com/jmoiron/sqlx" "github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3/docker" diff --git a/cmd/auth/main.go b/cmd/auth/main.go index 97786975e..1a3ae89aa 100644 --- a/cmd/auth/main.go +++ b/cmd/auth/main.go @@ -23,14 +23,14 @@ import ( apostgres "github.com/absmach/magistrala/auth/postgres" "github.com/absmach/magistrala/auth/spicedb" "github.com/absmach/magistrala/auth/tracing" - "github.com/absmach/magistrala/internal" - jaegerclient "github.com/absmach/magistrala/internal/clients/jaeger" - pgclient "github.com/absmach/magistrala/internal/clients/postgres" - "github.com/absmach/magistrala/internal/postgres" - "github.com/absmach/magistrala/internal/server" - grpcserver "github.com/absmach/magistrala/internal/server/grpc" - httpserver "github.com/absmach/magistrala/internal/server/http" mglog "github.com/absmach/magistrala/logger" + "github.com/absmach/magistrala/pkg/jaeger" + "github.com/absmach/magistrala/pkg/postgres" + pgclient "github.com/absmach/magistrala/pkg/postgres" + "github.com/absmach/magistrala/pkg/prometheus" + "github.com/absmach/magistrala/pkg/server" + grpcserver "github.com/absmach/magistrala/pkg/server/grpc" + httpserver "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/uuid" v1 "github.com/authzed/authzed-go/proto/authzed/api/v1" "github.com/authzed/authzed-go/v1" @@ -109,7 +109,7 @@ func main() { } defer db.Close() - tp, err := jaegerclient.NewProvider(ctx, svcName, cfg.JaegerURL, cfg.InstanceID, cfg.TraceRatio) + tp, err := jaeger.NewProvider(ctx, svcName, cfg.JaegerURL, cfg.InstanceID, cfg.TraceRatio) if err != nil { logger.Error(fmt.Sprintf("failed to init Jaeger: %s", err)) exitCode = 1 @@ -137,7 +137,7 @@ func main() { exitCode = 1 return } - hs := httpserver.New(ctx, cancel, svcName, httpServerConfig, httpapi.MakeHandler(svc, logger, cfg.InstanceID), logger) + hs := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, httpapi.MakeHandler(svc, logger, cfg.InstanceID), logger) grpcServerConfig := server.Config{Port: defSvcGRPCPort} if err := env.ParseWithOptions(&grpcServerConfig, env.Options{Prefix: envPrefixGrpc}); err != nil { @@ -150,7 +150,7 @@ func main() { magistrala.RegisterAuthServiceServer(srv, grpcapi.NewServer(svc)) } - gs := grpcserver.New(ctx, cancel, svcName, grpcServerConfig, registerAuthServiceServer, logger) + gs := grpcserver.NewServer(ctx, cancel, svcName, grpcServerConfig, registerAuthServiceServer, logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, cancel) @@ -219,7 +219,7 @@ func newService(ctx context.Context, db *sqlx.DB, tracer trace.Tracer, cfg confi return nil } svc = api.LoggingMiddleware(svc, logger) - counter, latency := internal.MakeMetrics("groups", "api") + counter, latency := prometheus.MakeMetrics("groups", "api") svc = api.MetricsMiddleware(svc, counter, latency) svc = tracing.New(svc, tracer) diff --git a/cmd/bootstrap/main.go b/cmd/bootstrap/main.go index 479febc70..ca0cee2b7 100644 --- a/cmd/bootstrap/main.go +++ b/cmd/bootstrap/main.go @@ -20,17 +20,17 @@ import ( "github.com/absmach/magistrala/bootstrap/events/producer" bootstrappg "github.com/absmach/magistrala/bootstrap/postgres" "github.com/absmach/magistrala/bootstrap/tracing" - "github.com/absmach/magistrala/internal" - "github.com/absmach/magistrala/internal/clients/jaeger" - pgclient "github.com/absmach/magistrala/internal/clients/postgres" - "github.com/absmach/magistrala/internal/postgres" - "github.com/absmach/magistrala/internal/server" - httpserver "github.com/absmach/magistrala/internal/server/http" mglog "github.com/absmach/magistrala/logger" "github.com/absmach/magistrala/pkg/auth" "github.com/absmach/magistrala/pkg/events" "github.com/absmach/magistrala/pkg/events/store" + "github.com/absmach/magistrala/pkg/jaeger" + "github.com/absmach/magistrala/pkg/postgres" + pgclient "github.com/absmach/magistrala/pkg/postgres" + "github.com/absmach/magistrala/pkg/prometheus" mgsdk "github.com/absmach/magistrala/pkg/sdk/go" + "github.com/absmach/magistrala/pkg/server" + httpserver "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/uuid" "github.com/caarlos0/env/v10" "github.com/jmoiron/sqlx" @@ -151,7 +151,7 @@ func main() { exitCode = 1 return } - hs := httpserver.New(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svc, bootstrap.NewConfigReader([]byte(cfg.EncKey)), logger, cfg.InstanceID), logger) + hs := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svc, bootstrap.NewConfigReader([]byte(cfg.EncKey)), logger, cfg.InstanceID), logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, cancel) @@ -192,7 +192,7 @@ func newService(ctx context.Context, authClient magistrala.AuthServiceClient, db svc = producer.NewEventStoreMiddleware(svc, publisher) svc = api.LoggingMiddleware(svc, logger) - counter, latency := internal.MakeMetrics(svcName, "api") + counter, latency := prometheus.MakeMetrics(svcName, "api") svc = api.MetricsMiddleware(svc, counter, latency) svc = tracing.New(svc, tracer) diff --git a/cmd/cassandra-reader/main.go b/cmd/cassandra-reader/main.go index af5914ad1..8a9ad1487 100644 --- a/cmd/cassandra-reader/main.go +++ b/cmd/cassandra-reader/main.go @@ -13,12 +13,12 @@ import ( chclient "github.com/absmach/callhome/pkg/client" "github.com/absmach/magistrala" - "github.com/absmach/magistrala/internal" cassandraclient "github.com/absmach/magistrala/internal/clients/cassandra" - "github.com/absmach/magistrala/internal/server" - httpserver "github.com/absmach/magistrala/internal/server/http" mglog "github.com/absmach/magistrala/logger" "github.com/absmach/magistrala/pkg/auth" + "github.com/absmach/magistrala/pkg/prometheus" + "github.com/absmach/magistrala/pkg/server" + httpserver "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/uuid" "github.com/absmach/magistrala/readers" "github.com/absmach/magistrala/readers/api" @@ -122,7 +122,7 @@ func main() { exitCode = 1 return } - hs := httpserver.New(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(repo, ac, tc, svcName, cfg.InstanceID), logger) + hs := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(repo, ac, tc, svcName, cfg.InstanceID), logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, cancel) @@ -146,7 +146,7 @@ func main() { func newService(csdSession *gocql.Session, logger *slog.Logger) readers.MessageRepository { repo := cassandra.New(csdSession) repo = api.LoggingMiddleware(repo, logger) - counter, latency := internal.MakeMetrics("cassandra", "message_reader") + counter, latency := prometheus.MakeMetrics("cassandra", "message_reader") repo = api.MetricsMiddleware(repo, counter, latency) return repo } diff --git a/cmd/cassandra-writer/main.go b/cmd/cassandra-writer/main.go index 20ad38f85..cb007ec90 100644 --- a/cmd/cassandra-writer/main.go +++ b/cmd/cassandra-writer/main.go @@ -18,14 +18,14 @@ import ( consumertracing "github.com/absmach/magistrala/consumers/tracing" "github.com/absmach/magistrala/consumers/writers/api" "github.com/absmach/magistrala/consumers/writers/cassandra" - "github.com/absmach/magistrala/internal" cassandraclient "github.com/absmach/magistrala/internal/clients/cassandra" - jaegerclient "github.com/absmach/magistrala/internal/clients/jaeger" - "github.com/absmach/magistrala/internal/server" - httpserver "github.com/absmach/magistrala/internal/server/http" mglog "github.com/absmach/magistrala/logger" + jaegerclient "github.com/absmach/magistrala/pkg/jaeger" "github.com/absmach/magistrala/pkg/messaging/brokers" brokerstracing "github.com/absmach/magistrala/pkg/messaging/brokers/tracing" + "github.com/absmach/magistrala/pkg/prometheus" + "github.com/absmach/magistrala/pkg/server" + httpserver "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/uuid" "github.com/caarlos0/env/v10" "github.com/gocql/gocql" @@ -125,7 +125,7 @@ func main() { return } - hs := httpserver.New(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svcName, cfg.InstanceID), logger) + hs := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svcName, cfg.InstanceID), logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, cancel) @@ -149,7 +149,7 @@ func main() { func newService(session *gocql.Session, logger *slog.Logger) consumers.BlockingConsumer { repo := cassandra.New(session) repo = api.LoggingMiddleware(repo, logger) - counter, latency := internal.MakeMetrics("cassandra", "message_writer") + counter, latency := prometheus.MakeMetrics("cassandra", "message_writer") repo = api.MetricsMiddleware(repo, counter, latency) return repo } diff --git a/cmd/certs/main.go b/cmd/certs/main.go index a92035ee5..a0c32e74a 100644 --- a/cmd/certs/main.go +++ b/cmd/certs/main.go @@ -19,15 +19,15 @@ import ( vault "github.com/absmach/magistrala/certs/pki" certspg "github.com/absmach/magistrala/certs/postgres" "github.com/absmach/magistrala/certs/tracing" - "github.com/absmach/magistrala/internal" - jaegerclient "github.com/absmach/magistrala/internal/clients/jaeger" - pgclient "github.com/absmach/magistrala/internal/clients/postgres" - "github.com/absmach/magistrala/internal/postgres" - "github.com/absmach/magistrala/internal/server" - httpserver "github.com/absmach/magistrala/internal/server/http" mglog "github.com/absmach/magistrala/logger" "github.com/absmach/magistrala/pkg/auth" + jaegerclient "github.com/absmach/magistrala/pkg/jaeger" + "github.com/absmach/magistrala/pkg/postgres" + pgclient "github.com/absmach/magistrala/pkg/postgres" + "github.com/absmach/magistrala/pkg/prometheus" mgsdk "github.com/absmach/magistrala/pkg/sdk/go" + "github.com/absmach/magistrala/pkg/server" + httpserver "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/uuid" "github.com/caarlos0/env/v10" "github.com/jmoiron/sqlx" @@ -157,7 +157,7 @@ func main() { exitCode = 1 return } - hs := httpserver.New(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svc, logger, cfg.InstanceID), logger) + hs := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svc, logger, cfg.InstanceID), logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, cancel) @@ -186,7 +186,7 @@ func newService(authClient magistrala.AuthServiceClient, db *sqlx.DB, tracer tra sdk := mgsdk.NewSDK(config) svc := certs.New(authClient, certsRepo, sdk, pkiAgent) svc = api.LoggingMiddleware(svc, logger) - counter, latency := internal.MakeMetrics(svcName, "api") + counter, latency := prometheus.MakeMetrics(svcName, "api") svc = api.MetricsMiddleware(svc, counter, latency) svc = tracing.New(svc, tracer) diff --git a/cmd/coap/main.go b/cmd/coap/main.go index 43671edef..89bd8d5c6 100644 --- a/cmd/coap/main.go +++ b/cmd/coap/main.go @@ -16,15 +16,15 @@ import ( "github.com/absmach/magistrala/coap" "github.com/absmach/magistrala/coap/api" "github.com/absmach/magistrala/coap/tracing" - "github.com/absmach/magistrala/internal" - jaegerclient "github.com/absmach/magistrala/internal/clients/jaeger" - "github.com/absmach/magistrala/internal/server" - coapserver "github.com/absmach/magistrala/internal/server/coap" - httpserver "github.com/absmach/magistrala/internal/server/http" mglog "github.com/absmach/magistrala/logger" "github.com/absmach/magistrala/pkg/auth" + jaegerclient "github.com/absmach/magistrala/pkg/jaeger" "github.com/absmach/magistrala/pkg/messaging/brokers" brokerstracing "github.com/absmach/magistrala/pkg/messaging/brokers/tracing" + "github.com/absmach/magistrala/pkg/prometheus" + "github.com/absmach/magistrala/pkg/server" + coapserver "github.com/absmach/magistrala/pkg/server/coap" + httpserver "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/uuid" "github.com/caarlos0/env/v10" "golang.org/x/sync/errgroup" @@ -132,12 +132,12 @@ func main() { svc = api.LoggingMiddleware(svc, logger) - counter, latency := internal.MakeMetrics(svcName, "api") + counter, latency := prometheus.MakeMetrics(svcName, "api") svc = api.MetricsMiddleware(svc, counter, latency) - hs := httpserver.New(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(cfg.InstanceID), logger) + hs := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(cfg.InstanceID), logger) - cs := coapserver.New(ctx, cancel, svcName, coapServerConfig, api.MakeCoAPHandler(svc, logger), logger) + cs := coapserver.NewServer(ctx, cancel, svcName, coapServerConfig, api.MakeCoAPHandler(svc, logger), logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, cancel) diff --git a/cmd/http/main.go b/cmd/http/main.go index 653909bc3..6aa97e9ce 100644 --- a/cmd/http/main.go +++ b/cmd/http/main.go @@ -18,16 +18,16 @@ import ( "github.com/absmach/magistrala" adapter "github.com/absmach/magistrala/http" "github.com/absmach/magistrala/http/api" - "github.com/absmach/magistrala/internal" - jaegerclient "github.com/absmach/magistrala/internal/clients/jaeger" - "github.com/absmach/magistrala/internal/server" - httpserver "github.com/absmach/magistrala/internal/server/http" mglog "github.com/absmach/magistrala/logger" "github.com/absmach/magistrala/pkg/auth" + jaegerclient "github.com/absmach/magistrala/pkg/jaeger" "github.com/absmach/magistrala/pkg/messaging" "github.com/absmach/magistrala/pkg/messaging/brokers" brokerstracing "github.com/absmach/magistrala/pkg/messaging/brokers/tracing" "github.com/absmach/magistrala/pkg/messaging/handler" + "github.com/absmach/magistrala/pkg/prometheus" + "github.com/absmach/magistrala/pkg/server" + httpserver "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/uuid" "github.com/absmach/mproxy" mproxyhttp "github.com/absmach/mproxy/pkg/http" @@ -129,7 +129,7 @@ func main() { svc := newService(pub, authClient, logger, tracer) targetServerCfg := server.Config{Port: targetHTTPPort} - hs := httpserver.New(ctx, cancel, svcName, targetServerCfg, api.MakeHandler(logger, cfg.InstanceID), logger) + hs := httpserver.NewServer(ctx, cancel, svcName, targetServerCfg, api.MakeHandler(logger, cfg.InstanceID), logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, cancel) @@ -157,7 +157,7 @@ func newService(pub messaging.Publisher, tc magistrala.AuthzServiceClient, logge svc := adapter.NewHandler(pub, logger, tc) svc = handler.NewTracing(tracer, svc) svc = handler.LoggingMiddleware(svc, logger) - counter, latency := internal.MakeMetrics(svcName, "api") + counter, latency := prometheus.MakeMetrics(svcName, "api") svc = handler.MetricsMiddleware(svc, counter, latency) return svc } diff --git a/cmd/influxdb-reader/main.go b/cmd/influxdb-reader/main.go index 2e273802a..af693cfc5 100644 --- a/cmd/influxdb-reader/main.go +++ b/cmd/influxdb-reader/main.go @@ -13,12 +13,12 @@ import ( chclient "github.com/absmach/callhome/pkg/client" "github.com/absmach/magistrala" - "github.com/absmach/magistrala/internal" influxdbclient "github.com/absmach/magistrala/internal/clients/influxdb" - "github.com/absmach/magistrala/internal/server" - httpserver "github.com/absmach/magistrala/internal/server/http" mglog "github.com/absmach/magistrala/logger" "github.com/absmach/magistrala/pkg/auth" + "github.com/absmach/magistrala/pkg/prometheus" + "github.com/absmach/magistrala/pkg/server" + httpserver "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/uuid" "github.com/absmach/magistrala/readers" "github.com/absmach/magistrala/readers/api" @@ -131,7 +131,7 @@ func main() { exitCode = 1 return } - hs := httpserver.New(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(repo, ac, tc, svcName, cfg.InstanceID), logger) + hs := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(repo, ac, tc, svcName, cfg.InstanceID), logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, cancel) @@ -154,7 +154,7 @@ func main() { func newService(client influxdb2.Client, repocfg influxdb.RepoConfig, logger *slog.Logger) readers.MessageRepository { repo := influxdb.New(client, repocfg) repo = api.LoggingMiddleware(repo, logger) - counter, latency := internal.MakeMetrics("influxdb", "message_reader") + counter, latency := prometheus.MakeMetrics("influxdb", "message_reader") repo = api.MetricsMiddleware(repo, counter, latency) return repo diff --git a/cmd/influxdb-writer/main.go b/cmd/influxdb-writer/main.go index 5e2606430..56509b908 100644 --- a/cmd/influxdb-writer/main.go +++ b/cmd/influxdb-writer/main.go @@ -19,12 +19,12 @@ import ( "github.com/absmach/magistrala/consumers/writers/api" "github.com/absmach/magistrala/consumers/writers/influxdb" influxdbclient "github.com/absmach/magistrala/internal/clients/influxdb" - "github.com/absmach/magistrala/internal/clients/jaeger" - "github.com/absmach/magistrala/internal/server" - httpserver "github.com/absmach/magistrala/internal/server/http" mglog "github.com/absmach/magistrala/logger" + "github.com/absmach/magistrala/pkg/jaeger" "github.com/absmach/magistrala/pkg/messaging/brokers" brokerstracing "github.com/absmach/magistrala/pkg/messaging/brokers/tracing" + "github.com/absmach/magistrala/pkg/server" + httpserver "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/uuid" "github.com/caarlos0/env/v10" "golang.org/x/sync/errgroup" @@ -140,7 +140,7 @@ func main() { return } - hs := httpserver.New(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svcName, cfg.InstanceID), logger) + hs := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svcName, cfg.InstanceID), logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, cancel) diff --git a/cmd/invitations/main.go b/cmd/invitations/main.go index 412c34c4e..b89fb3c8e 100644 --- a/cmd/invitations/main.go +++ b/cmd/invitations/main.go @@ -14,19 +14,19 @@ import ( chclient "github.com/absmach/callhome/pkg/client" "github.com/absmach/magistrala" - "github.com/absmach/magistrala/internal" - "github.com/absmach/magistrala/internal/clients/jaeger" - clientspg "github.com/absmach/magistrala/internal/clients/postgres" - "github.com/absmach/magistrala/internal/postgres" - "github.com/absmach/magistrala/internal/server" - "github.com/absmach/magistrala/internal/server/http" "github.com/absmach/magistrala/invitations" "github.com/absmach/magistrala/invitations/api" "github.com/absmach/magistrala/invitations/middleware" invitationspg "github.com/absmach/magistrala/invitations/postgres" mglog "github.com/absmach/magistrala/logger" "github.com/absmach/magistrala/pkg/auth" + "github.com/absmach/magistrala/pkg/jaeger" + "github.com/absmach/magistrala/pkg/postgres" + clientspg "github.com/absmach/magistrala/pkg/postgres" + "github.com/absmach/magistrala/pkg/prometheus" mgsdk "github.com/absmach/magistrala/pkg/sdk/go" + "github.com/absmach/magistrala/pkg/server" + "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/uuid" "github.com/caarlos0/env/v10" "github.com/jmoiron/sqlx" @@ -134,7 +134,7 @@ func main() { return } - httpSvr := http.New(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svc, logger, cfg.InstanceID), logger) + httpSvr := http.NewServer(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svc, logger, cfg.InstanceID), logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, cancel) @@ -167,7 +167,7 @@ func newService(db *sqlx.DB, dbConfig clientspg.Config, authClient magistrala.Au svc := invitations.NewService(repo, authClient, sdk) svc = middleware.Tracing(svc, tracer) svc = middleware.Logging(logger, svc) - counter, latency := internal.MakeMetrics(svcName, "api") + counter, latency := prometheus.MakeMetrics(svcName, "api") svc = middleware.Metrics(counter, latency, svc) return svc, nil diff --git a/cmd/journal/main.go b/cmd/journal/main.go index 1ed0f44d0..3e05b96c1 100644 --- a/cmd/journal/main.go +++ b/cmd/journal/main.go @@ -14,12 +14,6 @@ import ( chclient "github.com/absmach/callhome/pkg/client" "github.com/absmach/magistrala" - "github.com/absmach/magistrala/internal" - jaegerclient "github.com/absmach/magistrala/internal/clients/jaeger" - pgclient "github.com/absmach/magistrala/internal/clients/postgres" - "github.com/absmach/magistrala/internal/postgres" - "github.com/absmach/magistrala/internal/server" - httpserver "github.com/absmach/magistrala/internal/server/http" "github.com/absmach/magistrala/journal" "github.com/absmach/magistrala/journal/api" "github.com/absmach/magistrala/journal/events" @@ -28,6 +22,12 @@ import ( mglog "github.com/absmach/magistrala/logger" "github.com/absmach/magistrala/pkg/auth" "github.com/absmach/magistrala/pkg/events/store" + jaegerclient "github.com/absmach/magistrala/pkg/jaeger" + "github.com/absmach/magistrala/pkg/postgres" + pgclient "github.com/absmach/magistrala/pkg/postgres" + "github.com/absmach/magistrala/pkg/prometheus" + "github.com/absmach/magistrala/pkg/server" + "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/uuid" "github.com/caarlos0/env/v10" "github.com/jmoiron/sqlx" @@ -146,7 +146,7 @@ func main() { return } - hs := httpserver.New(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svc, logger, svcName, cfg.InstanceID), logger) + hs := http.NewServer(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svc, logger, svcName, cfg.InstanceID), logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, cancel) @@ -173,7 +173,7 @@ func newService(db *sqlx.DB, dbConfig pgclient.Config, authClient magistrala.Aut svc := journal.NewService(idp, repo, authClient) svc = middleware.LoggingMiddleware(svc, logger) - counter, latency := internal.MakeMetrics("journal", "journal_writer") + counter, latency := prometheus.MakeMetrics("journal", "journal_writer") svc = middleware.MetricsMiddleware(svc, counter, latency) svc = middleware.Tracing(svc, tracer) diff --git a/cmd/lora/main.go b/cmd/lora/main.go index 78105c3e2..d3da1f2ee 100644 --- a/cmd/lora/main.go +++ b/cmd/lora/main.go @@ -15,11 +15,7 @@ import ( chclient "github.com/absmach/callhome/pkg/client" "github.com/absmach/magistrala" - "github.com/absmach/magistrala/internal" - "github.com/absmach/magistrala/internal/clients/jaeger" redisclient "github.com/absmach/magistrala/internal/clients/redis" - "github.com/absmach/magistrala/internal/server" - httpserver "github.com/absmach/magistrala/internal/server/http" mglog "github.com/absmach/magistrala/logger" "github.com/absmach/magistrala/lora" "github.com/absmach/magistrala/lora/api" @@ -27,9 +23,13 @@ import ( "github.com/absmach/magistrala/lora/mqtt" "github.com/absmach/magistrala/pkg/events" "github.com/absmach/magistrala/pkg/events/store" + "github.com/absmach/magistrala/pkg/jaeger" "github.com/absmach/magistrala/pkg/messaging" "github.com/absmach/magistrala/pkg/messaging/brokers" brokerstracing "github.com/absmach/magistrala/pkg/messaging/brokers/tracing" + "github.com/absmach/magistrala/pkg/prometheus" + "github.com/absmach/magistrala/pkg/server" + httpserver "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/uuid" "github.com/caarlos0/env/v10" mqttpaho "github.com/eclipse/paho.mqtt.golang" @@ -150,7 +150,7 @@ func main() { logger.Info("Subscribed to Event Store") - hs := httpserver.New(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(cfg.InstanceID), logger) + hs := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(cfg.InstanceID), logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, cancel) @@ -226,7 +226,7 @@ func newService(pub messaging.Publisher, rmConn *redis.Client, thingsRMPrefix, c svc := lora.New(pub, thingsRM, chansRM, connsRM) svc = api.LoggingMiddleware(svc, logger) - counter, latency := internal.MakeMetrics("lora_adapter", "api") + counter, latency := prometheus.MakeMetrics("lora_adapter", "api") svc = api.MetricsMiddleware(svc, counter, latency) return svc diff --git a/cmd/mongodb-reader/main.go b/cmd/mongodb-reader/main.go index 7c82ffe2d..8d6e112e9 100644 --- a/cmd/mongodb-reader/main.go +++ b/cmd/mongodb-reader/main.go @@ -13,12 +13,12 @@ import ( chclient "github.com/absmach/callhome/pkg/client" "github.com/absmach/magistrala" - "github.com/absmach/magistrala/internal" mongoclient "github.com/absmach/magistrala/internal/clients/mongo" - "github.com/absmach/magistrala/internal/server" - httpserver "github.com/absmach/magistrala/internal/server/http" mglog "github.com/absmach/magistrala/logger" "github.com/absmach/magistrala/pkg/auth" + "github.com/absmach/magistrala/pkg/prometheus" + "github.com/absmach/magistrala/pkg/server" + httpserver "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/uuid" "github.com/absmach/magistrala/readers" "github.com/absmach/magistrala/readers/api" @@ -117,7 +117,7 @@ func main() { exitCode = 1 return } - hs := httpserver.New(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(repo, ac, tc, svcName, cfg.InstanceID), logger) + hs := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(repo, ac, tc, svcName, cfg.InstanceID), logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, cancel) @@ -140,7 +140,7 @@ func main() { func newService(db *mongo.Database, logger *slog.Logger) readers.MessageRepository { repo := mongodb.New(db) repo = api.LoggingMiddleware(repo, logger) - counter, latency := internal.MakeMetrics("mongodb", "message_reader") + counter, latency := prometheus.MakeMetrics("mongodb", "message_reader") repo = api.MetricsMiddleware(repo, counter, latency) return repo diff --git a/cmd/mongodb-writer/main.go b/cmd/mongodb-writer/main.go index cec6e8d43..caf49d5ce 100644 --- a/cmd/mongodb-writer/main.go +++ b/cmd/mongodb-writer/main.go @@ -18,14 +18,14 @@ import ( consumertracing "github.com/absmach/magistrala/consumers/tracing" "github.com/absmach/magistrala/consumers/writers/api" "github.com/absmach/magistrala/consumers/writers/mongodb" - "github.com/absmach/magistrala/internal" - jaegerclient "github.com/absmach/magistrala/internal/clients/jaeger" mongoclient "github.com/absmach/magistrala/internal/clients/mongo" - "github.com/absmach/magistrala/internal/server" - httpserver "github.com/absmach/magistrala/internal/server/http" mglog "github.com/absmach/magistrala/logger" + jaegerclient "github.com/absmach/magistrala/pkg/jaeger" "github.com/absmach/magistrala/pkg/messaging/brokers" brokerstracing "github.com/absmach/magistrala/pkg/messaging/brokers/tracing" + "github.com/absmach/magistrala/pkg/prometheus" + "github.com/absmach/magistrala/pkg/server" + httpserver "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/uuid" "github.com/caarlos0/env/v10" "go.mongodb.org/mongo-driver/mongo" @@ -119,7 +119,7 @@ func main() { return } - hs := httpserver.New(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svcName, cfg.InstanceID), logger) + hs := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svcName, cfg.InstanceID), logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, cancel) @@ -142,7 +142,7 @@ func main() { func newService(db *mongo.Database, logger *slog.Logger) consumers.BlockingConsumer { repo := mongodb.New(db) repo = api.LoggingMiddleware(repo, logger) - counter, latency := internal.MakeMetrics("mongodb", "message_writer") + counter, latency := prometheus.MakeMetrics("mongodb", "message_writer") repo = api.MetricsMiddleware(repo, counter, latency) return repo } diff --git a/cmd/mqtt/main.go b/cmd/mqtt/main.go index 4ecd25799..4574de0bb 100644 --- a/cmd/mqtt/main.go +++ b/cmd/mqtt/main.go @@ -19,18 +19,18 @@ import ( chclient "github.com/absmach/callhome/pkg/client" "github.com/absmach/magistrala" - jaegerclient "github.com/absmach/magistrala/internal/clients/jaeger" - "github.com/absmach/magistrala/internal/server" mglog "github.com/absmach/magistrala/logger" "github.com/absmach/magistrala/mqtt" "github.com/absmach/magistrala/mqtt/events" mqtttracing "github.com/absmach/magistrala/mqtt/tracing" "github.com/absmach/magistrala/pkg/auth" "github.com/absmach/magistrala/pkg/errors" + jaegerclient "github.com/absmach/magistrala/pkg/jaeger" "github.com/absmach/magistrala/pkg/messaging/brokers" brokerstracing "github.com/absmach/magistrala/pkg/messaging/brokers/tracing" "github.com/absmach/magistrala/pkg/messaging/handler" mqttpub "github.com/absmach/magistrala/pkg/messaging/mqtt" + "github.com/absmach/magistrala/pkg/server" "github.com/absmach/magistrala/pkg/uuid" "github.com/absmach/mproxy" mproxymqtt "github.com/absmach/mproxy/pkg/mqtt" diff --git a/cmd/opcua/main.go b/cmd/opcua/main.go index 54607d0dd..060ffe560 100644 --- a/cmd/opcua/main.go +++ b/cmd/opcua/main.go @@ -14,11 +14,7 @@ import ( chclient "github.com/absmach/callhome/pkg/client" "github.com/absmach/magistrala" - "github.com/absmach/magistrala/internal" - jaegerclient "github.com/absmach/magistrala/internal/clients/jaeger" redisclient "github.com/absmach/magistrala/internal/clients/redis" - "github.com/absmach/magistrala/internal/server" - httpserver "github.com/absmach/magistrala/internal/server/http" mglog "github.com/absmach/magistrala/logger" "github.com/absmach/magistrala/opcua" "github.com/absmach/magistrala/opcua/api" @@ -27,8 +23,12 @@ import ( "github.com/absmach/magistrala/opcua/gopcua" "github.com/absmach/magistrala/pkg/events" "github.com/absmach/magistrala/pkg/events/store" + jaegerclient "github.com/absmach/magistrala/pkg/jaeger" "github.com/absmach/magistrala/pkg/messaging/brokers" brokerstracing "github.com/absmach/magistrala/pkg/messaging/brokers/tracing" + "github.com/absmach/magistrala/pkg/prometheus" + "github.com/absmach/magistrala/pkg/server" + httpserver "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/uuid" "github.com/caarlos0/env/v10" "github.com/go-redis/redis/v8" @@ -145,7 +145,7 @@ func main() { logger.Info("Subscribed to Event Store") - hs := httpserver.New(ctx, httpCancel, svcName, httpServerConfig, api.MakeHandler(svc, logger, cfg.InstanceID), logger) + hs := httpserver.NewServer(ctx, httpCancel, svcName, httpServerConfig, api.MakeHandler(svc, logger, cfg.InstanceID), logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, httpCancel) @@ -205,7 +205,7 @@ func newRouteMapRepositoy(client *redis.Client, prefix string, logger *slog.Logg func newService(sub opcua.Subscriber, browser opcua.Browser, thingRM, chanRM, connRM opcua.RouteMapRepository, opcuaConfig opcua.Config, logger *slog.Logger) opcua.Service { svc := opcua.New(sub, browser, thingRM, chanRM, connRM, opcuaConfig, logger) svc = api.LoggingMiddleware(svc, logger) - counter, latency := internal.MakeMetrics("opc_ua_adapter", "api") + counter, latency := prometheus.MakeMetrics("opc_ua_adapter", "api") svc = api.MetricsMiddleware(svc, counter, latency) return svc diff --git a/cmd/postgres-reader/main.go b/cmd/postgres-reader/main.go index 6175852b5..51ee881d7 100644 --- a/cmd/postgres-reader/main.go +++ b/cmd/postgres-reader/main.go @@ -13,12 +13,12 @@ import ( chclient "github.com/absmach/callhome/pkg/client" "github.com/absmach/magistrala" - "github.com/absmach/magistrala/internal" - pgclient "github.com/absmach/magistrala/internal/clients/postgres" - "github.com/absmach/magistrala/internal/server" - httpserver "github.com/absmach/magistrala/internal/server/http" mglog "github.com/absmach/magistrala/logger" "github.com/absmach/magistrala/pkg/auth" + pgclient "github.com/absmach/magistrala/pkg/postgres" + "github.com/absmach/magistrala/pkg/prometheus" + "github.com/absmach/magistrala/pkg/server" + httpserver "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/uuid" "github.com/absmach/magistrala/readers" "github.com/absmach/magistrala/readers/api" @@ -125,7 +125,7 @@ func main() { exitCode = 1 return } - hs := httpserver.New(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(repo, ac, tc, svcName, cfg.InstanceID), logger) + hs := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(repo, ac, tc, svcName, cfg.InstanceID), logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, cancel) @@ -148,7 +148,7 @@ func main() { func newService(db *sqlx.DB, logger *slog.Logger) readers.MessageRepository { svc := postgres.New(db) svc = api.LoggingMiddleware(svc, logger) - counter, latency := internal.MakeMetrics("postgres", "message_reader") + counter, latency := prometheus.MakeMetrics("postgres", "message_reader") svc = api.MetricsMiddleware(svc, counter, latency) return svc diff --git a/cmd/postgres-writer/main.go b/cmd/postgres-writer/main.go index bd3d624a8..388671916 100644 --- a/cmd/postgres-writer/main.go +++ b/cmd/postgres-writer/main.go @@ -18,14 +18,14 @@ import ( consumertracing "github.com/absmach/magistrala/consumers/tracing" "github.com/absmach/magistrala/consumers/writers/api" writerpg "github.com/absmach/magistrala/consumers/writers/postgres" - "github.com/absmach/magistrala/internal" - jaegerclient "github.com/absmach/magistrala/internal/clients/jaeger" - pgclient "github.com/absmach/magistrala/internal/clients/postgres" - "github.com/absmach/magistrala/internal/server" - httpserver "github.com/absmach/magistrala/internal/server/http" mglog "github.com/absmach/magistrala/logger" + jaegerclient "github.com/absmach/magistrala/pkg/jaeger" "github.com/absmach/magistrala/pkg/messaging/brokers" brokerstracing "github.com/absmach/magistrala/pkg/messaging/brokers/tracing" + pgclient "github.com/absmach/magistrala/pkg/postgres" + "github.com/absmach/magistrala/pkg/prometheus" + "github.com/absmach/magistrala/pkg/server" + httpserver "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/uuid" "github.com/caarlos0/env/v10" "github.com/jmoiron/sqlx" @@ -125,7 +125,7 @@ func main() { return } - hs := httpserver.New(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svcName, cfg.InstanceID), logger) + hs := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svcName, cfg.InstanceID), logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, cancel) @@ -148,7 +148,7 @@ func main() { func newService(db *sqlx.DB, logger *slog.Logger) consumers.BlockingConsumer { svc := writerpg.New(db) svc = api.LoggingMiddleware(svc, logger) - counter, latency := internal.MakeMetrics("postgres", "message_writer") + counter, latency := prometheus.MakeMetrics("postgres", "message_writer") svc = api.MetricsMiddleware(svc, counter, latency) return svc } diff --git a/cmd/provision/main.go b/cmd/provision/main.go index 90b1b7f47..6ff047757 100644 --- a/cmd/provision/main.go +++ b/cmd/provision/main.go @@ -14,13 +14,13 @@ import ( chclient "github.com/absmach/callhome/pkg/client" "github.com/absmach/magistrala" - "github.com/absmach/magistrala/internal/server" - httpserver "github.com/absmach/magistrala/internal/server/http" mglog "github.com/absmach/magistrala/logger" mgclients "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" mggroups "github.com/absmach/magistrala/pkg/groups" mgsdk "github.com/absmach/magistrala/pkg/sdk/go" + "github.com/absmach/magistrala/pkg/server" + httpserver "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/uuid" "github.com/absmach/magistrala/provision" "github.com/absmach/magistrala/provision/api" @@ -87,7 +87,7 @@ func main() { svc = api.NewLoggingMiddleware(svc, logger) httpServerConfig := server.Config{Host: "", Port: cfg.Server.HTTPPort, KeyFile: cfg.Server.ServerKey, CertFile: cfg.Server.ServerCert} - hs := httpserver.New(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svc, logger, cfg.InstanceID), logger) + hs := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svc, logger, cfg.InstanceID), logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, cancel) diff --git a/cmd/smpp-notifier/main.go b/cmd/smpp-notifier/main.go index 9a762d3d6..7b6eed138 100644 --- a/cmd/smpp-notifier/main.go +++ b/cmd/smpp-notifier/main.go @@ -20,15 +20,15 @@ import ( notifierpg "github.com/absmach/magistrala/consumers/notifiers/postgres" mgsmpp "github.com/absmach/magistrala/consumers/notifiers/smpp" "github.com/absmach/magistrala/consumers/notifiers/tracing" - "github.com/absmach/magistrala/internal" - jaegerclient "github.com/absmach/magistrala/internal/clients/jaeger" - pgclient "github.com/absmach/magistrala/internal/clients/postgres" - "github.com/absmach/magistrala/internal/server" - httpserver "github.com/absmach/magistrala/internal/server/http" mglog "github.com/absmach/magistrala/logger" "github.com/absmach/magistrala/pkg/auth" + jaegerclient "github.com/absmach/magistrala/pkg/jaeger" "github.com/absmach/magistrala/pkg/messaging/brokers" brokerstracing "github.com/absmach/magistrala/pkg/messaging/brokers/tracing" + pgclient "github.com/absmach/magistrala/pkg/postgres" + "github.com/absmach/magistrala/pkg/prometheus" + "github.com/absmach/magistrala/pkg/server" + httpserver "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/ulid" "github.com/absmach/magistrala/pkg/uuid" "github.com/caarlos0/env/v10" @@ -155,7 +155,7 @@ func main() { return } - hs := httpserver.New(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svc, logger, cfg.InstanceID), logger) + hs := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svc, logger, cfg.InstanceID), logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, cancel) @@ -182,7 +182,7 @@ func newService(db *sqlx.DB, tracer trace.Tracer, authClient magistrala.AuthServ notifier := mgsmpp.New(sc) svc := notifiers.New(authClient, repo, idp, notifier, c.From) svc = api.LoggingMiddleware(svc, logger) - counter, latency := internal.MakeMetrics("notifier", "smpp") + counter, latency := prometheus.MakeMetrics("notifier", "smpp") svc = api.MetricsMiddleware(svc, counter, latency) return svc diff --git a/cmd/smtp-notifier/main.go b/cmd/smtp-notifier/main.go index 07178bf19..e0a377efb 100644 --- a/cmd/smtp-notifier/main.go +++ b/cmd/smtp-notifier/main.go @@ -20,16 +20,16 @@ import ( notifierpg "github.com/absmach/magistrala/consumers/notifiers/postgres" "github.com/absmach/magistrala/consumers/notifiers/smtp" "github.com/absmach/magistrala/consumers/notifiers/tracing" - "github.com/absmach/magistrala/internal" - jaegerclient "github.com/absmach/magistrala/internal/clients/jaeger" - pgclient "github.com/absmach/magistrala/internal/clients/postgres" "github.com/absmach/magistrala/internal/email" - "github.com/absmach/magistrala/internal/server" - httpserver "github.com/absmach/magistrala/internal/server/http" mglog "github.com/absmach/magistrala/logger" "github.com/absmach/magistrala/pkg/auth" + jaegerclient "github.com/absmach/magistrala/pkg/jaeger" "github.com/absmach/magistrala/pkg/messaging/brokers" brokerstracing "github.com/absmach/magistrala/pkg/messaging/brokers/tracing" + pgclient "github.com/absmach/magistrala/pkg/postgres" + "github.com/absmach/magistrala/pkg/prometheus" + "github.com/absmach/magistrala/pkg/server" + httpserver "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/ulid" "github.com/absmach/magistrala/pkg/uuid" "github.com/caarlos0/env/v10" @@ -163,7 +163,7 @@ func main() { return } - hs := httpserver.New(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svc, logger, cfg.InstanceID), logger) + hs := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svc, logger, cfg.InstanceID), logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, cancel) @@ -196,7 +196,7 @@ func newService(db *sqlx.DB, tracer trace.Tracer, authClient magistrala.AuthServ notifier := smtp.New(agent) svc := notifiers.New(authClient, repo, idp, notifier, c.From) svc = api.LoggingMiddleware(svc, logger) - counter, latency := internal.MakeMetrics("notifier", "smtp") + counter, latency := prometheus.MakeMetrics("notifier", "smtp") svc = api.MetricsMiddleware(svc, counter, latency) return svc, nil diff --git a/cmd/things/main.go b/cmd/things/main.go index 1df5bc2b9..9e55a9b27 100644 --- a/cmd/things/main.go +++ b/cmd/things/main.go @@ -15,22 +15,22 @@ import ( chclient "github.com/absmach/callhome/pkg/client" "github.com/absmach/magistrala" - "github.com/absmach/magistrala/internal" - jaegerclient "github.com/absmach/magistrala/internal/clients/jaeger" - pgclient "github.com/absmach/magistrala/internal/clients/postgres" redisclient "github.com/absmach/magistrala/internal/clients/redis" mggroups "github.com/absmach/magistrala/internal/groups" gapi "github.com/absmach/magistrala/internal/groups/api" gevents "github.com/absmach/magistrala/internal/groups/events" gpostgres "github.com/absmach/magistrala/internal/groups/postgres" gtracing "github.com/absmach/magistrala/internal/groups/tracing" - "github.com/absmach/magistrala/internal/postgres" - "github.com/absmach/magistrala/internal/server" - grpcserver "github.com/absmach/magistrala/internal/server/grpc" - httpserver "github.com/absmach/magistrala/internal/server/http" mglog "github.com/absmach/magistrala/logger" "github.com/absmach/magistrala/pkg/auth" "github.com/absmach/magistrala/pkg/groups" + jaegerclient "github.com/absmach/magistrala/pkg/jaeger" + "github.com/absmach/magistrala/pkg/postgres" + pgclient "github.com/absmach/magistrala/pkg/postgres" + "github.com/absmach/magistrala/pkg/prometheus" + "github.com/absmach/magistrala/pkg/server" + grpcserver "github.com/absmach/magistrala/pkg/server/grpc" + httpserver "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/uuid" "github.com/absmach/magistrala/things" "github.com/absmach/magistrala/things/api" @@ -183,7 +183,7 @@ func main() { return } mux := chi.NewRouter() - httpSvc := httpserver.New(ctx, cancel, svcName, httpServerConfig, httpapi.MakeHandler(csvc, gsvc, mux, logger, cfg.InstanceID), logger) + httpSvc := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, httpapi.MakeHandler(csvc, gsvc, mux, logger, cfg.InstanceID), logger) grpcServerConfig := server.Config{Port: defSvcAuthGRPCPort} if err := env.ParseWithOptions(&grpcServerConfig, env.Options{Prefix: envPrefixGRPC}); err != nil { @@ -195,7 +195,7 @@ func main() { reflection.Register(srv) magistrala.RegisterAuthzServiceServer(srv, grpcapi.NewServer(csvc)) } - gs := grpcserver.New(ctx, cancel, svcName, grpcServerConfig, regiterAuthzServer, logger) + gs := grpcserver.NewServer(ctx, cancel, svcName, grpcServerConfig, regiterAuthzServer, logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, cancel) @@ -244,12 +244,12 @@ func newService(ctx context.Context, db *sqlx.DB, dbConfig pgclient.Config, auth csvc = ctracing.New(csvc, tracer) csvc = api.LoggingMiddleware(csvc, logger) - counter, latency := internal.MakeMetrics(svcName, "api") + counter, latency := prometheus.MakeMetrics(svcName, "api") csvc = api.MetricsMiddleware(csvc, counter, latency) gsvc = gtracing.New(gsvc, tracer) gsvc = gapi.LoggingMiddleware(gsvc, logger) - counter, latency = internal.MakeMetrics(fmt.Sprintf("%s_groups", svcName), "api") + counter, latency = prometheus.MakeMetrics(fmt.Sprintf("%s_groups", svcName), "api") gsvc = gapi.MetricsMiddleware(gsvc, counter, latency) return csvc, gsvc, err diff --git a/cmd/timescale-reader/main.go b/cmd/timescale-reader/main.go index 85b582bed..26761ad4e 100644 --- a/cmd/timescale-reader/main.go +++ b/cmd/timescale-reader/main.go @@ -13,12 +13,12 @@ import ( chclient "github.com/absmach/callhome/pkg/client" "github.com/absmach/magistrala" - "github.com/absmach/magistrala/internal" - pgclient "github.com/absmach/magistrala/internal/clients/postgres" - "github.com/absmach/magistrala/internal/server" - httpserver "github.com/absmach/magistrala/internal/server/http" mglog "github.com/absmach/magistrala/logger" "github.com/absmach/magistrala/pkg/auth" + pgclient "github.com/absmach/magistrala/pkg/postgres" + "github.com/absmach/magistrala/pkg/prometheus" + "github.com/absmach/magistrala/pkg/server" + httpserver "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/uuid" "github.com/absmach/magistrala/readers" "github.com/absmach/magistrala/readers/api" @@ -123,7 +123,7 @@ func main() { exitCode = 1 return } - hs := httpserver.New(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(repo, ac, tc, svcName, cfg.InstanceID), logger) + hs := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(repo, ac, tc, svcName, cfg.InstanceID), logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, cancel) @@ -146,7 +146,7 @@ func main() { func newService(db *sqlx.DB, logger *slog.Logger) readers.MessageRepository { svc := timescale.New(db) svc = api.LoggingMiddleware(svc, logger) - counter, latency := internal.MakeMetrics("timescale", "message_reader") + counter, latency := prometheus.MakeMetrics("timescale", "message_reader") svc = api.MetricsMiddleware(svc, counter, latency) return svc diff --git a/cmd/timescale-writer/main.go b/cmd/timescale-writer/main.go index c678819ed..9ada7a070 100644 --- a/cmd/timescale-writer/main.go +++ b/cmd/timescale-writer/main.go @@ -18,14 +18,14 @@ import ( consumertracing "github.com/absmach/magistrala/consumers/tracing" "github.com/absmach/magistrala/consumers/writers/api" "github.com/absmach/magistrala/consumers/writers/timescale" - "github.com/absmach/magistrala/internal" - jaegerclient "github.com/absmach/magistrala/internal/clients/jaeger" - pgclient "github.com/absmach/magistrala/internal/clients/postgres" - "github.com/absmach/magistrala/internal/server" - httpserver "github.com/absmach/magistrala/internal/server/http" mglog "github.com/absmach/magistrala/logger" + jaegerclient "github.com/absmach/magistrala/pkg/jaeger" "github.com/absmach/magistrala/pkg/messaging/brokers" brokerstracing "github.com/absmach/magistrala/pkg/messaging/brokers/tracing" + pgclient "github.com/absmach/magistrala/pkg/postgres" + "github.com/absmach/magistrala/pkg/prometheus" + "github.com/absmach/magistrala/pkg/server" + httpserver "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/uuid" "github.com/caarlos0/env/v10" "github.com/jmoiron/sqlx" @@ -127,7 +127,7 @@ func main() { return } - hs := httpserver.New(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svcName, cfg.InstanceID), logger) + hs := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, api.MakeHandler(svcName, cfg.InstanceID), logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, cancel) @@ -150,7 +150,7 @@ func main() { func newService(db *sqlx.DB, logger *slog.Logger) consumers.BlockingConsumer { svc := timescale.New(db) svc = api.LoggingMiddleware(svc, logger) - counter, latency := internal.MakeMetrics("timescale", "message_writer") + counter, latency := prometheus.MakeMetrics("timescale", "message_writer") svc = api.MetricsMiddleware(svc, counter, latency) return svc } diff --git a/cmd/twins/main.go b/cmd/twins/main.go index 2cc7046d8..8eb23936a 100644 --- a/cmd/twins/main.go +++ b/cmd/twins/main.go @@ -14,17 +14,17 @@ import ( chclient "github.com/absmach/callhome/pkg/client" "github.com/absmach/magistrala" - "github.com/absmach/magistrala/internal" - jaegerclient "github.com/absmach/magistrala/internal/clients/jaeger" mongoclient "github.com/absmach/magistrala/internal/clients/mongo" redisclient "github.com/absmach/magistrala/internal/clients/redis" - "github.com/absmach/magistrala/internal/server" - httpserver "github.com/absmach/magistrala/internal/server/http" mglog "github.com/absmach/magistrala/logger" "github.com/absmach/magistrala/pkg/auth" + jaegerclient "github.com/absmach/magistrala/pkg/jaeger" "github.com/absmach/magistrala/pkg/messaging" "github.com/absmach/magistrala/pkg/messaging/brokers" brokerstracing "github.com/absmach/magistrala/pkg/messaging/brokers/tracing" + "github.com/absmach/magistrala/pkg/prometheus" + "github.com/absmach/magistrala/pkg/server" + httpserver "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/uuid" localusers "github.com/absmach/magistrala/things/standalone" "github.com/absmach/magistrala/twins" @@ -161,7 +161,7 @@ func main() { return } - hs := httpserver.New(ctx, cancel, svcName, httpServerConfig, twapi.MakeHandler(svc, logger, cfg.InstanceID), logger) + hs := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, twapi.MakeHandler(svc, logger, cfg.InstanceID), logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, cancel) @@ -201,7 +201,7 @@ func newService(ctx context.Context, id string, ps messaging.PubSub, cfg config, } svc = api.LoggingMiddleware(svc, logger) - counter, latency := internal.MakeMetrics(svcName, "api") + counter, latency := prometheus.MakeMetrics(svcName, "api") svc = api.MetricsMiddleware(svc, counter, latency) subCfg := messaging.SubscriberConfig{ diff --git a/cmd/users/main.go b/cmd/users/main.go index f1a94f7e3..5c692743a 100644 --- a/cmd/users/main.go +++ b/cmd/users/main.go @@ -17,25 +17,25 @@ import ( chclient "github.com/absmach/callhome/pkg/client" "github.com/absmach/magistrala" authSvc "github.com/absmach/magistrala/auth" - "github.com/absmach/magistrala/internal" - jaegerclient "github.com/absmach/magistrala/internal/clients/jaeger" - pgclient "github.com/absmach/magistrala/internal/clients/postgres" "github.com/absmach/magistrala/internal/email" mggroups "github.com/absmach/magistrala/internal/groups" gapi "github.com/absmach/magistrala/internal/groups/api" gevents "github.com/absmach/magistrala/internal/groups/events" gpostgres "github.com/absmach/magistrala/internal/groups/postgres" gtracing "github.com/absmach/magistrala/internal/groups/tracing" - "github.com/absmach/magistrala/internal/postgres" - "github.com/absmach/magistrala/internal/server" - httpserver "github.com/absmach/magistrala/internal/server/http" mglog "github.com/absmach/magistrala/logger" "github.com/absmach/magistrala/pkg/auth" mgclients "github.com/absmach/magistrala/pkg/clients" svcerr "github.com/absmach/magistrala/pkg/errors/service" "github.com/absmach/magistrala/pkg/groups" + jaegerclient "github.com/absmach/magistrala/pkg/jaeger" "github.com/absmach/magistrala/pkg/oauth2" googleoauth "github.com/absmach/magistrala/pkg/oauth2/google" + "github.com/absmach/magistrala/pkg/postgres" + pgclient "github.com/absmach/magistrala/pkg/postgres" + "github.com/absmach/magistrala/pkg/prometheus" + "github.com/absmach/magistrala/pkg/server" + httpserver "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/uuid" "github.com/absmach/magistrala/users" capi "github.com/absmach/magistrala/users/api" @@ -188,7 +188,7 @@ func main() { oauthProvider := googleoauth.NewProvider(oauthConfig, cfg.OAuthUIRedirectURL, cfg.OAuthUIErrorURL) mux := chi.NewRouter() - httpSrv := httpserver.New(ctx, cancel, svcName, httpServerConfig, capi.MakeHandler(csvc, gsvc, mux, logger, cfg.InstanceID, cfg.PassRegex, oauthProvider), logger) + httpSrv := httpserver.NewServer(ctx, cancel, svcName, httpServerConfig, capi.MakeHandler(csvc, gsvc, mux, logger, cfg.InstanceID, cfg.PassRegex, oauthProvider), logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, cancel) @@ -235,12 +235,12 @@ func newService(ctx context.Context, authClient magistrala.AuthServiceClient, db csvc = ctracing.New(csvc, tracer) csvc = capi.LoggingMiddleware(csvc, logger) - counter, latency := internal.MakeMetrics(svcName, "api") + counter, latency := prometheus.MakeMetrics(svcName, "api") csvc = capi.MetricsMiddleware(csvc, counter, latency) gsvc = gtracing.New(gsvc, tracer) gsvc = gapi.LoggingMiddleware(gsvc, logger) - counter, latency = internal.MakeMetrics("groups", "api") + counter, latency = prometheus.MakeMetrics("groups", "api") gsvc = gapi.MetricsMiddleware(gsvc, counter, latency) clientID, err := createAdmin(ctx, c, cRepo, hsr, csvc) diff --git a/cmd/ws/main.go b/cmd/ws/main.go index 1dd97bb59..ef7db2e1b 100644 --- a/cmd/ws/main.go +++ b/cmd/ws/main.go @@ -14,15 +14,15 @@ import ( chclient "github.com/absmach/callhome/pkg/client" "github.com/absmach/magistrala" - "github.com/absmach/magistrala/internal" - jaegerclient "github.com/absmach/magistrala/internal/clients/jaeger" - "github.com/absmach/magistrala/internal/server" - httpserver "github.com/absmach/magistrala/internal/server/http" mglog "github.com/absmach/magistrala/logger" "github.com/absmach/magistrala/pkg/auth" + jaegerclient "github.com/absmach/magistrala/pkg/jaeger" "github.com/absmach/magistrala/pkg/messaging" "github.com/absmach/magistrala/pkg/messaging/brokers" brokerstracing "github.com/absmach/magistrala/pkg/messaging/brokers/tracing" + "github.com/absmach/magistrala/pkg/prometheus" + "github.com/absmach/magistrala/pkg/server" + httpserver "github.com/absmach/magistrala/pkg/server/http" "github.com/absmach/magistrala/pkg/uuid" "github.com/absmach/magistrala/ws" "github.com/absmach/magistrala/ws/api" @@ -130,7 +130,7 @@ func main() { svc := newService(authClient, nps, logger, tracer) - hs := httpserver.New(ctx, cancel, svcName, targetServerConfig, api.MakeHandler(ctx, svc, logger, cfg.InstanceID), logger) + hs := httpserver.NewServer(ctx, cancel, svcName, targetServerConfig, api.MakeHandler(ctx, svc, logger, cfg.InstanceID), logger) if cfg.SendTelemetry { chc := chclient.New(svcName, magistrala.Version, logger, cancel) @@ -158,7 +158,7 @@ func newService(tc magistrala.AuthzServiceClient, nps messaging.PubSub, logger * svc := ws.New(tc, nps) svc = tracing.New(tracer, svc) svc = api.LoggingMiddleware(svc, logger) - counter, latency := internal.MakeMetrics("ws_adapter", "api") + counter, latency := prometheus.MakeMetrics("ws_adapter", "api") svc = api.MetricsMiddleware(svc, counter, latency) return svc } diff --git a/consumers/messages.go b/consumers/messages.go index a635547be..0d25edf6f 100644 --- a/consumers/messages.go +++ b/consumers/messages.go @@ -10,7 +10,7 @@ import ( "os" "strings" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" "github.com/absmach/magistrala/pkg/messaging" "github.com/absmach/magistrala/pkg/messaging/brokers" diff --git a/consumers/notifiers/api/endpoint.go b/consumers/notifiers/api/endpoint.go index c286f15e7..4b411eaf0 100644 --- a/consumers/notifiers/api/endpoint.go +++ b/consumers/notifiers/api/endpoint.go @@ -7,7 +7,7 @@ import ( "context" notifiers "github.com/absmach/magistrala/consumers/notifiers" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" "github.com/go-kit/kit/endpoint" ) diff --git a/consumers/notifiers/api/endpoint_test.go b/consumers/notifiers/api/endpoint_test.go index 6fc5d4dc6..89c53d706 100644 --- a/consumers/notifiers/api/endpoint_test.go +++ b/consumers/notifiers/api/endpoint_test.go @@ -17,9 +17,9 @@ import ( "github.com/absmach/magistrala/consumers/notifiers" httpapi "github.com/absmach/magistrala/consumers/notifiers/api" "github.com/absmach/magistrala/consumers/notifiers/mocks" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/internal/testsutil" mglog "github.com/absmach/magistrala/logger" + "github.com/absmach/magistrala/pkg/apiutil" svcerr "github.com/absmach/magistrala/pkg/errors/service" "github.com/absmach/magistrala/pkg/uuid" "github.com/stretchr/testify/assert" diff --git a/consumers/notifiers/api/requests.go b/consumers/notifiers/api/requests.go index 90174e0d6..9285f4d7f 100644 --- a/consumers/notifiers/api/requests.go +++ b/consumers/notifiers/api/requests.go @@ -3,7 +3,7 @@ package api -import "github.com/absmach/magistrala/internal/apiutil" +import "github.com/absmach/magistrala/pkg/apiutil" type createSubReq struct { token string diff --git a/consumers/notifiers/api/transport.go b/consumers/notifiers/api/transport.go index e37a7788d..af604d654 100644 --- a/consumers/notifiers/api/transport.go +++ b/consumers/notifiers/api/transport.go @@ -13,7 +13,7 @@ import ( "github.com/absmach/magistrala" "github.com/absmach/magistrala/consumers/notifiers" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" "github.com/go-chi/chi/v5" kithttp "github.com/go-kit/kit/transport/http" diff --git a/consumers/notifiers/postgres/setup_test.go b/consumers/notifiers/postgres/setup_test.go index 56e3bf308..b6033780d 100644 --- a/consumers/notifiers/postgres/setup_test.go +++ b/consumers/notifiers/postgres/setup_test.go @@ -12,7 +12,7 @@ import ( "testing" "github.com/absmach/magistrala/consumers/notifiers/postgres" - pgclient "github.com/absmach/magistrala/internal/clients/postgres" + pgclient "github.com/absmach/magistrala/pkg/postgres" "github.com/absmach/magistrala/pkg/ulid" _ "github.com/jackc/pgx/v5/stdlib" // required for SQL access "github.com/jmoiron/sqlx" diff --git a/consumers/notifiers/service.go b/consumers/notifiers/service.go index 5a54dab94..563fd59d1 100644 --- a/consumers/notifiers/service.go +++ b/consumers/notifiers/service.go @@ -10,6 +10,7 @@ import ( "github.com/absmach/magistrala" "github.com/absmach/magistrala/consumers" "github.com/absmach/magistrala/pkg/errors" + svcerr "github.com/absmach/magistrala/pkg/errors/service" "github.com/absmach/magistrala/pkg/messaging" ) @@ -72,7 +73,11 @@ func (ns *notifierService) CreateSubscription(ctx context.Context, token string, } sub.OwnerID = res.GetId() - return ns.subs.Save(ctx, sub) + id, err := ns.subs.Save(ctx, sub) + if err != nil { + return "", errors.Wrap(svcerr.ErrCreateEntity, err) + } + return id, nil } func (ns *notifierService) ViewSubscription(ctx context.Context, token, id string) (Subscription, error) { diff --git a/consumers/tracing/consumers.go b/consumers/tracing/consumers.go index 75ec798fd..c9cb362bd 100644 --- a/consumers/tracing/consumers.go +++ b/consumers/tracing/consumers.go @@ -8,7 +8,7 @@ import ( "fmt" "github.com/absmach/magistrala/consumers" - "github.com/absmach/magistrala/internal/server" + "github.com/absmach/magistrala/pkg/server" mgjson "github.com/absmach/magistrala/pkg/transformers/json" "github.com/absmach/magistrala/pkg/transformers/senml" "go.opentelemetry.io/otel/attribute" diff --git a/consumers/writers/postgres/setup_test.go b/consumers/writers/postgres/setup_test.go index d2c4b1e9e..a046f8dfb 100644 --- a/consumers/writers/postgres/setup_test.go +++ b/consumers/writers/postgres/setup_test.go @@ -12,7 +12,7 @@ import ( "testing" "github.com/absmach/magistrala/consumers/writers/postgres" - pgclient "github.com/absmach/magistrala/internal/clients/postgres" + pgclient "github.com/absmach/magistrala/pkg/postgres" "github.com/jmoiron/sqlx" "github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3/docker" diff --git a/consumers/writers/timescale/setup_test.go b/consumers/writers/timescale/setup_test.go index 6a07cfb59..d3d9064fa 100644 --- a/consumers/writers/timescale/setup_test.go +++ b/consumers/writers/timescale/setup_test.go @@ -12,7 +12,7 @@ import ( "testing" "github.com/absmach/magistrala/consumers/writers/timescale" - pgclient "github.com/absmach/magistrala/internal/clients/postgres" + pgclient "github.com/absmach/magistrala/pkg/postgres" "github.com/jmoiron/sqlx" "github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3/docker" diff --git a/http/api/endpoint.go b/http/api/endpoint.go index 063c594c4..1808f03e5 100644 --- a/http/api/endpoint.go +++ b/http/api/endpoint.go @@ -6,7 +6,7 @@ package api import ( "context" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" "github.com/go-kit/kit/endpoint" ) diff --git a/http/api/endpoint_test.go b/http/api/endpoint_test.go index 64f583197..885a6a481 100644 --- a/http/api/endpoint_test.go +++ b/http/api/endpoint_test.go @@ -15,8 +15,8 @@ import ( authmocks "github.com/absmach/magistrala/auth/mocks" server "github.com/absmach/magistrala/http" "github.com/absmach/magistrala/http/api" - "github.com/absmach/magistrala/internal/apiutil" mglog "github.com/absmach/magistrala/logger" + "github.com/absmach/magistrala/pkg/apiutil" pubsub "github.com/absmach/magistrala/pkg/messaging/mocks" "github.com/absmach/mproxy" mproxyhttp "github.com/absmach/mproxy/pkg/http" diff --git a/http/api/request.go b/http/api/request.go index d31be3836..b4e3df88f 100644 --- a/http/api/request.go +++ b/http/api/request.go @@ -4,7 +4,7 @@ package api import ( - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/messaging" ) diff --git a/http/api/transport.go b/http/api/transport.go index c5497c2c5..d59155dae 100644 --- a/http/api/transport.go +++ b/http/api/transport.go @@ -11,7 +11,7 @@ import ( "github.com/absmach/magistrala" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" "github.com/absmach/magistrala/pkg/messaging" "github.com/go-chi/chi/v5" diff --git a/http/handler.go b/http/handler.go index 4e0ed5099..060d84e88 100644 --- a/http/handler.go +++ b/http/handler.go @@ -14,7 +14,7 @@ import ( "github.com/absmach/magistrala" "github.com/absmach/magistrala/auth" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" "github.com/absmach/magistrala/pkg/messaging" diff --git a/internal/api/common.go b/internal/api/common.go index df5b8e3a1..4c450ae48 100644 --- a/internal/api/common.go +++ b/internal/api/common.go @@ -10,7 +10,7 @@ import ( "github.com/absmach/magistrala" "github.com/absmach/magistrala/bootstrap" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" mgclients "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" diff --git a/internal/api/common_test.go b/internal/api/common_test.go index be53ee8c8..15bd938dc 100644 --- a/internal/api/common_test.go +++ b/internal/api/common_test.go @@ -12,8 +12,8 @@ import ( "github.com/absmach/magistrala" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/internal/testsutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" "github.com/stretchr/testify/assert" diff --git a/internal/groups/api/decode.go b/internal/groups/api/decode.go index e4b618a03..49bbd38fe 100644 --- a/internal/groups/api/decode.go +++ b/internal/groups/api/decode.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" mgclients "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" mggroups "github.com/absmach/magistrala/pkg/groups" diff --git a/internal/groups/api/decode_test.go b/internal/groups/api/decode_test.go index 3e2e392b3..aaf2d9c9c 100644 --- a/internal/groups/api/decode_test.go +++ b/internal/groups/api/decode_test.go @@ -12,7 +12,7 @@ import ( "testing" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" "github.com/absmach/magistrala/pkg/groups" diff --git a/internal/groups/api/endpoint_test.go b/internal/groups/api/endpoint_test.go index 70740b88f..02b32d46c 100644 --- a/internal/groups/api/endpoint_test.go +++ b/internal/groups/api/endpoint_test.go @@ -11,8 +11,8 @@ import ( "time" "github.com/absmach/magistrala/auth" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/internal/testsutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" diff --git a/internal/groups/api/endpoints.go b/internal/groups/api/endpoints.go index c95974626..64ff9ccfc 100644 --- a/internal/groups/api/endpoints.go +++ b/internal/groups/api/endpoints.go @@ -6,7 +6,7 @@ package api import ( "context" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" "github.com/absmach/magistrala/pkg/groups" "github.com/go-kit/kit/endpoint" diff --git a/internal/groups/api/requests.go b/internal/groups/api/requests.go index 450cd2d1b..4b64ebcb8 100644 --- a/internal/groups/api/requests.go +++ b/internal/groups/api/requests.go @@ -6,7 +6,7 @@ package api import ( "github.com/absmach/magistrala/auth" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" mggroups "github.com/absmach/magistrala/pkg/groups" ) diff --git a/internal/groups/api/requests_test.go b/internal/groups/api/requests_test.go index d258245be..65eb3359e 100644 --- a/internal/groups/api/requests_test.go +++ b/internal/groups/api/requests_test.go @@ -10,7 +10,7 @@ import ( "github.com/absmach/magistrala/auth" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/groups" "github.com/stretchr/testify/assert" ) diff --git a/internal/groups/postgres/groups.go b/internal/groups/postgres/groups.go index d2564cf67..583088333 100644 --- a/internal/groups/postgres/groups.go +++ b/internal/groups/postgres/groups.go @@ -11,11 +11,11 @@ import ( "strings" "time" - "github.com/absmach/magistrala/internal/postgres" mgclients "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" repoerr "github.com/absmach/magistrala/pkg/errors/repository" mggroups "github.com/absmach/magistrala/pkg/groups" + "github.com/absmach/magistrala/pkg/postgres" "github.com/jmoiron/sqlx" ) diff --git a/internal/groups/postgres/setup_test.go b/internal/groups/postgres/setup_test.go index 0412bf9fe..a809a2b48 100644 --- a/internal/groups/postgres/setup_test.go +++ b/internal/groups/postgres/setup_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - pgclient "github.com/absmach/magistrala/internal/clients/postgres" gpostgres "github.com/absmach/magistrala/internal/groups/postgres" - "github.com/absmach/magistrala/internal/postgres" + "github.com/absmach/magistrala/pkg/postgres" + pgclient "github.com/absmach/magistrala/pkg/postgres" "github.com/jmoiron/sqlx" "github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3/docker" diff --git a/internal/groups/service.go b/internal/groups/service.go index 8be3d343d..77ad6e227 100644 --- a/internal/groups/service.go +++ b/internal/groups/service.go @@ -10,7 +10,7 @@ import ( "github.com/absmach/magistrala" "github.com/absmach/magistrala/auth" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" mgclients "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" diff --git a/internal/groups/service_test.go b/internal/groups/service_test.go index 2869537c9..5031b8e72 100644 --- a/internal/groups/service_test.go +++ b/internal/groups/service_test.go @@ -13,9 +13,9 @@ import ( "github.com/absmach/magistrala" "github.com/absmach/magistrala/auth" authmocks "github.com/absmach/magistrala/auth/mocks" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/internal/groups" "github.com/absmach/magistrala/internal/testsutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" repoerr "github.com/absmach/magistrala/pkg/errors/repository" diff --git a/invitations/api/endpoint.go b/invitations/api/endpoint.go index e499659fa..76358d629 100644 --- a/invitations/api/endpoint.go +++ b/invitations/api/endpoint.go @@ -6,8 +6,8 @@ package api import ( "context" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/invitations" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" "github.com/go-kit/kit/endpoint" ) diff --git a/invitations/api/endpoint_test.go b/invitations/api/endpoint_test.go index f77cd85a8..fa27f3feb 100644 --- a/invitations/api/endpoint_test.go +++ b/invitations/api/endpoint_test.go @@ -11,12 +11,12 @@ import ( "strings" "testing" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/internal/testsutil" "github.com/absmach/magistrala/invitations" "github.com/absmach/magistrala/invitations/api" "github.com/absmach/magistrala/invitations/mocks" mglog "github.com/absmach/magistrala/logger" + "github.com/absmach/magistrala/pkg/apiutil" svcerr "github.com/absmach/magistrala/pkg/errors/service" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/invitations/api/requests.go b/invitations/api/requests.go index fec5f1d56..2379b8540 100644 --- a/invitations/api/requests.go +++ b/invitations/api/requests.go @@ -6,8 +6,8 @@ package api import ( "errors" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/invitations" + "github.com/absmach/magistrala/pkg/apiutil" ) const maxLimitSize = 100 diff --git a/invitations/api/requests_test.go b/invitations/api/requests_test.go index a2e22660a..7ab5a80c3 100644 --- a/invitations/api/requests_test.go +++ b/invitations/api/requests_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/absmach/magistrala/auth" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/invitations" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/stretchr/testify/assert" ) diff --git a/invitations/api/transport.go b/invitations/api/transport.go index 68c01fa8f..f226a6574 100644 --- a/invitations/api/transport.go +++ b/invitations/api/transport.go @@ -12,8 +12,8 @@ import ( "github.com/absmach/magistrala" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/invitations" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" "github.com/go-chi/chi/v5" kithttp "github.com/go-kit/kit/transport/http" diff --git a/invitations/invitations.go b/invitations/invitations.go index bafa8bde9..febbc75d9 100644 --- a/invitations/invitations.go +++ b/invitations/invitations.go @@ -9,7 +9,7 @@ import ( "time" "github.com/absmach/magistrala/auth" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" ) // Invitation is an invitation to join a domain. diff --git a/invitations/invitations_test.go b/invitations/invitations_test.go index b6c38e2fd..92564e586 100644 --- a/invitations/invitations_test.go +++ b/invitations/invitations_test.go @@ -7,8 +7,8 @@ import ( "fmt" "testing" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/invitations" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/stretchr/testify/assert" ) diff --git a/invitations/postgres/invitations.go b/invitations/postgres/invitations.go index efb242bc5..66cd38808 100644 --- a/invitations/postgres/invitations.go +++ b/invitations/postgres/invitations.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "github.com/absmach/magistrala/internal/postgres" "github.com/absmach/magistrala/invitations" repoerr "github.com/absmach/magistrala/pkg/errors/repository" + "github.com/absmach/magistrala/pkg/postgres" ) type repository struct { diff --git a/invitations/postgres/setup_test.go b/invitations/postgres/setup_test.go index e49c56587..2b773d273 100644 --- a/invitations/postgres/setup_test.go +++ b/invitations/postgres/setup_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - pgClient "github.com/absmach/magistrala/internal/clients/postgres" - "github.com/absmach/magistrala/internal/postgres" ipostgres "github.com/absmach/magistrala/invitations/postgres" + "github.com/absmach/magistrala/pkg/postgres" + pgClient "github.com/absmach/magistrala/pkg/postgres" "github.com/jmoiron/sqlx" dockertest "github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3/docker" diff --git a/invitations/service_test.go b/invitations/service_test.go index 8232da345..2e3d47e9e 100644 --- a/invitations/service_test.go +++ b/invitations/service_test.go @@ -12,10 +12,10 @@ import ( "github.com/absmach/magistrala" "github.com/absmach/magistrala/auth" authmocks "github.com/absmach/magistrala/auth/mocks" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/internal/testsutil" "github.com/absmach/magistrala/invitations" "github.com/absmach/magistrala/invitations/mocks" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" "github.com/stretchr/testify/assert" diff --git a/invitations/state.go b/invitations/state.go index 238091304..5296ddc6a 100644 --- a/invitations/state.go +++ b/invitations/state.go @@ -7,7 +7,7 @@ import ( "encoding/json" "strings" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" ) // State represents invitation state. diff --git a/invitations/state_test.go b/invitations/state_test.go index db35619f5..4241d8337 100644 --- a/invitations/state_test.go +++ b/invitations/state_test.go @@ -6,8 +6,8 @@ package invitations_test import ( "testing" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/invitations" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/stretchr/testify/assert" ) diff --git a/journal/api/endpoint.go b/journal/api/endpoint.go index 3b366933a..a248b20eb 100644 --- a/journal/api/endpoint.go +++ b/journal/api/endpoint.go @@ -6,8 +6,8 @@ package api import ( "context" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/journal" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" "github.com/go-kit/kit/endpoint" ) diff --git a/journal/api/endpoint_test.go b/journal/api/endpoint_test.go index 3c9e3c342..994a1b1c4 100644 --- a/journal/api/endpoint_test.go +++ b/journal/api/endpoint_test.go @@ -12,11 +12,11 @@ import ( "testing" "time" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/journal" "github.com/absmach/magistrala/journal/api" "github.com/absmach/magistrala/journal/mocks" mglog "github.com/absmach/magistrala/logger" + "github.com/absmach/magistrala/pkg/apiutil" svcerr "github.com/absmach/magistrala/pkg/errors/service" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/journal/api/requests.go b/journal/api/requests.go index e42d274a3..ba633e55f 100644 --- a/journal/api/requests.go +++ b/journal/api/requests.go @@ -5,8 +5,8 @@ package api import ( "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/journal" + "github.com/absmach/magistrala/pkg/apiutil" ) type retrieveJournalsReq struct { diff --git a/journal/api/requests_test.go b/journal/api/requests_test.go index e37880834..31b9b4199 100644 --- a/journal/api/requests_test.go +++ b/journal/api/requests_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/journal" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/stretchr/testify/assert" ) diff --git a/journal/api/transport.go b/journal/api/transport.go index cbbbb393f..5c22bcc24 100644 --- a/journal/api/transport.go +++ b/journal/api/transport.go @@ -13,8 +13,8 @@ import ( "github.com/absmach/magistrala" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/journal" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" "github.com/go-chi/chi/v5" kithttp "github.com/go-kit/kit/transport/http" diff --git a/journal/journal.go b/journal/journal.go index 7eab106da..b671b82d3 100644 --- a/journal/journal.go +++ b/journal/journal.go @@ -9,7 +9,7 @@ import ( "time" "github.com/absmach/magistrala/auth" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" ) type EntityType uint8 diff --git a/journal/journal_test.go b/journal/journal_test.go index f0d8980ed..0772ed009 100644 --- a/journal/journal_test.go +++ b/journal/journal_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/journal" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/stretchr/testify/assert" ) diff --git a/journal/postgres/journal.go b/journal/postgres/journal.go index 0469a84c9..ff6606efd 100644 --- a/journal/postgres/journal.go +++ b/journal/postgres/journal.go @@ -10,10 +10,10 @@ import ( "strings" "time" - "github.com/absmach/magistrala/internal/postgres" "github.com/absmach/magistrala/journal" "github.com/absmach/magistrala/pkg/errors" repoerr "github.com/absmach/magistrala/pkg/errors/repository" + "github.com/absmach/magistrala/pkg/postgres" ) type repository struct { diff --git a/journal/postgres/setup_test.go b/journal/postgres/setup_test.go index da5ade6c3..bb9a1307a 100644 --- a/journal/postgres/setup_test.go +++ b/journal/postgres/setup_test.go @@ -11,9 +11,8 @@ import ( "testing" "time" - pgclient "github.com/absmach/magistrala/internal/clients/postgres" - "github.com/absmach/magistrala/internal/postgres" - apostgres "github.com/absmach/magistrala/journal/postgres" + jpostgres "github.com/absmach/magistrala/journal/postgres" + "github.com/absmach/magistrala/pkg/postgres" "github.com/jmoiron/sqlx" dockertest "github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3/docker" @@ -64,7 +63,7 @@ func TestMain(m *testing.M) { log.Fatalf("Could not connect to docker: %s", err) } - dbConfig := pgclient.Config{ + dbConfig := postgres.Config{ Host: "localhost", Port: port, User: "test", @@ -76,7 +75,7 @@ func TestMain(m *testing.M) { SSLRootCert: "", } - if db, err = pgclient.Setup(dbConfig, *apostgres.Migration()); err != nil { + if db, err = postgres.Setup(dbConfig, *jpostgres.Migration()); err != nil { log.Fatalf("Could not setup test DB connection: %s", err) } diff --git a/mqtt/tracing/forwarder.go b/mqtt/tracing/forwarder.go index aedf8e861..2300d2dcd 100644 --- a/mqtt/tracing/forwarder.go +++ b/mqtt/tracing/forwarder.go @@ -7,9 +7,9 @@ import ( "context" "fmt" - "github.com/absmach/magistrala/internal/server" "github.com/absmach/magistrala/mqtt" "github.com/absmach/magistrala/pkg/messaging" + "github.com/absmach/magistrala/pkg/server" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" ) diff --git a/opcua/api/endpoint.go b/opcua/api/endpoint.go index b71149ce9..f734f9721 100644 --- a/opcua/api/endpoint.go +++ b/opcua/api/endpoint.go @@ -6,8 +6,8 @@ package api import ( "context" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/opcua" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" "github.com/go-kit/kit/endpoint" ) diff --git a/opcua/api/requests.go b/opcua/api/requests.go index 73197c69c..8121b6375 100644 --- a/opcua/api/requests.go +++ b/opcua/api/requests.go @@ -3,7 +3,7 @@ package api -import "github.com/absmach/magistrala/internal/apiutil" +import "github.com/absmach/magistrala/pkg/apiutil" type browseReq struct { ServerURI string diff --git a/opcua/api/transport.go b/opcua/api/transport.go index cb24cdc84..a8d912e2c 100644 --- a/opcua/api/transport.go +++ b/opcua/api/transport.go @@ -10,8 +10,8 @@ import ( "net/http" "github.com/absmach/magistrala" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/opcua" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" "github.com/go-chi/chi/v5" kithttp "github.com/go-kit/kit/transport/http" diff --git a/internal/apiutil/errors.go b/pkg/apiutil/errors.go similarity index 100% rename from internal/apiutil/errors.go rename to pkg/apiutil/errors.go diff --git a/internal/apiutil/responses.go b/pkg/apiutil/responses.go similarity index 100% rename from internal/apiutil/responses.go rename to pkg/apiutil/responses.go diff --git a/internal/apiutil/token.go b/pkg/apiutil/token.go similarity index 100% rename from internal/apiutil/token.go rename to pkg/apiutil/token.go diff --git a/internal/apiutil/token_test.go b/pkg/apiutil/token_test.go similarity index 97% rename from internal/apiutil/token_test.go rename to pkg/apiutil/token_test.go index a2490bc11..6194b9bb7 100644 --- a/internal/apiutil/token_test.go +++ b/pkg/apiutil/token_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/stretchr/testify/assert" ) diff --git a/internal/apiutil/transport.go b/pkg/apiutil/transport.go similarity index 100% rename from internal/apiutil/transport.go rename to pkg/apiutil/transport.go diff --git a/internal/apiutil/transport_test.go b/pkg/apiutil/transport_test.go similarity index 99% rename from internal/apiutil/transport_test.go rename to pkg/apiutil/transport_test.go index 28c206bf8..fec20d977 100644 --- a/internal/apiutil/transport_test.go +++ b/pkg/apiutil/transport_test.go @@ -11,8 +11,8 @@ import ( "net/url" "testing" - "github.com/absmach/magistrala/internal/apiutil" mglog "github.com/absmach/magistrala/logger" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" "github.com/stretchr/testify/assert" diff --git a/pkg/auth/client_test.go b/pkg/auth/client_test.go index e49ec19f9..918ec3fc0 100644 --- a/pkg/auth/client_test.go +++ b/pkg/auth/client_test.go @@ -12,11 +12,11 @@ import ( "github.com/absmach/magistrala" authgrpcapi "github.com/absmach/magistrala/auth/api/grpc" "github.com/absmach/magistrala/auth/mocks" - "github.com/absmach/magistrala/internal/server" - grpcserver "github.com/absmach/magistrala/internal/server/grpc" mglog "github.com/absmach/magistrala/logger" "github.com/absmach/magistrala/pkg/auth" "github.com/absmach/magistrala/pkg/errors" + "github.com/absmach/magistrala/pkg/server" + grpcserver "github.com/absmach/magistrala/pkg/server/grpc" thingsgrpcapi "github.com/absmach/magistrala/things/api/grpc" thmocks "github.com/absmach/magistrala/things/mocks" "github.com/stretchr/testify/assert" @@ -29,7 +29,7 @@ func TestSetupAuth(t *testing.T) { registerAuthServiceServer := func(srv *grpc.Server) { magistrala.RegisterAuthServiceServer(srv, authgrpcapi.NewServer(new(mocks.Service))) } - gs := grpcserver.New(ctx, cancel, "auth", server.Config{Port: "12345"}, registerAuthServiceServer, mglog.NewMock()) + gs := grpcserver.NewServer(ctx, cancel, "auth", server.Config{Port: "12345"}, registerAuthServiceServer, mglog.NewMock()) go func() { err := gs.Start() assert.Nil(t, err, fmt.Sprintf(`"Unexpected error creating server %s"`, err)) @@ -80,7 +80,7 @@ func TestSetupAuthz(t *testing.T) { registerAuthaServiceServer := func(srv *grpc.Server) { magistrala.RegisterAuthzServiceServer(srv, thingsgrpcapi.NewServer(new(thmocks.Service))) } - gs := grpcserver.New(ctx, cancel, "things", server.Config{Port: "12345"}, registerAuthaServiceServer, mglog.NewMock()) + gs := grpcserver.NewServer(ctx, cancel, "things", server.Config{Port: "12345"}, registerAuthaServiceServer, mglog.NewMock()) go func() { err := gs.Start() assert.Nil(t, err, fmt.Sprintf(`"Unexpected error creating server %s"`, err)) diff --git a/pkg/clients/postgres/clients.go b/pkg/clients/postgres/clients.go index ea6b69479..63cf14a5a 100644 --- a/pkg/clients/postgres/clients.go +++ b/pkg/clients/postgres/clients.go @@ -12,11 +12,11 @@ import ( "time" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/postgres" "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" repoerr "github.com/absmach/magistrala/pkg/errors/repository" "github.com/absmach/magistrala/pkg/groups" + "github.com/absmach/magistrala/pkg/postgres" "github.com/jackc/pgtype" ) diff --git a/pkg/clients/postgres/clients_test.go b/pkg/clients/postgres/clients_test.go index 82fa35567..178fcdf4a 100644 --- a/pkg/clients/postgres/clients_test.go +++ b/pkg/clients/postgres/clients_test.go @@ -12,7 +12,6 @@ import ( "time" "github.com/0x6flab/namegenerator" - ipostgres "github.com/absmach/magistrala/internal/postgres" "github.com/absmach/magistrala/internal/testsutil" "github.com/absmach/magistrala/pkg/clients" mgclients "github.com/absmach/magistrala/pkg/clients" @@ -20,6 +19,7 @@ import ( pgclients "github.com/absmach/magistrala/pkg/clients/postgres" "github.com/absmach/magistrala/pkg/errors" repoerr "github.com/absmach/magistrala/pkg/errors/repository" + ipostgres "github.com/absmach/magistrala/pkg/postgres" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/clients/postgres/setup_test.go b/pkg/clients/postgres/setup_test.go index 29c3f728c..fab499cdf 100644 --- a/pkg/clients/postgres/setup_test.go +++ b/pkg/clients/postgres/setup_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - pgClient "github.com/absmach/magistrala/internal/clients/postgres" - "github.com/absmach/magistrala/internal/postgres" + "github.com/absmach/magistrala/pkg/postgres" + pgClient "github.com/absmach/magistrala/pkg/postgres" upostgres "github.com/absmach/magistrala/users/postgres" "github.com/jmoiron/sqlx" dockertest "github.com/ory/dockertest/v3" diff --git a/pkg/clients/roles.go b/pkg/clients/roles.go index caf743406..4d606f1be 100644 --- a/pkg/clients/roles.go +++ b/pkg/clients/roles.go @@ -7,7 +7,7 @@ import ( "encoding/json" "strings" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" ) // Role represents Client role. diff --git a/pkg/clients/roles_test.go b/pkg/clients/roles_test.go index 23e52c54a..7af1e4f3f 100644 --- a/pkg/clients/roles_test.go +++ b/pkg/clients/roles_test.go @@ -6,7 +6,7 @@ package clients_test import ( "testing" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/clients" "github.com/stretchr/testify/assert" ) diff --git a/internal/clients/jaeger/doc.go b/pkg/jaeger/doc.go similarity index 79% rename from internal/clients/jaeger/doc.go rename to pkg/jaeger/doc.go index f448121de..54eb78e67 100644 --- a/internal/clients/jaeger/doc.go +++ b/pkg/jaeger/doc.go @@ -2,5 +2,5 @@ // SPDX-License-Identifier: Apache-2.0 // Package jaeger contains the domain concept definitions needed to support -// Magistrala Jaeger functionality. +// Magistrala Jaeger tracing functionality. package jaeger diff --git a/internal/clients/jaeger/provider.go b/pkg/jaeger/provider.go similarity index 93% rename from internal/clients/jaeger/provider.go rename to pkg/jaeger/provider.go index a0a7598f3..436c6b2cd 100644 --- a/internal/clients/jaeger/provider.go +++ b/pkg/jaeger/provider.go @@ -25,6 +25,8 @@ var ( ) // NewProvider initializes Jaeger TraceProvider. +// +// tp, err := jaeger.NewProvider(ctx, "demo-service", "http://localhost:14268/api/traces", "2cb32911-6833-469c-9cad-4d3e93c528d8", "1.0") func NewProvider(ctx context.Context, svcName string, jaegerUrl url.URL, instanceID string, fraction float64) (*trace.TracerProvider, error) { if jaegerUrl == (url.URL{}) { return nil, errNoURL diff --git a/pkg/messaging/brokers/tracing/brokers_nats.go b/pkg/messaging/brokers/tracing/brokers_nats.go index 5ef7c2d5c..608a9f3a4 100644 --- a/pkg/messaging/brokers/tracing/brokers_nats.go +++ b/pkg/messaging/brokers/tracing/brokers_nats.go @@ -9,9 +9,9 @@ package brokers import ( "log" - "github.com/absmach/magistrala/internal/server" "github.com/absmach/magistrala/pkg/messaging" "github.com/absmach/magistrala/pkg/messaging/nats/tracing" + "github.com/absmach/magistrala/pkg/server" "go.opentelemetry.io/otel/trace" ) diff --git a/pkg/messaging/brokers/tracing/brokers_rabbitmq.go b/pkg/messaging/brokers/tracing/brokers_rabbitmq.go index 80f60ad2e..c3d07acbf 100644 --- a/pkg/messaging/brokers/tracing/brokers_rabbitmq.go +++ b/pkg/messaging/brokers/tracing/brokers_rabbitmq.go @@ -9,9 +9,9 @@ package brokers import ( "log" - "github.com/absmach/magistrala/internal/server" "github.com/absmach/magistrala/pkg/messaging" "github.com/absmach/magistrala/pkg/messaging/rabbitmq/tracing" + "github.com/absmach/magistrala/pkg/server" "go.opentelemetry.io/otel/trace" ) diff --git a/pkg/messaging/nats/tracing/publisher.go b/pkg/messaging/nats/tracing/publisher.go index 320ccdcea..84c2bc5b8 100644 --- a/pkg/messaging/nats/tracing/publisher.go +++ b/pkg/messaging/nats/tracing/publisher.go @@ -5,9 +5,9 @@ package tracing import ( "context" - "github.com/absmach/magistrala/internal/server" "github.com/absmach/magistrala/pkg/messaging" "github.com/absmach/magistrala/pkg/messaging/tracing" + "github.com/absmach/magistrala/pkg/server" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" ) diff --git a/pkg/messaging/nats/tracing/pubsub.go b/pkg/messaging/nats/tracing/pubsub.go index f911dfd25..c8f6b0cf7 100644 --- a/pkg/messaging/nats/tracing/pubsub.go +++ b/pkg/messaging/nats/tracing/pubsub.go @@ -5,9 +5,9 @@ package tracing import ( "context" - "github.com/absmach/magistrala/internal/server" "github.com/absmach/magistrala/pkg/messaging" "github.com/absmach/magistrala/pkg/messaging/tracing" + "github.com/absmach/magistrala/pkg/server" "go.opentelemetry.io/otel/trace" ) diff --git a/pkg/messaging/rabbitmq/tracing/publisher.go b/pkg/messaging/rabbitmq/tracing/publisher.go index df5c926e7..6998bf889 100644 --- a/pkg/messaging/rabbitmq/tracing/publisher.go +++ b/pkg/messaging/rabbitmq/tracing/publisher.go @@ -5,9 +5,9 @@ package tracing import ( "context" - "github.com/absmach/magistrala/internal/server" "github.com/absmach/magistrala/pkg/messaging" "github.com/absmach/magistrala/pkg/messaging/tracing" + "github.com/absmach/magistrala/pkg/server" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" ) diff --git a/pkg/messaging/rabbitmq/tracing/pubsub.go b/pkg/messaging/rabbitmq/tracing/pubsub.go index f911dfd25..c8f6b0cf7 100644 --- a/pkg/messaging/rabbitmq/tracing/pubsub.go +++ b/pkg/messaging/rabbitmq/tracing/pubsub.go @@ -5,9 +5,9 @@ package tracing import ( "context" - "github.com/absmach/magistrala/internal/server" "github.com/absmach/magistrala/pkg/messaging" "github.com/absmach/magistrala/pkg/messaging/tracing" + "github.com/absmach/magistrala/pkg/server" "go.opentelemetry.io/otel/trace" ) diff --git a/pkg/messaging/tracing/tracing.go b/pkg/messaging/tracing/tracing.go index c39447b54..e3b925149 100644 --- a/pkg/messaging/tracing/tracing.go +++ b/pkg/messaging/tracing/tracing.go @@ -6,7 +6,7 @@ import ( "context" "fmt" - "github.com/absmach/magistrala/internal/server" + "github.com/absmach/magistrala/pkg/server" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" ) diff --git a/internal/postgres/common.go b/pkg/postgres/common.go similarity index 70% rename from internal/postgres/common.go rename to pkg/postgres/common.go index c34ac9fb4..3f394f772 100644 --- a/internal/postgres/common.go +++ b/pkg/postgres/common.go @@ -9,10 +9,18 @@ import ( "fmt" ) +// CreateMetadataQuery creates a query to filter by metadata. +// +// For example: +// +// query, param, err := CreateMetadataQuery("", map[string]interface{}{ +// "key": "value", +// }) func CreateMetadataQuery(entity string, um map[string]interface{}) (string, []byte, error) { if len(um) == 0 { return "", nil, nil } + param, err := json.Marshal(um) if err != nil { return "", nil, err @@ -22,17 +30,24 @@ func CreateMetadataQuery(entity string, um map[string]interface{}) (string, []by return query, param, nil } +// Total returns the total number of rows. +// +// For example: +// +// total, err := Total(ctx, db, "SELECT COUNT(*) FROM table", nil) func Total(ctx context.Context, db Database, query string, params interface{}) (uint64, error) { rows, err := db.NamedQueryContext(ctx, query, params) if err != nil { return 0, err } defer rows.Close() + total := uint64(0) if rows.Next() { if err := rows.Scan(&total); err != nil { return 0, err } } + return total, nil } diff --git a/internal/clients/postgres/doc.go b/pkg/postgres/doc.go similarity index 100% rename from internal/clients/postgres/doc.go rename to pkg/postgres/doc.go diff --git a/internal/postgres/errors.go b/pkg/postgres/errors.go similarity index 90% rename from internal/postgres/errors.go rename to pkg/postgres/errors.go index 659205f4e..541f7f2eb 100644 --- a/internal/postgres/errors.go +++ b/pkg/postgres/errors.go @@ -20,6 +20,8 @@ const ( errInvalidChar = "22021" // character_not_in_repertoire ) +// HandleError handles the error and returns a wrapped error. +// It checks the error code and returns a specific error. func HandleError(wrapper, err error) error { pqErr, ok := err.(*pgconn.PgError) if ok { diff --git a/internal/clients/postgres/postgres.go b/pkg/postgres/postgres.go similarity index 87% rename from internal/clients/postgres/postgres.go rename to pkg/postgres/postgres.go index c5697c79b..975ed1ee0 100644 --- a/internal/clients/postgres/postgres.go +++ b/pkg/postgres/postgres.go @@ -31,14 +31,17 @@ type Config struct { // Setup creates a connection to the PostgreSQL instance and applies any // unapplied database migrations. A non-nil error is returned to indicate failure. +// +// For example: +// +// db, err := postgres.Setup(postgres.Config{}, migrate.MemoryMigrationSource{}) func Setup(cfg Config, migrations migrate.MemoryMigrationSource) (*sqlx.DB, error) { db, err := Connect(cfg) if err != nil { return nil, err } - _, err = migrate.Exec(db.DB, "postgres", migrations, migrate.Up) - if err != nil { + if _, err = migrate.Exec(db.DB, "postgres", migrations, migrate.Up); err != nil { return nil, errors.Wrap(errMigration, err) } @@ -46,6 +49,10 @@ func Setup(cfg Config, migrations migrate.MemoryMigrationSource) (*sqlx.DB, erro } // Connect creates a connection to the PostgreSQL instance. +// +// For example: +// +// db, err := postgres.Connect(postgres.Config{}) func Connect(cfg Config) (*sqlx.DB, error) { url := fmt.Sprintf("host=%s port=%s user=%s dbname=%s password=%s sslmode=%s sslcert=%s sslkey=%s sslrootcert=%s", cfg.Host, cfg.Port, cfg.User, cfg.Name, cfg.Pass, cfg.SSLMode, cfg.SSLCert, cfg.SSLKey, cfg.SSLRootCert) diff --git a/internal/postgres/tracing.go b/pkg/postgres/tracing.go similarity index 96% rename from internal/postgres/tracing.go rename to pkg/postgres/tracing.go index 599b0abd3..dfd4e934b 100644 --- a/internal/postgres/tracing.go +++ b/pkg/postgres/tracing.go @@ -9,7 +9,6 @@ import ( "fmt" "strings" - "github.com/absmach/magistrala/internal/clients/postgres" "github.com/jmoiron/sqlx" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" @@ -18,7 +17,7 @@ import ( var _ Database = (*database)(nil) type database struct { - postgres.Config + Config db *sqlx.DB tracer trace.Tracer } @@ -48,7 +47,7 @@ type Database interface { } // NewDatabase creates a Clients'Database instance. -func NewDatabase(db *sqlx.DB, config postgres.Config, tracer trace.Tracer) Database { +func NewDatabase(db *sqlx.DB, config Config, tracer trace.Tracer) Database { database := &database{ Config: config, db: db, diff --git a/pkg/prometheus/doc.go b/pkg/prometheus/doc.go new file mode 100644 index 000000000..2d654b8aa --- /dev/null +++ b/pkg/prometheus/doc.go @@ -0,0 +1,6 @@ +// Copyright (c) Abstract Machines +// SPDX-License-Identifier: Apache-2.0 + +// Package prometheus provides a framework for defining and collecting metrics +// for prometheus. +package prometheus diff --git a/internal/metrics.go b/pkg/prometheus/metrics.go similarity index 79% rename from internal/metrics.go rename to pkg/prometheus/metrics.go index 12f63edf0..333c8614d 100644 --- a/internal/metrics.go +++ b/pkg/prometheus/metrics.go @@ -1,14 +1,17 @@ // Copyright (c) Abstract Machines // SPDX-License-Identifier: Apache-2.0 -package internal +package prometheus import ( kitprometheus "github.com/go-kit/kit/metrics/prometheus" stdprometheus "github.com/prometheus/client_golang/prometheus" ) -// MakeMetrics returns an instance of metrics. +// MakeMetrics returns an instance of Prometheus implementations for metrics. +// It returns a request counter and a request latency summary. +// +// counter, latency := metrics.MakeMetrics("demo-service", "api") func MakeMetrics(namespace, subsystem string) (*kitprometheus.Counter, *kitprometheus.Summary) { counter := kitprometheus.NewCounterFrom(stdprometheus.CounterOpts{ Namespace: namespace, diff --git a/pkg/sdk/go/bootstrap.go b/pkg/sdk/go/bootstrap.go index 42d94bbc4..c9639df9a 100644 --- a/pkg/sdk/go/bootstrap.go +++ b/pkg/sdk/go/bootstrap.go @@ -14,7 +14,7 @@ import ( "net/http" "strings" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" ) diff --git a/pkg/sdk/go/bootstrap_test.go b/pkg/sdk/go/bootstrap_test.go index a7f1d8f0e..5b4ec7d82 100644 --- a/pkg/sdk/go/bootstrap_test.go +++ b/pkg/sdk/go/bootstrap_test.go @@ -17,9 +17,9 @@ import ( "github.com/absmach/magistrala/bootstrap" "github.com/absmach/magistrala/bootstrap/api" bmocks "github.com/absmach/magistrala/bootstrap/mocks" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/internal/testsutil" mglog "github.com/absmach/magistrala/logger" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" sdk "github.com/absmach/magistrala/pkg/sdk/go" diff --git a/pkg/sdk/go/certs.go b/pkg/sdk/go/certs.go index e6ce5b29e..4b04cc5a5 100644 --- a/pkg/sdk/go/certs.go +++ b/pkg/sdk/go/certs.go @@ -9,7 +9,7 @@ import ( "net/http" "time" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" ) diff --git a/pkg/sdk/go/certs_test.go b/pkg/sdk/go/certs_test.go index b0f069cc2..38ba95ae4 100644 --- a/pkg/sdk/go/certs_test.go +++ b/pkg/sdk/go/certs_test.go @@ -13,9 +13,9 @@ import ( "github.com/absmach/magistrala/certs" httpapi "github.com/absmach/magistrala/certs/api" "github.com/absmach/magistrala/certs/mocks" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/internal/testsutil" mglog "github.com/absmach/magistrala/logger" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" repoerr "github.com/absmach/magistrala/pkg/errors/repository" svcerr "github.com/absmach/magistrala/pkg/errors/service" diff --git a/pkg/sdk/go/channels_test.go b/pkg/sdk/go/channels_test.go index c53ab7d8d..bf9d7b9a2 100644 --- a/pkg/sdk/go/channels_test.go +++ b/pkg/sdk/go/channels_test.go @@ -14,10 +14,10 @@ import ( "github.com/absmach/magistrala" authmocks "github.com/absmach/magistrala/auth/mocks" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/internal/groups" "github.com/absmach/magistrala/internal/testsutil" mglog "github.com/absmach/magistrala/logger" + "github.com/absmach/magistrala/pkg/apiutil" mgclients "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" repoerr "github.com/absmach/magistrala/pkg/errors/repository" diff --git a/pkg/sdk/go/consumers_test.go b/pkg/sdk/go/consumers_test.go index d82e18872..f2ce28912 100644 --- a/pkg/sdk/go/consumers_test.go +++ b/pkg/sdk/go/consumers_test.go @@ -12,9 +12,9 @@ import ( "github.com/absmach/magistrala/consumers/notifiers" httpapi "github.com/absmach/magistrala/consumers/notifiers/api" notmocks "github.com/absmach/magistrala/consumers/notifiers/mocks" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/internal/testsutil" mglog "github.com/absmach/magistrala/logger" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" sdk "github.com/absmach/magistrala/pkg/sdk/go" diff --git a/pkg/sdk/go/groups.go b/pkg/sdk/go/groups.go index 64e32de45..d67aa947d 100644 --- a/pkg/sdk/go/groups.go +++ b/pkg/sdk/go/groups.go @@ -9,7 +9,7 @@ import ( "net/http" "time" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" ) diff --git a/pkg/sdk/go/groups_test.go b/pkg/sdk/go/groups_test.go index 166bbe4ca..155f9e137 100644 --- a/pkg/sdk/go/groups_test.go +++ b/pkg/sdk/go/groups_test.go @@ -12,9 +12,9 @@ import ( "time" "github.com/absmach/magistrala/auth" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/internal/testsutil" mglog "github.com/absmach/magistrala/logger" + "github.com/absmach/magistrala/pkg/apiutil" mgclients "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" diff --git a/pkg/sdk/go/journal.go b/pkg/sdk/go/journal.go index 46eb74b1b..d1def2e1c 100644 --- a/pkg/sdk/go/journal.go +++ b/pkg/sdk/go/journal.go @@ -9,7 +9,7 @@ import ( "net/http" "time" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" ) diff --git a/pkg/sdk/go/message.go b/pkg/sdk/go/message.go index e5a044885..2dfdbd87d 100644 --- a/pkg/sdk/go/message.go +++ b/pkg/sdk/go/message.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" ) diff --git a/pkg/sdk/go/message_test.go b/pkg/sdk/go/message_test.go index 0a20e1d71..01f44b2cb 100644 --- a/pkg/sdk/go/message_test.go +++ b/pkg/sdk/go/message_test.go @@ -13,8 +13,8 @@ import ( authmocks "github.com/absmach/magistrala/auth/mocks" adapter "github.com/absmach/magistrala/http" "github.com/absmach/magistrala/http/api" - "github.com/absmach/magistrala/internal/apiutil" mglog "github.com/absmach/magistrala/logger" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" pubsub "github.com/absmach/magistrala/pkg/messaging/mocks" diff --git a/pkg/sdk/go/things_test.go b/pkg/sdk/go/things_test.go index 8b42f4277..2c56c988d 100644 --- a/pkg/sdk/go/things_test.go +++ b/pkg/sdk/go/things_test.go @@ -12,10 +12,10 @@ import ( "github.com/absmach/magistrala" authmocks "github.com/absmach/magistrala/auth/mocks" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/internal/groups" "github.com/absmach/magistrala/internal/testsutil" mglog "github.com/absmach/magistrala/logger" + "github.com/absmach/magistrala/pkg/apiutil" mgclients "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" diff --git a/pkg/sdk/go/tokens_test.go b/pkg/sdk/go/tokens_test.go index 9945175a1..3e05f8459 100644 --- a/pkg/sdk/go/tokens_test.go +++ b/pkg/sdk/go/tokens_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/absmach/magistrala" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" mgclients "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" diff --git a/pkg/sdk/go/users_test.go b/pkg/sdk/go/users_test.go index 57ae018bc..0cf89cb09 100644 --- a/pkg/sdk/go/users_test.go +++ b/pkg/sdk/go/users_test.go @@ -12,10 +12,10 @@ import ( "github.com/absmach/magistrala" authmocks "github.com/absmach/magistrala/auth/mocks" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/internal/groups" "github.com/absmach/magistrala/internal/testsutil" mglog "github.com/absmach/magistrala/logger" + "github.com/absmach/magistrala/pkg/apiutil" mgclients "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" diff --git a/internal/server/coap/coap.go b/pkg/server/coap/coap.go similarity index 56% rename from internal/server/coap/coap.go rename to pkg/server/coap/coap.go index 3afb24b1d..62e7963e8 100644 --- a/internal/server/coap/coap.go +++ b/pkg/server/coap/coap.go @@ -9,38 +9,28 @@ import ( "log/slog" "time" - "github.com/absmach/magistrala/internal/server" + "github.com/absmach/magistrala/pkg/server" gocoap "github.com/plgd-dev/go-coap/v3" "github.com/plgd-dev/go-coap/v3/mux" ) -const ( - stopWaitTime = 5 * time.Second -) - -type Server struct { +type coapServer struct { server.BaseServer handler mux.HandlerFunc } -var _ server.Server = (*Server)(nil) +var _ server.Server = (*coapServer)(nil) -func New(ctx context.Context, cancel context.CancelFunc, name string, config server.Config, handler mux.HandlerFunc, logger *slog.Logger) server.Server { - listenFullAddress := fmt.Sprintf("%s:%s", config.Host, config.Port) - return &Server{ - BaseServer: server.BaseServer{ - Ctx: ctx, - Cancel: cancel, - Name: name, - Address: listenFullAddress, - Config: config, - Logger: logger, - }, - handler: handler, +func NewServer(ctx context.Context, cancel context.CancelFunc, name string, config server.Config, handler mux.HandlerFunc, logger *slog.Logger) server.Server { + baseServer := server.NewBaseServer(ctx, cancel, name, config, logger) + + return &coapServer{ + BaseServer: baseServer, + handler: handler, } } -func (s *Server) Start() error { +func (s *coapServer) Start() error { errCh := make(chan error) s.Logger.Info(fmt.Sprintf("%s service started using http, exposed port %s", s.Name, s.Address)) s.Logger.Info(fmt.Sprintf("%s service %s server listening at %s without TLS", s.Name, s.Protocol, s.Address)) @@ -57,13 +47,13 @@ func (s *Server) Start() error { } } -func (s *Server) Stop() error { +func (s *coapServer) Stop() error { defer s.Cancel() c := make(chan bool) defer close(c) select { case <-c: - case <-time.After(stopWaitTime): + case <-time.After(server.StopWaitTime): } s.Logger.Info(fmt.Sprintf("%s service shutdown of http at %s", s.Name, s.Address)) return nil diff --git a/internal/server/coap/doc.go b/pkg/server/coap/doc.go similarity index 100% rename from internal/server/coap/doc.go rename to pkg/server/coap/doc.go diff --git a/internal/server/doc.go b/pkg/server/doc.go similarity index 99% rename from internal/server/doc.go rename to pkg/server/doc.go index 7e4fcb717..d5514a242 100644 --- a/internal/server/doc.go +++ b/pkg/server/doc.go @@ -2,5 +2,4 @@ // SPDX-License-Identifier: Apache-2.0 // Package server contains the HTTP, gRPC and CoAP server implementation. - package server diff --git a/internal/server/grpc/doc.go b/pkg/server/grpc/doc.go similarity index 100% rename from internal/server/grpc/doc.go rename to pkg/server/grpc/doc.go diff --git a/internal/server/grpc/grpc.go b/pkg/server/grpc/grpc.go similarity index 84% rename from internal/server/grpc/grpc.go rename to pkg/server/grpc/grpc.go index 6756b8ac4..c96f4a950 100644 --- a/internal/server/grpc/grpc.go +++ b/pkg/server/grpc/grpc.go @@ -13,7 +13,7 @@ import ( "os" "time" - "github.com/absmach/magistrala/internal/server" + "github.com/absmach/magistrala/pkg/server" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "google.golang.org/grpc" "google.golang.org/grpc/credentials" @@ -22,35 +22,27 @@ import ( grpchealth "google.golang.org/grpc/health/grpc_health_v1" ) -const stopWaitTime = 5 * time.Second +type serviceRegister func(srv *grpc.Server) -type Server struct { +type grpcServer struct { server.BaseServer server *grpc.Server registerService serviceRegister health *health.Server } -type serviceRegister func(srv *grpc.Server) +var _ server.Server = (*grpcServer)(nil) -var _ server.Server = (*Server)(nil) +func NewServer(ctx context.Context, cancel context.CancelFunc, name string, config server.Config, registerService serviceRegister, logger *slog.Logger) server.Server { + baseServer := server.NewBaseServer(ctx, cancel, name, config, logger) -func New(ctx context.Context, cancel context.CancelFunc, name string, config server.Config, registerService serviceRegister, logger *slog.Logger) server.Server { - listenFullAddress := fmt.Sprintf("%s:%s", config.Host, config.Port) - return &Server{ - BaseServer: server.BaseServer{ - Ctx: ctx, - Cancel: cancel, - Name: name, - Address: listenFullAddress, - Config: config, - Logger: logger, - }, + return &grpcServer{ + BaseServer: baseServer, registerService: registerService, } } -func (s *Server) Start() error { +func (s *grpcServer) Start() error { errCh := make(chan error) grpcServerOptions := []grpc.ServerOption{ grpc.StatsHandler(otelgrpc.NewServerHandler()), @@ -135,7 +127,7 @@ func (s *Server) Start() error { } } -func (s *Server) Stop() error { +func (s *grpcServer) Stop() error { defer s.Cancel() c := make(chan bool) go func() { @@ -145,7 +137,7 @@ func (s *Server) Stop() error { }() select { case <-c: - case <-time.After(stopWaitTime): + case <-time.After(server.StopWaitTime): } s.Logger.Info(fmt.Sprintf("%s gRPC service shutdown at %s", s.Name, s.Address)) diff --git a/internal/server/http/doc.go b/pkg/server/http/doc.go similarity index 100% rename from internal/server/http/doc.go rename to pkg/server/http/doc.go diff --git a/internal/server/http/http.go b/pkg/server/http/http.go similarity index 60% rename from internal/server/http/http.go rename to pkg/server/http/http.go index bc2fc04ab..d8a33332a 100644 --- a/internal/server/http/http.go +++ b/pkg/server/http/http.go @@ -8,41 +8,33 @@ import ( "fmt" "log/slog" "net/http" - "time" - "github.com/absmach/magistrala/internal/server" + "github.com/absmach/magistrala/pkg/server" ) const ( - stopWaitTime = 5 * time.Second httpProtocol = "http" httpsProtocol = "https" ) -type Server struct { +type httpServer struct { server.BaseServer server *http.Server } -var _ server.Server = (*Server)(nil) +var _ server.Server = (*httpServer)(nil) -func New(ctx context.Context, cancel context.CancelFunc, name string, config server.Config, handler http.Handler, logger *slog.Logger) server.Server { - listenFullAddress := fmt.Sprintf("%s:%s", config.Host, config.Port) - httpServer := &http.Server{Addr: listenFullAddress, Handler: handler} - return &Server{ - BaseServer: server.BaseServer{ - Ctx: ctx, - Cancel: cancel, - Name: name, - Address: listenFullAddress, - Config: config, - Logger: logger, - }, - server: httpServer, +func NewServer(ctx context.Context, cancel context.CancelFunc, name string, config server.Config, handler http.Handler, logger *slog.Logger) server.Server { + baseServer := server.NewBaseServer(ctx, cancel, name, config, logger) + hserver := &http.Server{Addr: baseServer.Address, Handler: handler} + + return &httpServer{ + BaseServer: baseServer, + server: hserver, } } -func (s *Server) Start() error { +func (s *httpServer) Start() error { errCh := make(chan error) s.Protocol = httpProtocol switch { @@ -66,11 +58,11 @@ func (s *Server) Start() error { } } -func (s *Server) Stop() error { +func (s *httpServer) Stop() error { defer s.Cancel() - ctxShutdown, cancelShutdown := context.WithTimeout(context.Background(), stopWaitTime) - defer cancelShutdown() - if err := s.server.Shutdown(ctxShutdown); err != nil { + ctx, cancel := context.WithTimeout(context.Background(), server.StopWaitTime) + defer cancel() + if err := s.server.Shutdown(ctx); err != nil { s.Logger.Error(fmt.Sprintf("%s service %s server error occurred during shutdown at %s: %s", s.Name, s.Protocol, s.Address, err)) return fmt.Errorf("%s service %s server error occurred during shutdown at %s: %w", s.Name, s.Protocol, s.Address, err) } diff --git a/internal/server/server.go b/pkg/server/server.go similarity index 69% rename from internal/server/server.go rename to pkg/server/server.go index 1085e5dca..1ae357e32 100644 --- a/internal/server/server.go +++ b/pkg/server/server.go @@ -9,13 +9,20 @@ import ( "os" "os/signal" "syscall" + "time" ) +const StopWaitTime = 5 * time.Second + +// Server is an interface that defines the methods to start and stop a server. type Server interface { + // Start starts the server. Start() error + // Stop stops the server. Stop() error } +// Config is a struct that contains the configuration for the server. type Config struct { Host string `env:"HOST" envDefault:"localhost"` Port string `env:"PORT" envDefault:""` @@ -35,6 +42,19 @@ type BaseServer struct { Protocol string } +func NewBaseServer(ctx context.Context, cancel context.CancelFunc, name string, config Config, logger *slog.Logger) BaseServer { + address := fmt.Sprintf("%s:%s", config.Host, config.Port) + + return BaseServer{ + Ctx: ctx, + Cancel: cancel, + Name: name, + Address: address, + Config: config, + Logger: logger, + } +} + func stopAllServer(servers ...Server) error { var err error for _, server := range servers { @@ -50,9 +70,10 @@ func stopAllServer(servers ...Server) error { return err } +// StopSignalHandler stops the server when a signal is received. func StopSignalHandler(ctx context.Context, cancel context.CancelFunc, logger *slog.Logger, svcName string, servers ...Server) error { var err error - c := make(chan os.Signal, 2) + c := make(chan os.Signal, 1) signal.Notify(c, syscall.SIGINT, syscall.SIGABRT) select { case sig := <-c: diff --git a/provision/api/endpoint.go b/provision/api/endpoint.go index ffe208765..5fc8773fd 100644 --- a/provision/api/endpoint.go +++ b/provision/api/endpoint.go @@ -6,7 +6,7 @@ package api import ( "context" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" "github.com/absmach/magistrala/provision" "github.com/go-kit/kit/endpoint" diff --git a/provision/api/endpoint_test.go b/provision/api/endpoint_test.go index 5fd21a5f5..937e26594 100644 --- a/provision/api/endpoint_test.go +++ b/provision/api/endpoint_test.go @@ -11,9 +11,9 @@ import ( "strings" "testing" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/internal/testsutil" mglog "github.com/absmach/magistrala/logger" + "github.com/absmach/magistrala/pkg/apiutil" svcerr "github.com/absmach/magistrala/pkg/errors/service" "github.com/absmach/magistrala/provision" "github.com/absmach/magistrala/provision/api" diff --git a/provision/api/requests.go b/provision/api/requests.go index 390653f41..323b98e8a 100644 --- a/provision/api/requests.go +++ b/provision/api/requests.go @@ -3,7 +3,7 @@ package api -import "github.com/absmach/magistrala/internal/apiutil" +import "github.com/absmach/magistrala/pkg/apiutil" type provisionReq struct { token string diff --git a/provision/api/requests_test.go b/provision/api/requests_test.go index 68f5158c2..16bb13ff3 100644 --- a/provision/api/requests_test.go +++ b/provision/api/requests_test.go @@ -7,8 +7,8 @@ import ( "fmt" "testing" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/internal/testsutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" "github.com/stretchr/testify/assert" ) diff --git a/provision/api/transport.go b/provision/api/transport.go index c2ced9b51..7c4771988 100644 --- a/provision/api/transport.go +++ b/provision/api/transport.go @@ -11,7 +11,7 @@ import ( "github.com/absmach/magistrala" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" "github.com/absmach/magistrala/provision" "github.com/go-chi/chi/v5" diff --git a/readers/api/endpoint.go b/readers/api/endpoint.go index bf225e8a7..846e81d3c 100644 --- a/readers/api/endpoint.go +++ b/readers/api/endpoint.go @@ -7,7 +7,7 @@ import ( "context" "github.com/absmach/magistrala" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" "github.com/absmach/magistrala/readers" diff --git a/readers/api/endpoint_test.go b/readers/api/endpoint_test.go index ca7d06064..682cebfd5 100644 --- a/readers/api/endpoint_test.go +++ b/readers/api/endpoint_test.go @@ -14,8 +14,8 @@ import ( "github.com/absmach/magistrala" authmocks "github.com/absmach/magistrala/auth/mocks" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/internal/testsutil" + "github.com/absmach/magistrala/pkg/apiutil" svcerr "github.com/absmach/magistrala/pkg/errors/service" "github.com/absmach/magistrala/pkg/transformers/senml" "github.com/absmach/magistrala/readers" diff --git a/readers/api/requests.go b/readers/api/requests.go index b1386a71f..c32be45b9 100644 --- a/readers/api/requests.go +++ b/readers/api/requests.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/readers" ) diff --git a/readers/api/transport.go b/readers/api/transport.go index 2c55d8a98..c604e3347 100644 --- a/readers/api/transport.go +++ b/readers/api/transport.go @@ -9,7 +9,7 @@ import ( "net/http" "github.com/absmach/magistrala" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" "github.com/absmach/magistrala/readers" diff --git a/things/api/grpc/endpoint_test.go b/things/api/grpc/endpoint_test.go index 3f3440218..7e681466c 100644 --- a/things/api/grpc/endpoint_test.go +++ b/things/api/grpc/endpoint_test.go @@ -12,7 +12,7 @@ import ( "github.com/absmach/magistrala" "github.com/absmach/magistrala/auth" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" grpcapi "github.com/absmach/magistrala/things/api/grpc" diff --git a/things/api/grpc/server.go b/things/api/grpc/server.go index 4c79a900a..01cc0e99e 100644 --- a/things/api/grpc/server.go +++ b/things/api/grpc/server.go @@ -8,7 +8,7 @@ import ( "github.com/absmach/magistrala" "github.com/absmach/magistrala/auth" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" "github.com/absmach/magistrala/things" diff --git a/things/api/http/channels.go b/things/api/http/channels.go index 6eccffff1..37d358619 100644 --- a/things/api/http/channels.go +++ b/things/api/http/channels.go @@ -12,8 +12,8 @@ import ( "github.com/absmach/magistrala/auth" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" gapi "github.com/absmach/magistrala/internal/groups/api" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" "github.com/absmach/magistrala/pkg/groups" "github.com/go-chi/chi/v5" diff --git a/things/api/http/clients.go b/things/api/http/clients.go index 33c5ec903..759e2f169 100644 --- a/things/api/http/clients.go +++ b/things/api/http/clients.go @@ -11,7 +11,7 @@ import ( "strings" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" mgclients "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" "github.com/absmach/magistrala/things" diff --git a/things/api/http/endpoints.go b/things/api/http/endpoints.go index 244cf71d9..8e6d8d28b 100644 --- a/things/api/http/endpoints.go +++ b/things/api/http/endpoints.go @@ -7,7 +7,7 @@ import ( "context" "github.com/absmach/magistrala/auth" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" mgclients "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" "github.com/absmach/magistrala/pkg/groups" diff --git a/things/api/http/endpoints_test.go b/things/api/http/endpoints_test.go index 4762505d6..a0346ac43 100644 --- a/things/api/http/endpoints_test.go +++ b/things/api/http/endpoints_test.go @@ -14,9 +14,9 @@ import ( "github.com/0x6flab/namegenerator" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/internal/testsutil" mglog "github.com/absmach/magistrala/logger" + "github.com/absmach/magistrala/pkg/apiutil" mgclients "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" diff --git a/things/api/http/requests.go b/things/api/http/requests.go index 7bbd43b60..42ef86424 100644 --- a/things/api/http/requests.go +++ b/things/api/http/requests.go @@ -5,7 +5,7 @@ package http import ( "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" mgclients "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" diff --git a/things/api/http/requests_test.go b/things/api/http/requests_test.go index c3ffcbdcf..e3d9ee501 100644 --- a/things/api/http/requests_test.go +++ b/things/api/http/requests_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/internal/testsutil" + "github.com/absmach/magistrala/pkg/apiutil" mgclients "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" diff --git a/things/postgres/clients.go b/things/postgres/clients.go index b8f581c8f..e07e88373 100644 --- a/things/postgres/clients.go +++ b/things/postgres/clients.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "github.com/absmach/magistrala/internal/postgres" mgclients "github.com/absmach/magistrala/pkg/clients" pgclients "github.com/absmach/magistrala/pkg/clients/postgres" "github.com/absmach/magistrala/pkg/errors" repoerr "github.com/absmach/magistrala/pkg/errors/repository" + "github.com/absmach/magistrala/pkg/postgres" ) var _ mgclients.Repository = (*clientRepo)(nil) diff --git a/things/postgres/setup_test.go b/things/postgres/setup_test.go index 894abbbb0..01087b150 100644 --- a/things/postgres/setup_test.go +++ b/things/postgres/setup_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - pgclient "github.com/absmach/magistrala/internal/clients/postgres" - "github.com/absmach/magistrala/internal/postgres" + "github.com/absmach/magistrala/pkg/postgres" + pgclient "github.com/absmach/magistrala/pkg/postgres" cpostgres "github.com/absmach/magistrala/things/postgres" "github.com/jmoiron/sqlx" "github.com/ory/dockertest/v3" diff --git a/twins/api/http/endpoint.go b/twins/api/http/endpoint.go index de0df8293..b51ac5a9f 100644 --- a/twins/api/http/endpoint.go +++ b/twins/api/http/endpoint.go @@ -6,7 +6,7 @@ package http import ( "context" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" "github.com/absmach/magistrala/twins" "github.com/go-kit/kit/endpoint" diff --git a/twins/api/http/endpoint_twins_test.go b/twins/api/http/endpoint_twins_test.go index e6b721ead..8f8391055 100644 --- a/twins/api/http/endpoint_twins_test.go +++ b/twins/api/http/endpoint_twins_test.go @@ -15,9 +15,9 @@ import ( "github.com/absmach/magistrala" authmocks "github.com/absmach/magistrala/auth/mocks" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/internal/testsutil" mglog "github.com/absmach/magistrala/logger" + "github.com/absmach/magistrala/pkg/apiutil" svcerr "github.com/absmach/magistrala/pkg/errors/service" "github.com/absmach/magistrala/twins" httpapi "github.com/absmach/magistrala/twins/api/http" diff --git a/twins/api/http/requests.go b/twins/api/http/requests.go index 45f52baf0..e7c8c9f34 100644 --- a/twins/api/http/requests.go +++ b/twins/api/http/requests.go @@ -4,7 +4,7 @@ package http import ( - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/twins" ) diff --git a/twins/api/http/transport.go b/twins/api/http/transport.go index 88bc32195..443cfaf44 100644 --- a/twins/api/http/transport.go +++ b/twins/api/http/transport.go @@ -12,7 +12,7 @@ import ( "github.com/absmach/magistrala" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" "github.com/absmach/magistrala/twins" "github.com/go-chi/chi/v5" diff --git a/users/api/clients.go b/users/api/clients.go index b41aa49e6..35862e549 100644 --- a/users/api/clients.go +++ b/users/api/clients.go @@ -13,7 +13,7 @@ import ( "github.com/absmach/magistrala/auth" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" mgclients "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" "github.com/absmach/magistrala/pkg/oauth2" diff --git a/users/api/endpoint_test.go b/users/api/endpoint_test.go index e91a58c6c..991223ccf 100644 --- a/users/api/endpoint_test.go +++ b/users/api/endpoint_test.go @@ -15,9 +15,9 @@ import ( "github.com/absmach/magistrala" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/internal/testsutil" mglog "github.com/absmach/magistrala/logger" + "github.com/absmach/magistrala/pkg/apiutil" mgclients "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" svcerr "github.com/absmach/magistrala/pkg/errors/service" diff --git a/users/api/endpoints.go b/users/api/endpoints.go index 2e77bedae..a9f4c4d33 100644 --- a/users/api/endpoints.go +++ b/users/api/endpoints.go @@ -6,7 +6,7 @@ package api import ( "context" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" mgclients "github.com/absmach/magistrala/pkg/clients" "github.com/absmach/magistrala/pkg/errors" "github.com/absmach/magistrala/users" diff --git a/users/api/groups.go b/users/api/groups.go index 50dc036dd..8362ae37a 100644 --- a/users/api/groups.go +++ b/users/api/groups.go @@ -11,8 +11,8 @@ import ( "github.com/absmach/magistrala/auth" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" gapi "github.com/absmach/magistrala/internal/groups/api" + "github.com/absmach/magistrala/pkg/apiutil" "github.com/absmach/magistrala/pkg/errors" "github.com/absmach/magistrala/pkg/groups" "github.com/go-chi/chi/v5" diff --git a/users/api/requests.go b/users/api/requests.go index f27de1634..bfbfc3372 100644 --- a/users/api/requests.go +++ b/users/api/requests.go @@ -5,7 +5,7 @@ package api import ( "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" + "github.com/absmach/magistrala/pkg/apiutil" mgclients "github.com/absmach/magistrala/pkg/clients" ) diff --git a/users/api/requests_test.go b/users/api/requests_test.go index e822d2c1d..4e94c3aea 100644 --- a/users/api/requests_test.go +++ b/users/api/requests_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/absmach/magistrala/internal/api" - "github.com/absmach/magistrala/internal/apiutil" "github.com/absmach/magistrala/internal/testsutil" + "github.com/absmach/magistrala/pkg/apiutil" mgclients "github.com/absmach/magistrala/pkg/clients" "github.com/stretchr/testify/assert" ) diff --git a/users/postgres/clients.go b/users/postgres/clients.go index 8ce544eb0..cc4c8e2ab 100644 --- a/users/postgres/clients.go +++ b/users/postgres/clients.go @@ -7,11 +7,11 @@ import ( "context" "fmt" - "github.com/absmach/magistrala/internal/postgres" mgclients "github.com/absmach/magistrala/pkg/clients" pgclients "github.com/absmach/magistrala/pkg/clients/postgres" "github.com/absmach/magistrala/pkg/errors" repoerr "github.com/absmach/magistrala/pkg/errors/repository" + "github.com/absmach/magistrala/pkg/postgres" ) var _ mgclients.Repository = (*clientRepo)(nil) diff --git a/users/postgres/setup_test.go b/users/postgres/setup_test.go index fc3143563..5bab7167a 100644 --- a/users/postgres/setup_test.go +++ b/users/postgres/setup_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - pgclient "github.com/absmach/magistrala/internal/clients/postgres" - "github.com/absmach/magistrala/internal/postgres" + "github.com/absmach/magistrala/pkg/postgres" + pgclient "github.com/absmach/magistrala/pkg/postgres" upostgres "github.com/absmach/magistrala/users/postgres" "github.com/jmoiron/sqlx" "github.com/ory/dockertest/v3"