MG-2456 - Refactor architecture (absmach#2494)

Signed-off-by: Felix Gateru <[email protected]> Signed-off-by: Arvindh <[email protected]> Signed-off-by: Dusan Borovcanin <[email protected]> Co-authored-by: Arvindh <[email protected]> Co-authored-by: Felix Gateru <[email protected]>
ianmuchyri · Dec 2, 2024 · da1717c · da1717c
1 parent 927291f
commit da1717c
Show file tree

Hide file tree

Showing 535 changed files with 65,334 additions and 39,432 deletions.
diff --git a/.github/workflows/api-tests.yml b/.github/workflows/api-tests.yml
@@ -19,7 +19,7 @@ on:
       - "journal/api/**"
       - "provision/api/**"
       - "readers/api/**"
-      - "things/api/**"
+      - "clients/api/**"
       - "users/api/**"
 
 env:
@@ -29,7 +29,7 @@ env:
   USER_SECRET: 12345678
   DOMAIN_NAME: demo-test
   USERS_URL: http://localhost:9002
-  THINGS_URL: http://localhost:9000
+  CLIENTS_URL: http://localhost:9000
   HTTP_ADAPTER_URL: http://localhost:8008
   INVITATIONS_URL: http://localhost:9020
   AUTH_URL: http://localhost:8189
@@ -65,8 +65,8 @@ jobs:
           export DOMAIN_ID=$(curl -sSX POST $DOMAINS_URL -H "Content-Type: application/json" -H "Authorization: Bearer $USER_TOKEN" -d "{\"name\":\"$DOMAIN_NAME\",\"alias\":\"$DOMAIN_NAME\"}" | jq -r .id)
           export USER_TOKEN=$(curl -sSX POST $TOKENS_URL -H "Content-Type: application/json" -d "{\"identity\": \"$USER_IDENTITY\",\"secret\": \"$USER_SECRET\",\"domain_id\": \"$DOMAIN_ID\"}" | jq -r .access_token)
           echo "USER_TOKEN=$USER_TOKEN" >> $GITHUB_ENV
-          export THING_SECRET=$(magistrala-cli provision test | /usr/bin/grep -Eo '"secret": "[^"]+"' | awk 'NR % 2 == 0' | sed 's/"secret": "\(.*\)"/\1/')
-          echo "THING_SECRET=$THING_SECRET" >> $GITHUB_ENV
+          export CLIENT_SECRET=$(magistrala-cli provision test | /usr/bin/grep -Eo '"secret": "[^"]+"' | awk 'NR % 2 == 0' | sed 's/"secret": "\(.*\)"/\1/')
+          echo "CLIENT_SECRET=$CLIENT_SECRET" >> $GITHUB_ENV
 
       - name: Check for changes in specific paths
         uses: dorny/paths-filter@v3
@@ -113,10 +113,10 @@ jobs:
               - "api/openapi/readers.yml"
               - "readers/api/**"
 
-            things:
+            clients:
               - ".github/workflows/api-tests.yml"
-              - "api/openapi/things.yml"
-              - "things/api/**"
+              - "api/openapi/clients.yml"
+              - "clients/api/**"
 
             users:
               - ".github/workflows/api-tests.yml"
@@ -133,12 +133,12 @@ jobs:
           report: false
           args: '--header "Authorization: Bearer ${{ env.USER_TOKEN }}" --contrib-openapi-formats-uuid --hypothesis-suppress-health-check=filter_too_much --stateful=links'
 
-      - name: Run Things API tests
-        if: steps.changes.outputs.things == 'true'
+      - name: Run Clients API tests
+        if: steps.changes.outputs.clients == 'true'
         uses: schemathesis/action@v1
         with:
-          schema: api/openapi/things.yml
-          base-url: ${{ env.THINGS_URL }}
+          schema: api/openapi/clients.yml
+          base-url: ${{ env.CLIENTS_URL }}
           checks: all
           report: false
           args: '--header "Authorization: Bearer ${{ env.USER_TOKEN }}" --contrib-openapi-formats-uuid --hypothesis-suppress-health-check=filter_too_much --stateful=links'
@@ -151,7 +151,7 @@ jobs:
           base-url: ${{ env.HTTP_ADAPTER_URL }}
           checks: all
           report: false
-          args: '--header "Authorization: Thing ${{ env.THING_SECRET }}" --contrib-openapi-formats-uuid --hypothesis-suppress-health-check=filter_too_much --stateful=links'
+          args: '--header "Authorization: Client ${{ env.CLIENT_SECRET }}" --contrib-openapi-formats-uuid --hypothesis-suppress-health-check=filter_too_much --stateful=links'
 
       - name: Run Invitations API tests
         if: steps.changes.outputs.invitations == 'true'

diff --git a/.github/workflows/check-generated-files.yml b/.github/workflows/check-generated-files.yml
@@ -49,8 +49,8 @@ jobs:
               - "users/clients.go"
               - "pkg/clients/clients.go"
               - "pkg/messaging/pubsub.go"
-              - "things/postgres/clients.go"
-              - "things/things.go"
+              - "clients/postgres/clients.go"
+              - "clients/clients.go"
               - "pkg/authz.go"
               - "pkg/authn.go"
               - "auth/domains.go"
@@ -79,9 +79,9 @@ jobs:
       - name: Set up protoc
         if: steps.changes.outputs.proto == 'true'
         run: |
-          PROTOC_VERSION=27.1
-          PROTOC_GEN_VERSION=v1.34.2
-          PROTOC_GRPC_VERSION=v1.4.0
+          PROTOC_VERSION=28.3
+          PROTOC_GEN_VERSION=v1.35.2
+          PROTOC_GRPC_VERSION=v1.5.1
 
           # Export the variables so they are available in future steps
           echo "PROTOC_VERSION=$PROTOC_VERSION" >> $GITHUB_ENV
@@ -128,42 +128,56 @@ jobs:
           MOCKERY_VERSION=v2.43.2
           go install github.com/vektra/mockery/v2@$MOCKERY_VERSION
 
-          mv ./pkg/sdk/mocks/sdk.go ./pkg/sdk/mocks/sdk.go.tmp
-          mv ./users/mocks/repository.go ./users/mocks/repository.go.tmp
-          mv ./users/mocks/service.go ./users/mocks/service.go.tmp
-          mv ./pkg/messaging/mocks/pubsub.go ./pkg/messaging/mocks/pubsub.go.tmp
-          mv ./things/mocks/repository.go ./things/mocks/repository.go.tmp
-          mv ./things/mocks/service.go ./things/mocks/service.go.tmp
-          mv ./things/mocks/cache.go ./things/mocks/cache.go.tmp
+          mv ./invitations/mocks/repository.go ./invitations/mocks/repository.go.tmp
+          mv ./invitations/mocks/service.go ./invitations/mocks/service.go.tmp
+          mv ./auth/mocks/token_client.go ./auth/mocks/token_client.go.tmp
           mv ./auth/mocks/authz.go ./auth/mocks/authz.go.tmp
-          mv ./auth/mocks/domains.go ./auth/mocks/domains.go.tmp
           mv ./auth/mocks/keys.go ./auth/mocks/keys.go.tmp
           mv ./auth/mocks/service.go ./auth/mocks/service.go.tmp
-          mv ./auth/mocks/token_client.go ./auth/mocks/token_client.go.tmp
-          mv ./pkg/events/mocks/publisher.go ./pkg/events/mocks/publisher.go.tmp
-          mv ./pkg/events/mocks/subscriber.go ./pkg/events/mocks/subscriber.go.tmp
-          mv ./provision/mocks/service.go ./provision/mocks/service.go.tmp
-          mv ./pkg/groups/mocks/repository.go ./pkg/groups/mocks/repository.go.tmp
-          mv ./pkg/groups/mocks/service.go ./pkg/groups/mocks/service.go.tmp
-          mv ./bootstrap/mocks/service.go ./bootstrap/mocks/service.go.tmp
           mv ./bootstrap/mocks/configs.go ./bootstrap/mocks/configs.go.tmp
-          mv ./invitations/mocks/service.go ./invitations/mocks/service.go.tmp
-          mv ./invitations/mocks/repository.go ./invitations/mocks/repository.go.tmp
-          mv ./users/mocks/emailer.go ./users/mocks/emailer.go.tmp
+          mv ./bootstrap/mocks/config_reader.go ./bootstrap/mocks/config_reader.go.tmp
+          mv ./bootstrap/mocks/service.go ./bootstrap/mocks/service.go.tmp
+          mv ./domains/mocks/domains_client.go ./domains/mocks/domains_client.go.tmp
+          mv ./domains/mocks/repository.go ./domains/mocks/repository.go.tmp
+          mv ./domains/mocks/service.go ./domains/mocks/service.go.tmp
+          mv ./channels/mocks/repository.go ./channels/mocks/repository.go.tmp
+          mv ./channels/mocks/channels_client.go ./channels/mocks/channels_client.go.tmp
+          mv ./channels/mocks/service.go ./channels/mocks/service.go.tmp
+          mv ./groups/private/mocks/service.go ./groups/private/mocks/service.go.tmp
+          mv ./groups/mocks/repository.go ./groups/mocks/repository.go.tmp
+          mv ./groups/mocks/groups_client.go ./groups/mocks/groups_client.go.tmp
+          mv ./groups/mocks/service.go ./groups/mocks/service.go.tmp
           mv ./users/mocks/hasher.go ./users/mocks/hasher.go.tmp
-          mv ./mqtt/mocks/events.go ./mqtt/mocks/events.go.tmp
-          mv ./readers/mocks/messages.go ./readers/mocks/messages.go.tmp
+          mv ./users/mocks/emailer.go ./users/mocks/emailer.go.tmp
+          mv ./users/mocks/repository.go ./users/mocks/repository.go.tmp
+          mv ./users/mocks/service.go ./users/mocks/service.go.tmp
+          mv ./journal/mocks/repository.go ./journal/mocks/repository.go.tmp
+          mv ./journal/mocks/service.go ./journal/mocks/service.go.tmp
           mv ./consumers/notifiers/mocks/notifier.go ./consumers/notifiers/mocks/notifier.go.tmp
-          mv ./consumers/notifiers/mocks/service.go ./consumers/notifiers/mocks/service.go.tmp
           mv ./consumers/notifiers/mocks/repository.go ./consumers/notifiers/mocks/repository.go.tmp
+          mv ./consumers/notifiers/mocks/service.go ./consumers/notifiers/mocks/service.go.tmp
           mv ./certs/mocks/pki.go ./certs/mocks/pki.go.tmp
           mv ./certs/mocks/service.go ./certs/mocks/service.go.tmp
-          mv ./journal/mocks/repository.go ./journal/mocks/repository.go.tmp
-          mv ./journal/mocks/service.go ./journal/mocks/service.go.tmp
-          mv ./auth/mocks/domains_client.go ./auth/mocks/domains_client.go.tmp
-          mv ./things/mocks/things_client.go ./things/mocks/things_client.go.tmp
-          mv ./pkg/authz/mocks/authz.go ./pkg/authz/mocks/authz.go.tmp
+          mv ./provision/mocks/service.go ./provision/mocks/service.go.tmp
+          mv ./clients/private/mocks/service.go ./clients/private/mocks/service.go.tmp
+          mv ./clients/mocks/repository.go ./clients/mocks/repository.go.tmp
+          mv ./clients/mocks/clients_client.go ./clients/mocks/clients_client.go.tmp
+          mv ./clients/mocks/cache.go ./clients/mocks/cache.go.tmp
+          mv ./clients/mocks/service.go ./clients/mocks/service.go.tmp
+          mv ./mqtt/mocks/events.go ./mqtt/mocks/events.go.tmp
+          mv ./readers/mocks/messages.go ./readers/mocks/messages.go.tmp
+          mv ./pkg/sdk/mocks/sdk.go ./pkg/sdk/mocks/sdk.go.tmp
+          mv ./pkg/messaging/mocks/pubsub.go ./pkg/messaging/mocks/pubsub.go.tmp
           mv ./pkg/authn/mocks/authn.go ./pkg/authn/mocks/authn.go.tmp
+          mv ./pkg/roles/mocks/rolesRepo.go ./pkg/roles/mocks/rolesRepo.go.tmp
+          mv ./pkg/roles/mocks/provisioner.go ./pkg/roles/mocks/provisioner.go.tmp
+          mv ./pkg/roles/mocks/rolemanager.go ./pkg/roles/mocks/rolemanager.go.tmp
+          mv ./pkg/oauth2/mocks/provider.go ./pkg/oauth2/mocks/provider.go.tmp
+          mv ./pkg/authz/mocks/authz.go ./pkg/authz/mocks/authz.go.tmp
+          mv ./pkg/events/mocks/subscriber.go ./pkg/events/mocks/subscriber.go.tmp
+          mv ./pkg/events/mocks/publisher.go ./pkg/events/mocks/publisher.go.tmp
+          mv ./pkg/policies/mocks/evaluator.go ./pkg/policies/mocks/evaluator.go.tmp
+          mv ./pkg/policies/mocks/service.go ./pkg/policies/mocks/service.go.tmp
 
           make mocks
 
@@ -179,39 +193,53 @@ jobs:
             fi
           }
 
