Merge pull request #475 from openreplay/integrations_refactoring

Integrations to golang standart filestructure

backend/build.sh

@@ -18,25 +18,13 @@ check_prereq() {
     return
 }
 
-
 function build_service() {
     image="$1"
     echo "BUILDING $image"
-    case "$image" in
-        http | db | sink | ender | heuristics | storage | assets)
-            echo build http
-            docker build -t ${DOCKER_REPO:-'local'}/$image:${git_sha1} --platform linux/amd64 --build-arg SERVICE_NAME=$image -f ./cmd/Dockerfile .
-            [[ $PUSH_IMAGE -eq 1 ]] && {
-                docker push ${DOCKER_REPO:-'local'}/$image:${git_sha1}
-            }
-            ;;
-        *)
-            docker build -t ${DOCKER_REPO:-'local'}/$image:${git_sha1}  --platform linux/amd64 --build-arg SERVICE_NAME=$image .
-            [[ $PUSH_IMAGE -eq 1 ]] && {
-                docker push ${DOCKER_REPO:-'local'}/$image:${git_sha1}
-            }
-            ;;
-    esac
+    docker build -t ${DOCKER_REPO:-'local'}/$image:${git_sha1} --platform linux/amd64 --build-arg SERVICE_NAME=$image -f ./cmd/Dockerfile .
+    [[ $PUSH_IMAGE -eq 1 ]] && {
+        docker push ${DOCKER_REPO:-'local'}/$image:${git_sha1}
+    }
     return
 }
 
@@ -50,7 +38,7 @@ function build_api(){
         build_service $2
         return
     }
-    for image in $(ls services);
+    for image in $(ls cmd);
     do
         build_service $image
         echo "::set-output name=image::${DOCKER_REPO:-'local'}/$image:${git_sha1}"

backend/cmd/integrations/main.go

@@ -2,6 +2,8 @@ package main
 
 import (
 	"log"
+	config "openreplay/backend/internal/config/integrations"
+	"openreplay/backend/internal/integrations/clientManager"
 	"time"
 
 	"os"
@@ -9,23 +11,21 @@ import (
 	"syscall"
 
 	"openreplay/backend/pkg/db/postgres"
-	"openreplay/backend/pkg/env"
 	"openreplay/backend/pkg/intervals"
 	"openreplay/backend/pkg/messages"
 	"openreplay/backend/pkg/queue"
 	"openreplay/backend/pkg/token"
-	"openreplay/backend/services/integrations/clientManager"
 )
 
 func main() {
 	log.SetFlags(log.LstdFlags | log.LUTC | log.Llongfile)
-	TOPIC_RAW_WEB := env.String("TOPIC_RAW_WEB")
-	POSTGRES_STRING := env.String("POSTGRES_STRING")
 
-	pg := postgres.NewConn(POSTGRES_STRING)
+	cfg := config.New()
+
+	pg := postgres.NewConn(cfg.PostgresURI)
 	defer pg.Close()
 
-	tokenizer := token.NewTokenizer(env.String("TOKEN_SECRET"))
+	tokenizer := token.NewTokenizer(cfg.TokenSecret)
 
 	manager := clientManager.NewManager()
 
@@ -45,7 +45,7 @@ func main() {
 	producer := queue.NewProducer()
 	defer producer.Close(15000)
 
-	listener, err := postgres.NewIntegrationsListener(POSTGRES_STRING)
+	listener, err := postgres.NewIntegrationsListener(cfg.PostgresURI)
 	if err != nil {
 		log.Printf("Postgres listener error: %v\n", err)
 		log.Fatalf("Postgres listener error")
@@ -81,7 +81,7 @@ func main() {
 				sessionID = sessData.ID
 			}
 			// TODO: send to ready-events topic. Otherwise it have to go through the events worker.
-			producer.Produce(TOPIC_RAW_WEB, sessionID, messages.Encode(event.RawErrorEvent))
+			producer.Produce(cfg.TopicRawWeb, sessionID, messages.Encode(event.RawErrorEvent))
 		case err := <-manager.Errors:
 			log.Printf("Integration error: %v\n", err)
 		case i := <-manager.RequestDataUpdates:

backend/internal/config/integrations/config.go

@@ -0,0 +1,17 @@
+package integrations
+
+import "openreplay/backend/pkg/env"
+
+type Config struct {
+	TopicRawWeb string
+	PostgresURI string
+	TokenSecret string
+}
+
+func New() *Config {
+	return &Config{
+		TopicRawWeb: env.String("TOPIC_RAW_WEB"),
+		PostgresURI: env.String("POSTGRES_STRING"),
+		TokenSecret: env.String("TOKEN_SECRET"),
+	}
+}

backend/internal/integrations/clientManager/manager.go

@@ -1,10 +1,10 @@
 package clientManager
 
 import (
+	"openreplay/backend/internal/integrations/integration"
 	"strconv"
 
 	"openreplay/backend/pkg/db/postgres"
-	"openreplay/backend/services/integrations/integration"
 )
 
 type manager struct {