NOISSUE - Move groups out of pkg (absmach#2493)

Signed-off-by: Arvindh <[email protected]>
nyagamunene · Oct 28, 2024 · 5136390 · 5136390
1 parent 8579830
commit 5136390
Show file tree

Hide file tree

Showing 55 changed files with 95 additions and 385 deletions.
diff --git a/cmd/groups/main.go b/cmd/groups/main.go
@@ -14,22 +14,22 @@ import (
 
 	chclient "github.com/absmach/callhome/pkg/client"
 	"github.com/absmach/magistrala"
-	gpsvc "github.com/absmach/magistrala/internal/groups"
-	grpcapi "github.com/absmach/magistrala/internal/groups/api/grpc"
-	httpapi "github.com/absmach/magistrala/internal/groups/api/http"
-	"github.com/absmach/magistrala/internal/groups/events"
-	"github.com/absmach/magistrala/internal/groups/middleware"
-	"github.com/absmach/magistrala/internal/groups/postgres"
-	"github.com/absmach/magistrala/internal/groups/tracing"
+	"github.com/absmach/magistrala/groups"
+	gpsvc "github.com/absmach/magistrala/groups"
+	grpcapi "github.com/absmach/magistrala/groups/api/grpc"
+	httpapi "github.com/absmach/magistrala/groups/api/http"
+	"github.com/absmach/magistrala/groups/events"
+	"github.com/absmach/magistrala/groups/middleware"
+	"github.com/absmach/magistrala/groups/postgres"
+	pgroups "github.com/absmach/magistrala/groups/private"
+	"github.com/absmach/magistrala/groups/tracing"
 	grpcChannelsV1 "github.com/absmach/magistrala/internal/grpc/channels/v1"
 	grpcGroupsV1 "github.com/absmach/magistrala/internal/grpc/groups/v1"
 	grpcThingsV1 "github.com/absmach/magistrala/internal/grpc/things/v1"
 	mglog "github.com/absmach/magistrala/logger"
 	authsvcAuthn "github.com/absmach/magistrala/pkg/authn/authsvc"
 	mgauthz "github.com/absmach/magistrala/pkg/authz"
 	authsvcAuthz "github.com/absmach/magistrala/pkg/authz/authsvc"
-	"github.com/absmach/magistrala/pkg/groups"
-	pgroups "github.com/absmach/magistrala/pkg/groups/private"
 	"github.com/absmach/magistrala/pkg/grpcclient"
 	jaegerclient "github.com/absmach/magistrala/pkg/jaeger"
 	"github.com/absmach/magistrala/pkg/policies"

diff --git a/cmd/provision/main.go b/cmd/provision/main.go
@@ -14,10 +14,10 @@ import (
 
 	chclient "github.com/absmach/callhome/pkg/client"
 	"github.com/absmach/magistrala"
+	"github.com/absmach/magistrala/channels"
 	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"
@@ -138,7 +138,7 @@ func loadConfig() (provision.Config, error) {
 
 	cfg.Bootstrap.Content = content
 	// This is default conf for provision if there is no config file
-	cfg.Channels = []mggroups.Group{
+	cfg.Channels = []channels.Channel{
 		{
 			Name:     "control-channel",
 			Metadata: map[string]interface{}{"type": "control"},

diff --git a/internal/groups/api/grpc/client.go → groups/api/grpc/client.go b/internal/groups/api/grpc/client.go → groups/api/grpc/client.go
diff --git a/internal/groups/api/grpc/doc.go → groups/api/grpc/doc.go b/internal/groups/api/grpc/doc.go → groups/api/grpc/doc.go
diff --git a/internal/groups/api/grpc/endpoint.go → groups/api/grpc/endpoint.go b/internal/groups/api/grpc/endpoint.go → groups/api/grpc/endpoint.go
@@ -6,7 +6,7 @@ package grpc
 import (
 	"context"
 
-	groups "github.com/absmach/magistrala/pkg/groups/private"
+	groups "github.com/absmach/magistrala/groups/private"
 	"github.com/go-kit/kit/endpoint"
 )
 

diff --git a/internal/groups/api/grpc/request.go → groups/api/grpc/request.go b/internal/groups/api/grpc/request.go → groups/api/grpc/request.go
diff --git a/internal/groups/api/grpc/responses.go → groups/api/grpc/responses.go b/internal/groups/api/grpc/responses.go → groups/api/grpc/responses.go
diff --git a/internal/groups/api/grpc/server.go → groups/api/grpc/server.go b/internal/groups/api/grpc/server.go → groups/api/grpc/server.go
@@ -7,12 +7,12 @@ import (
 	"context"
 
 	mgauth "github.com/absmach/magistrala/auth"
+	groups "github.com/absmach/magistrala/groups/private"
 	grpcCommonV1 "github.com/absmach/magistrala/internal/grpc/common/v1"
 	grpcGroupsV1 "github.com/absmach/magistrala/internal/grpc/groups/v1"
 	"github.com/absmach/magistrala/pkg/apiutil"
 	"github.com/absmach/magistrala/pkg/errors"
 	svcerr "github.com/absmach/magistrala/pkg/errors/service"
-	groups "github.com/absmach/magistrala/pkg/groups/private"
 	kitgrpc "github.com/go-kit/kit/transport/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

diff --git a/internal/groups/api/http/decode.go → groups/api/http/decode.go b/internal/groups/api/http/decode.go → groups/api/http/decode.go
@@ -9,11 +9,11 @@ import (
 	"net/http"
 	"strings"
 
+	mggroups "github.com/absmach/magistrala/groups"
 	"github.com/absmach/magistrala/internal/api"
 	"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"
 	"github.com/go-chi/chi/v5"
 )
 

diff --git a/internal/groups/api/http/decode_test.go → groups/api/http/decode_test.go b/internal/groups/api/http/decode_test.go → groups/api/http/decode_test.go
@@ -12,11 +12,11 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/absmach/magistrala/groups"
 	"github.com/absmach/magistrala/internal/api"
 	"github.com/absmach/magistrala/pkg/apiutil"
 	"github.com/absmach/magistrala/pkg/clients"
 	"github.com/absmach/magistrala/pkg/errors"
-	"github.com/absmach/magistrala/pkg/groups"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/internal/groups/api/http/doc.go → groups/api/http/doc.go b/internal/groups/api/http/doc.go → groups/api/http/doc.go
diff --git a/internal/groups/api/http/endpoint_test.go → groups/api/http/endpoint_test.go b/internal/groups/api/http/endpoint_test.go → groups/api/http/endpoint_test.go
diff --git a/internal/groups/api/http/endpoints.go → groups/api/http/endpoints.go b/internal/groups/api/http/endpoints.go → groups/api/http/endpoints.go
@@ -6,12 +6,12 @@ package api
 import (
 	"context"
 
+	"github.com/absmach/magistrala/groups"
 	"github.com/absmach/magistrala/internal/api"
 	"github.com/absmach/magistrala/pkg/apiutil"
 	"github.com/absmach/magistrala/pkg/authn"
 	"github.com/absmach/magistrala/pkg/errors"
 	svcerr "github.com/absmach/magistrala/pkg/errors/service"
-	"github.com/absmach/magistrala/pkg/groups"
 	"github.com/go-kit/kit/endpoint"
 )
 

diff --git a/internal/groups/api/http/requests.go → groups/api/http/requests.go b/internal/groups/api/http/requests.go → groups/api/http/requests.go
@@ -4,10 +4,10 @@
 package api
 
 import (
+	"github.com/absmach/magistrala/groups"
+	mggroups "github.com/absmach/magistrala/groups"
 	"github.com/absmach/magistrala/internal/api"
 	"github.com/absmach/magistrala/pkg/apiutil"
-	"github.com/absmach/magistrala/pkg/groups"
-	mggroups "github.com/absmach/magistrala/pkg/groups"
 )
 
 type createGroupReq struct {

diff --git a/internal/groups/api/http/requests_test.go → groups/api/http/requests_test.go b/internal/groups/api/http/requests_test.go → groups/api/http/requests_test.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/absmach/magistrala/groups"
 	"github.com/absmach/magistrala/internal/api"
 	"github.com/absmach/magistrala/pkg/apiutil"
-	"github.com/absmach/magistrala/pkg/groups"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/internal/groups/api/http/responses.go → groups/api/http/responses.go b/internal/groups/api/http/responses.go → groups/api/http/responses.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 
 	"github.com/absmach/magistrala"
-	"github.com/absmach/magistrala/pkg/groups"
+	"github.com/absmach/magistrala/groups"
 )
 
 var (

diff --git a/internal/groups/api/http/transport.go → groups/api/http/transport.go b/internal/groups/api/http/transport.go → groups/api/http/transport.go
@@ -6,10 +6,10 @@ package api
 import (
 	"log/slog"
 
+	"github.com/absmach/magistrala/groups"
 	"github.com/absmach/magistrala/internal/api"
 	"github.com/absmach/magistrala/pkg/apiutil"
 	"github.com/absmach/magistrala/pkg/authn"
-	"github.com/absmach/magistrala/pkg/groups"
 	roleManagerHttp "github.com/absmach/magistrala/pkg/roles/rolemanager/api"
 	"github.com/go-chi/chi/v5"
 	kithttp "github.com/go-kit/kit/transport/http"

diff --git a/pkg/groups/doc.go → groups/doc.go b/pkg/groups/doc.go → groups/doc.go
diff --git a/pkg/groups/errors.go → groups/errors.go b/pkg/groups/errors.go → groups/errors.go
diff --git a/internal/groups/events/doc.go → groups/events/doc.go b/internal/groups/events/doc.go → groups/events/doc.go
diff --git a/internal/groups/events/events.go → groups/events/events.go b/internal/groups/events/events.go → groups/events/events.go
@@ -6,8 +6,8 @@ package events
 import (
 	"time"
 
+	groups "github.com/absmach/magistrala/groups"
 	"github.com/absmach/magistrala/pkg/events"
-	groups "github.com/absmach/magistrala/pkg/groups"
 )
 
 var (

diff --git a/internal/groups/events/streams.go → groups/events/streams.go b/internal/groups/events/streams.go → groups/events/streams.go
@@ -6,10 +6,10 @@ package events
 import (
 	"context"
 
+	"github.com/absmach/magistrala/groups"
 	"github.com/absmach/magistrala/pkg/authn"
 	"github.com/absmach/magistrala/pkg/events"
 	"github.com/absmach/magistrala/pkg/events/store"
-	"github.com/absmach/magistrala/pkg/groups"
 	rmEvents "github.com/absmach/magistrala/pkg/roles/rolemanager/events"
 )
 

diff --git a/pkg/groups/groups.go → groups/groups.go b/pkg/groups/groups.go → groups/groups.go
diff --git a/internal/groups/middleware/authorization.go → groups/middleware/authorization.go b/internal/groups/middleware/authorization.go → groups/middleware/authorization.go
@@ -6,11 +6,11 @@ package middleware
 import (
 	"context"
 
+	"github.com/absmach/magistrala/groups"
 	"github.com/absmach/magistrala/pkg/authn"
 	"github.com/absmach/magistrala/pkg/authz"
 	mgauthz "github.com/absmach/magistrala/pkg/authz"
 	"github.com/absmach/magistrala/pkg/errors"
-	"github.com/absmach/magistrala/pkg/groups"
 	"github.com/absmach/magistrala/pkg/policies"
 	rmMW "github.com/absmach/magistrala/pkg/roles/rolemanager/middleware"
 	"github.com/absmach/magistrala/pkg/svcutil"

diff --git a/internal/groups/middleware/doc.go → groups/middleware/doc.go b/internal/groups/middleware/doc.go → groups/middleware/doc.go
diff --git a/internal/groups/middleware/logging.go → groups/middleware/logging.go b/internal/groups/middleware/logging.go → groups/middleware/logging.go
@@ -8,8 +8,8 @@ import (
 	"log/slog"
 	"time"
 
+	"github.com/absmach/magistrala/groups"
 	"github.com/absmach/magistrala/pkg/authn"
-	"github.com/absmach/magistrala/pkg/groups"
 	rmMW "github.com/absmach/magistrala/pkg/roles/rolemanager/middleware"
 )
 

diff --git a/internal/groups/middleware/metrics.go → groups/middleware/metrics.go b/internal/groups/middleware/metrics.go → groups/middleware/metrics.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"time"
 
+	"github.com/absmach/magistrala/groups"
 	"github.com/absmach/magistrala/pkg/authn"
-	"github.com/absmach/magistrala/pkg/groups"
 	rmMW "github.com/absmach/magistrala/pkg/roles/rolemanager/middleware"
 	"github.com/go-kit/kit/metrics"
 )

diff --git a/pkg/groups/mocks/doc.go → groups/mocks/doc.go b/pkg/groups/mocks/doc.go → groups/mocks/doc.go
diff --git a/pkg/groups/mocks/repository.go → groups/mocks/repository.go b/pkg/groups/mocks/repository.go → groups/mocks/repository.go
diff --git a/pkg/groups/mocks/service.go → groups/mocks/service.go b/pkg/groups/mocks/service.go → groups/mocks/service.go
diff --git a/pkg/groups/page.go → groups/page.go b/pkg/groups/page.go → groups/page.go
diff --git a/internal/groups/postgres/doc.go → groups/postgres/doc.go b/internal/groups/postgres/doc.go → groups/postgres/doc.go
diff --git a/internal/groups/postgres/groups.go → groups/postgres/groups.go b/internal/groups/postgres/groups.go → groups/postgres/groups.go
@@ -11,11 +11,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/absmach/magistrala/groups"
+	mggroups "github.com/absmach/magistrala/groups"
 	mgclients "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"
-	mggroups "github.com/absmach/magistrala/pkg/groups"
 	"github.com/absmach/magistrala/pkg/postgres"
 	rolesPostgres "github.com/absmach/magistrala/pkg/roles/repo/postgres"
 	"github.com/jmoiron/sqlx"

diff --git a/internal/groups/postgres/groups_test.go → groups/postgres/groups_test.go b/internal/groups/postgres/groups_test.go → groups/postgres/groups_test.go
@@ -11,12 +11,12 @@ import (
 	"time"
 
 	"github.com/0x6flab/namegenerator"
-	"github.com/absmach/magistrala/internal/groups/postgres"
+	"github.com/absmach/magistrala/groups"
+	"github.com/absmach/magistrala/groups/postgres"
 	"github.com/absmach/magistrala/internal/testsutil"
 	"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/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

diff --git a/internal/groups/postgres/init.go → groups/postgres/init.go b/internal/groups/postgres/init.go → groups/postgres/init.go
diff --git a/internal/groups/postgres/setup_test.go → groups/postgres/setup_test.go b/internal/groups/postgres/setup_test.go → groups/postgres/setup_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	gpostgres "github.com/absmach/magistrala/internal/groups/postgres"
+	gpostgres "github.com/absmach/magistrala/groups/postgres"
 	"github.com/absmach/magistrala/pkg/postgres"
 	pgclient "github.com/absmach/magistrala/pkg/postgres"
 	"github.com/jmoiron/sqlx"

diff --git a/pkg/groups/private/mocks/service.go → groups/private/mocks/service.go b/pkg/groups/private/mocks/service.go → groups/private/mocks/service.go
diff --git a/pkg/groups/private/service.go → groups/private/service.go b/pkg/groups/private/service.go → groups/private/service.go
@@ -3,7 +3,7 @@ package private
 import (
 	"context"
 
-	"github.com/absmach/magistrala/pkg/groups"
+	"github.com/absmach/magistrala/groups"
 )
 
 //go:generate mockery --name Service  --output=./mocks --filename service.go --quiet --note "Copyright (c) Abstract Machines"

diff --git a/internal/groups/roleactions.go → groups/roleactions.go b/internal/groups/roleactions.go → groups/roleactions.go