-          check_mock_changes ./pkg/sdk/mocks/sdk.go "SDK ./pkg/sdk/mocks/sdk.go"
-          check_mock_changes ./users/mocks/repository.go "Users Repository ./users/mocks/repository.go"
-          check_mock_changes ./users/mocks/service.go "Users Service ./users/mocks/service.go"
-          check_mock_changes ./pkg/messaging/mocks/pubsub.go "PubSub ./pkg/messaging/mocks/pubsub.go"
-          check_mock_changes ./things/mocks/repository.go "Things Repository ./things/mocks/repository.go"
-          check_mock_changes ./things/mocks/service.go "Things Service ./things/mocks/service.go"
-          check_mock_changes ./things/mocks/cache.go "Things Cache ./things/mocks/cache.go"
-          check_mock_changes ./auth/mocks/authz.go "Auth Authz ./auth/mocks/authz.go"
-          check_mock_changes ./auth/mocks/domains.go "Auth Domains ./auth/mocks/domains.go"
-          check_mock_changes ./auth/mocks/keys.go "Auth Keys ./auth/mocks/keys.go"
-          check_mock_changes ./auth/mocks/service.go "Auth Service ./auth/mocks/service.go"
-          check_mock_changes ./pkg/authn/mocks/authn.go "Authn Service Client .pkg/authn/mocks/authn.go"
-          check_mock_changes ./pkg/authz/mocks/authz.go "Authz Service Client .pkg/authz/mocks/authz.go"
-          check_mock_changes ./pkg/events/mocks/publisher.go "ES Publisher ./pkg/events/mocks/publisher.go"
-          check_mock_changes ./pkg/events/mocks/subscriber.go "EE Subscriber ./pkg/events/mocks/subscriber.go"
-          check_mock_changes ./provision/mocks/service.go "Provision Service ./provision/mocks/service.go"
-          check_mock_changes ./pkg/groups/mocks/repository.go "Groups Repository ./pkg/groups/mocks/repository.go"
-          check_mock_changes ./pkg/groups/mocks/service.go "Groups Service ./pkg/groups/mocks/service.go"
-          check_mock_changes ./bootstrap/mocks/service.go "Bootstrap Service ./bootstrap/mocks/service.go"
-          check_mock_changes ./bootstrap/mocks/configs.go "Bootstrap Repository ./bootstrap/mocks/configs.go"
-          check_mock_changes ./invitations/mocks/service.go "Invitations Service ./invitations/mocks/service.go"
-          check_mock_changes ./invitations/mocks/repository.go "Invitations Repository ./invitations/mocks/repository.go"
-          check_mock_changes ./users/mocks/emailer.go "Users Emailer ./users/mocks/emailer.go"
-          check_mock_changes ./users/mocks/hasher.go "Users Hasher ./users/mocks/hasher.go"
-          check_mock_changes ./mqtt/mocks/events.go "MQTT Events Store ./mqtt/mocks/events.go"
-          check_mock_changes ./readers/mocks/messages.go "Message Readers ./readers/mocks/messages.go"
-          check_mock_changes ./consumers/notifiers/mocks/notifier.go "Notifiers Notifier ./consumers/notifiers/mocks/notifier.go"
-          check_mock_changes ./consumers/notifiers/mocks/service.go "Notifiers Service ./consumers/notifiers/mocks/service.go"
-          check_mock_changes ./consumers/notifiers/mocks/repository.go "Notifiers Repository ./consumers/notifiers/mocks/repository.go"
-          check_mock_changes ./certs/mocks/pki.go "PKI ./certs/mocks/pki.go"
-          check_mock_changes ./certs/mocks/service.go "Certs Service ./certs/mocks/service.go"
-          check_mock_changes ./journal/mocks/repository.go "Journal Repository ./journal/mocks/repository.go"
-          check_mock_changes ./journal/mocks/service.go "Journal Service ./journal/mocks/service.go"
-          check_mock_changes ./auth/mocks/domains_client.go "Domains Service Client ./auth/mocks/domains_client.go"
-          check_mock_changes ./auth/mocks/token_client.go "Token Service Client ./auth/mocks/token_client.go"
-          check_mock_changes ./things/mocks/things_client.go "Things Service Client things/mocks/things_client.go"
+          check_mock_changes ./invitations/mocks/repository.go " ./invitations/mocks/repository.go"
+          check_mock_changes ./invitations/mocks/service.go " ./invitations/mocks/service.go"
+          check_mock_changes ./auth/mocks/token_client.go " ./auth/mocks/token_client.go"
+          check_mock_changes ./auth/mocks/authz.go " ./auth/mocks/authz.go"
+          check_mock_changes ./auth/mocks/keys.go " ./auth/mocks/keys.go"
+          check_mock_changes ./auth/mocks/service.go " ./auth/mocks/service.go"
+          check_mock_changes ./bootstrap/mocks/configs.go " ./bootstrap/mocks/configs.go"
+          check_mock_changes ./bootstrap/mocks/config_reader.go " ./bootstrap/mocks/config_reader.go"
+          check_mock_changes ./bootstrap/mocks/service.go " ./bootstrap/mocks/service.go"
+          check_mock_changes ./domains/mocks/domains_client.go " ./domains/mocks/domains_client.go"
+          check_mock_changes ./domains/mocks/repository.go " ./domains/mocks/repository.go"
+          check_mock_changes ./domains/mocks/service.go " ./domains/mocks/service.go"
+          check_mock_changes ./channels/mocks/repository.go " ./channels/mocks/repository.go"
+          check_mock_changes ./channels/mocks/channels_client.go " ./channels/mocks/channels_client.go"
+          check_mock_changes ./channels/mocks/service.go " ./channels/mocks/service.go"
+          check_mock_changes ./groups/private/mocks/service.go " ./groups/private/mocks/service.go"
+          check_mock_changes ./groups/mocks/repository.go " ./groups/mocks/repository.go"
+          check_mock_changes ./groups/mocks/groups_client.go " ./groups/mocks/groups_client.go"
+          check_mock_changes ./groups/mocks/service.go " ./groups/mocks/service.go"
+          check_mock_changes ./users/mocks/hasher.go " ./users/mocks/hasher.go"
+          check_mock_changes ./users/mocks/emailer.go " ./users/mocks/emailer.go"
+          check_mock_changes ./users/mocks/repository.go " ./users/mocks/repository.go"
+          check_mock_changes ./users/mocks/service.go " ./users/mocks/service.go"
+          check_mock_changes ./journal/mocks/repository.go " ./journal/mocks/repository.go"
+          check_mock_changes ./journal/mocks/service.go " ./journal/mocks/service.go"
+          check_mock_changes ./consumers/notifiers/mocks/notifier.go " ./consumers/notifiers/mocks/notifier.go"
+          check_mock_changes ./consumers/notifiers/mocks/repository.go " ./consumers/notifiers/mocks/repository.go"
+          check_mock_changes ./consumers/notifiers/mocks/service.go " ./consumers/notifiers/mocks/service.go"
+          check_mock_changes ./certs/mocks/pki.go " ./certs/mocks/pki.go"
+          check_mock_changes ./certs/mocks/service.go " ./certs/mocks/service.go"
+          check_mock_changes ./provision/mocks/service.go " ./provision/mocks/service.go"
+          check_mock_changes ./clients/private/mocks/service.go " ./clients/private/mocks/service.go"
+          check_mock_changes ./clients/mocks/repository.go " ./clients/mocks/repository.go"
+          check_mock_changes ./clients/mocks/clients_client.go " ./clients/mocks/clients_client.go"
+          check_mock_changes ./clients/mocks/cache.go " ./clients/mocks/cache.go"
+          check_mock_changes ./clients/mocks/service.go " ./clients/mocks/service.go"
+          check_mock_changes ./mqtt/mocks/events.go " ./mqtt/mocks/events.go"
+          check_mock_changes ./readers/mocks/messages.go " ./readers/mocks/messages.go"
+          check_mock_changes ./pkg/sdk/mocks/sdk.go " ./pkg/sdk/mocks/sdk.go"
+          check_mock_changes ./pkg/messaging/mocks/pubsub.go " ./pkg/messaging/mocks/pubsub.go"
+          check_mock_changes ./pkg/authn/mocks/authn.go " ./pkg/authn/mocks/authn.go"
+          check_mock_changes ./pkg/roles/mocks/rolesRepo.go " ./pkg/roles/mocks/rolesRepo.go"
+          check_mock_changes ./pkg/roles/mocks/provisioner.go " ./pkg/roles/mocks/provisioner.go"
+          check_mock_changes ./pkg/roles/mocks/rolemanager.go " ./pkg/roles/mocks/rolemanager.go"
+          check_mock_changes ./pkg/oauth2/mocks/provider.go " ./pkg/oauth2/mocks/provider.go"
+          check_mock_changes ./pkg/authz/mocks/authz.go " ./pkg/authz/mocks/authz.go"
+          check_mock_changes ./pkg/events/mocks/subscriber.go " ./pkg/events/mocks/subscriber.go"
+          check_mock_changes ./pkg/events/mocks/publisher.go " ./pkg/events/mocks/publisher.go"
+          check_mock_changes ./pkg/policies/mocks/evaluator.go " ./pkg/policies/mocks/evaluator.go"
+          check_mock_changes ./pkg/policies/mocks/service.go " ./pkg/policies/mocks/service.go"