SMQ-2629 - Remove Readers and Consumers (#2641)

Signed-off-by: Felix Gateru <[email protected]>
absmach · Jan 10, 2025 · a916927 · a916927
1 parent df5d752
commit a916927
Show file tree

Hide file tree

Showing 122 changed files with 6 additions and 13,684 deletions.
diff --git a/.github/workflows/api-tests.yml b/.github/workflows/api-tests.yml
@@ -14,13 +14,11 @@ on:
       - "certs/api/**"
       - "channels/api/http/**"
       - "clients/api/http/**"
-      - "consumers/notifiers/api/**"
       - "domains/api/http/**"
       - "groups/api/http/**"
       - "http/api/**"
       - "invitations/api/**"
       - "journal/api/**"
-      - "readers/api/**"
       - "users/api/**"
 
 env:
@@ -38,8 +36,6 @@ env:
   INVITATIONS_URL: http://localhost:9020
   AUTH_URL: http://localhost:9001
   CERTS_URL: http://localhost:9019
-  POSTGRES_READER_URL: http://localhost:9009
-  TIMESCALE_READER_URL: http://localhost:9011
   JOURNAL_URL: http://localhost:9021
 
 jobs:
@@ -104,11 +100,6 @@ jobs:
               - "apidocs/openapi/invitations.yml"
               - "invitations/api/**"
 
-            readers:
-              - ".github/workflows/api-tests.yml"
-              - "apidocs/openapi/readers.yml"
-              - "readers/api/**"
-
             clients:
               - ".github/workflows/api-tests.yml"
               - "apidocs/openapi/clients.yml"

diff --git a/.github/workflows/check-generated-files.yml b/.github/workflows/check-generated-files.yml
@@ -62,10 +62,6 @@ jobs:
               - "users/emailer.go"
               - "users/hasher.go"
               - "mqtt/events/streams.go"
-              - "readers/messages.go"
-              - "consumers/notifiers/notifier.go"
-              - "consumers/notifiers/service.go"
-              - "consumers/notifiers/subscriptions.go"
               - "certs/certs.go"
               - "certs/pki/vault.go"
               - "certs/service.go"
@@ -145,9 +141,6 @@ jobs:
           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/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 ./clients/private/mocks/service.go ./clients/private/mocks/service.go.tmp
@@ -206,9 +199,6 @@ jobs:
           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 ./clients/private/mocks/service.go " ./clients/private/mocks/service.go"

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -131,19 +131,6 @@ jobs:
               - "clients/**"
               - "pkg/messaging/**"
 
-            consumers:
-              - "consumers/**"
-              - "cmd/postgres-writer/**"
-              - "cmd/timescale-writer/**"
-              - "cmd/smpp-notifier/**"
-              - "cmd/smtp-notifier/**"
-              - "auth.pb.go"
-              - "auth_grpc.pb.go"
-              - "auth/**"
-              - "pkg/ulid/**"
-              - "pkg/uuid/**"
-              - "pkg/messaging/**"
-
             domains:
               - "domain/**"
               - "cmd/domain/**"
@@ -225,14 +212,12 @@ jobs:
               - "pkg/groups/**"
               - "auth/**"
               - "certs/**"
-              - "consumers/**"
               - "http/**"
               - "internal/*"
               - "internal/api/**"
               - "internal/apiutil/**"
               - "internal/groups/**"
               - "invitations/**"
-              - "readers/**"
               - "clients/**"
               - "users/**"
 
@@ -245,15 +230,6 @@ jobs:
             pkg-uuid:
               - "pkg/uuid/**"
 
-            readers:
-              - "readers/**"
-              - "cmd/postgres-reader/**"
-              - "cmd/timescale-reader/**"
-              - "auth.pb.go"
-              - "auth_grpc.pb.go"
-              - "clients/**"
-              - "auth/**"
-
             users:
               - "users/**"
               - "cmd/users/**"
@@ -306,11 +282,6 @@ jobs:
         run: |
           go test --race -v -count=1 -coverprofile=coverage/coap.out ./coap/...
 
-      - name: Run consumers tests
-        if: steps.changes.outputs.consumers == 'true' || steps.changes.outputs.workflow == 'true'
-        run: |
-          go test --race -v -count=1 -coverprofile=coverage/consumers.out ./consumers/...
-
       - name: Run HTTP tests
         if: steps.changes.outputs.http == 'true' || steps.changes.outputs.workflow == 'true'
         run: |
@@ -376,11 +347,6 @@ jobs:
         run: |
           go test --race -v -count=1 -coverprofile=coverage/pkg-uuid.out ./pkg/uuid/...
 
-      - name: Run readers tests
-        if: steps.changes.outputs.readers == 'true' || steps.changes.outputs.workflow == 'true'
-        run: |
-          go test --race -v -count=1 -coverprofile=coverage/readers.out ./readers/...
-
       - name: Run clients tests
         if: steps.changes.outputs.clients == 'true' || steps.changes.outputs.workflow == 'true'
         run: |

diff --git a/Makefile b/Makefile
@@ -3,9 +3,8 @@
 
 SMQ_DOCKER_IMAGE_NAME_PREFIX ?= supermq
 BUILD_DIR ?= build
-SERVICES = auth users clients groups channels domains http coap ws postgres-writer postgres-reader timescale-writer \
-	timescale-reader cli mqtt certs invitations journal
-TEST_API_SERVICES = journal auth certs http invitations notifiers readers clients users channels groups domains
+SERVICES = auth users clients groups channels domains http coap ws cli mqtt certs invitations journal
+TEST_API_SERVICES = journal auth certs http invitations clients users channels groups domains
 TEST_API = $(addprefix test_api_,$(TEST_API_SERVICES))
 DOCKERS = $(addprefix docker_,$(SERVICES))
 DOCKERS_DEV = $(addprefix docker_dev_,$(SERVICES))
@@ -73,7 +72,7 @@ define make_docker_dev
 		-f docker/Dockerfile.dev ./build
 endef
 
-ADDON_SERVICES = journal certs timescale-reader timescale-writer postgres-reader postgres-writer
+ADDON_SERVICES = journal certs
 
 EXTERNAL_SERVICES = vault prometheus
 
@@ -176,7 +175,6 @@ test_api_http: TEST_API_URL := http://localhost:8008
 test_api_invitations: TEST_API_URL := http://localhost:9020
 test_api_auth: TEST_API_URL := http://localhost:9001
 test_api_certs: TEST_API_URL := http://localhost:9019
-test_api_readers: TEST_API_URL := http://localhost:9009 # This can be the URL of any reader service.
 test_api_journal: TEST_API_URL := http://localhost:9021
 
 $(TEST_API):