move config,schema,logger out of internal

surendratiwari3 · Mar 6, 2024 · 4fe2c7b · 4fe2c7b
1 parent 84c1bab
commit 4fe2c7b
Show file tree

Hide file tree

Showing 38 changed files with 58 additions and 58 deletions.
diff --git a/api/handlers/task_handler.go b/api/handlers/task_handler.go
@@ -7,9 +7,9 @@ import (
 	"github.com/go-playground/validator/v10"
 	"github.com/google/uuid"
 	"github.com/labstack/echo/v4"
-	"github.com/surendratiwari3/paota/internal/logger"
-	"github.com/surendratiwari3/paota/internal/schema"
-	"github.com/surendratiwari3/paota/internal/schema/errors"
+	"github.com/surendratiwari3/paota/logger"
+	"github.com/surendratiwari3/paota/schema"
+	"github.com/surendratiwari3/paota/schema/errors"
 	"github.com/surendratiwari3/paota/workerpool"
 	"io/ioutil"
 	"net/http"

diff --git a/api/main.go b/api/main.go
@@ -4,8 +4,8 @@ import (
 	"github.com/labstack/echo/v4"
 	"github.com/sirupsen/logrus"
 	"github.com/surendratiwari3/paota/api/handlers"
-	"github.com/surendratiwari3/paota/internal/config"
-	"github.com/surendratiwari3/paota/internal/logger"
+	"github.com/surendratiwari3/paota/config"
+	"github.com/surendratiwari3/paota/logger"
 )
 
 func main() {

diff --git a/bench/amqpnostorage/consumer/benchmark_test.go b/bench/amqpnostorage/consumer/benchmark_test.go
@@ -2,8 +2,8 @@ package consumer
 
 import (
 	"github.com/surendratiwari3/paota/bench/amqpnostorage"
-	"github.com/surendratiwari3/paota/internal/logger"
-	"github.com/surendratiwari3/paota/internal/schema"
+	"github.com/surendratiwari3/paota/logger"
+	"github.com/surendratiwari3/paota/schema"
 	"github.com/surendratiwari3/paota/workerpool"
 	"testing"
 	"time"

diff --git a/bench/amqpnostorage/publisher/benchmark_test.go b/bench/amqpnostorage/publisher/benchmark_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"github.com/surendratiwari3/paota/bench/amqpnostorage"
-	"github.com/surendratiwari3/paota/internal/schema"
+	"github.com/surendratiwari3/paota/schema"
 	"github.com/surendratiwari3/paota/workerpool"
 	"testing"
 )

diff --git a/bench/amqpnostorage/setup.go b/bench/amqpnostorage/setup.go
@@ -3,8 +3,8 @@ package amqpnostorage
 import (
 	"context"
 	"github.com/sirupsen/logrus"
-	"github.com/surendratiwari3/paota/internal/config"
-	"github.com/surendratiwari3/paota/internal/logger"
+	"github.com/surendratiwari3/paota/config"
+	"github.com/surendratiwari3/paota/logger"
 	"github.com/surendratiwari3/paota/workerpool"
 	"os"
 )

diff --git a/internal/config/amqp.go → config/amqp.go b/internal/config/amqp.go → config/amqp.go
diff --git a/internal/config/config.go → config/config.go b/internal/config/config.go → config/config.go
diff --git a/internal/config/config_test.go → config/config_test.go b/internal/config/config_test.go → config/config_test.go
diff --git a/internal/config/mongodb.go → config/mongodb.go b/internal/config/mongodb.go → config/mongodb.go
diff --git a/example/consumer/main.go b/example/consumer/main.go
@@ -3,12 +3,12 @@ package main
 import (
 	"context"
 	"github.com/sirupsen/logrus"
-	"github.com/surendratiwari3/paota/internal/config"
-	"github.com/surendratiwari3/paota/internal/schema"
+	"github.com/surendratiwari3/paota/config"
+	"github.com/surendratiwari3/paota/schema"
 	"github.com/surendratiwari3/paota/workerpool"
 
 	//"github.com/surendratiwari3/paota/example/task"
-	"github.com/surendratiwari3/paota/internal/logger"
+	"github.com/surendratiwari3/paota/logger"
 	"os"
 )
 

diff --git a/example/publisher/main.go b/example/publisher/main.go
@@ -4,13 +4,13 @@ import (
 	"context"
 	"encoding/json"
 	"github.com/sirupsen/logrus"
-	"github.com/surendratiwari3/paota/internal/config"
-	"github.com/surendratiwari3/paota/internal/schema"
+	"github.com/surendratiwari3/paota/config"
+	"github.com/surendratiwari3/paota/schema"
 	"github.com/surendratiwari3/paota/workerpool"
 	"sync"
 
 	//"github.com/surendratiwari3/paota/example/task"
-	"github.com/surendratiwari3/paota/internal/logger"
+	"github.com/surendratiwari3/paota/logger"
 	"os"
 )
 

diff --git a/internal/broker/amqp/broker.go b/internal/broker/amqp/broker.go
@@ -5,13 +5,13 @@ import (
 	"encoding/json"
 	"fmt"
 	amqp "github.com/rabbitmq/amqp091-go"
+	"github.com/surendratiwari3/paota/config"
 	"github.com/surendratiwari3/paota/internal/broker"
-	"github.com/surendratiwari3/paota/internal/config"
-	"github.com/surendratiwari3/paota/internal/logger"
 	"github.com/surendratiwari3/paota/internal/provider"
-	"github.com/surendratiwari3/paota/internal/schema"
-	"github.com/surendratiwari3/paota/internal/schema/errors"
 	"github.com/surendratiwari3/paota/internal/workergroup"
+	"github.com/surendratiwari3/paota/logger"
+	"github.com/surendratiwari3/paota/schema"
+	"github.com/surendratiwari3/paota/schema/errors"
 	"sync"
 	"time"
 )

diff --git a/internal/broker/amqp/broker_test.go b/internal/broker/amqp/broker_test.go
@@ -5,7 +5,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
-	"github.com/surendratiwari3/paota/internal/config"
+	"github.com/surendratiwari3/paota/config"
 	"github.com/surendratiwari3/paota/internal/provider"
 	"testing"
 )

diff --git a/internal/broker/broker_interface.go b/internal/broker/broker_interface.go
@@ -2,8 +2,8 @@ package broker
 
 import (
 	"context"
-	"github.com/surendratiwari3/paota/internal/schema"
 	"github.com/surendratiwari3/paota/internal/workergroup"
+	"github.com/surendratiwari3/paota/schema"
 )
 
 // Broker - a common interface for all brokers

diff --git a/internal/factory/factory.go b/internal/factory/factory.go
@@ -1,13 +1,13 @@
 package factory
 
 import (
+	"github.com/surendratiwari3/paota/config"
 	"github.com/surendratiwari3/paota/internal/broker"
 	amqpBroker "github.com/surendratiwari3/paota/internal/broker/amqp"
-	"github.com/surendratiwari3/paota/internal/config"
-	"github.com/surendratiwari3/paota/internal/logger"
-	appErrors "github.com/surendratiwari3/paota/internal/schema/errors"
 	"github.com/surendratiwari3/paota/internal/task"
 	"github.com/surendratiwari3/paota/internal/task/memory"
+	"github.com/surendratiwari3/paota/logger"
+	appErrors "github.com/surendratiwari3/paota/schema/errors"
 )
 
 type IFactory interface {

diff --git a/internal/provider/amqp.go b/internal/provider/amqp.go
@@ -3,8 +3,8 @@ package provider
 import (
 	"context"
 	amqp "github.com/rabbitmq/amqp091-go"
-	"github.com/surendratiwari3/paota/internal/config"
-	"github.com/surendratiwari3/paota/internal/schema/errors"
+	"github.com/surendratiwari3/paota/config"
+	"github.com/surendratiwari3/paota/schema/errors"
 	"sync"
 	"time"
 )

diff --git a/internal/provider/amqp_test.go b/internal/provider/amqp_test.go
@@ -3,8 +3,8 @@ package provider
 import (
 	amqp "github.com/rabbitmq/amqp091-go"
 	"github.com/stretchr/testify/assert"
-	"github.com/surendratiwari3/paota/internal/config"
-	"github.com/surendratiwari3/paota/internal/schema/errors"
+	"github.com/surendratiwari3/paota/config"
+	"github.com/surendratiwari3/paota/schema/errors"
 	"testing"
 )
 

diff --git a/internal/schema/errors/task.go b/internal/schema/errors/task.go
diff --git a/internal/store/backend_interface.go b/internal/store/backend_interface.go
@@ -1,7 +1,7 @@
 package store
 
 import (
-	"github.com/surendratiwari3/paota/internal/schema"
+	"github.com/surendratiwari3/paota/schema"
 )
 
 // Backend - a common interface for all result Store

diff --git a/internal/task/memory/task.go b/internal/task/memory/task.go
@@ -9,12 +9,12 @@ import (
 	"github.com/surendratiwari3/paota/internal/broker"
 	"github.com/surendratiwari3/paota/internal/task"
 
-	"github.com/surendratiwari3/paota/internal/config"
-	"github.com/surendratiwari3/paota/internal/logger"
-	"github.com/surendratiwari3/paota/internal/schema"
-	appError "github.com/surendratiwari3/paota/internal/schema/errors"
+	"github.com/surendratiwari3/paota/config"
 	"github.com/surendratiwari3/paota/internal/utils"
 	"github.com/surendratiwari3/paota/internal/validation"
+	"github.com/surendratiwari3/paota/logger"
+	"github.com/surendratiwari3/paota/schema"
+	appError "github.com/surendratiwari3/paota/schema/errors"
 	"sync"
 	"time"
 )

diff --git a/internal/task/memory/task_test.go b/internal/task/memory/task_test.go
@@ -5,7 +5,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/surendratiwari3/paota/internal/broker"
-	"github.com/surendratiwari3/paota/internal/schema"
+	"github.com/surendratiwari3/paota/schema"
 	"testing"
 )
 

diff --git a/internal/task/task_interface.go b/internal/task/task_interface.go
@@ -2,7 +2,7 @@ package task
 
 import (
 	"context"
-	"github.com/surendratiwari3/paota/internal/schema"
+	"github.com/surendratiwari3/paota/schema"
 )
 
 type TaskRegistrarInterface interface {

diff --git a/internal/validation/validation.go b/internal/validation/validation.go
@@ -1,7 +1,7 @@
 package validation
 
 import (
-	"github.com/surendratiwari3/paota/internal/schema/errors"
+	"github.com/surendratiwari3/paota/schema/errors"
 	"reflect"
 )
 

diff --git a/internal/workergroup/workergroup.go b/internal/workergroup/workergroup.go
@@ -1,8 +1,8 @@
 package workergroup
 
 import (
-	"github.com/surendratiwari3/paota/internal/logger"
 	"github.com/surendratiwari3/paota/internal/task"
+	"github.com/surendratiwari3/paota/logger"
 	"sync"
 )
 

diff --git a/internal/logger/logger.go → logger/logger.go b/internal/logger/logger.go → logger/logger.go
diff --git a/internal/logger/logger_interface.go → logger/logger_interface.go b/internal/logger/logger_interface.go → logger/logger_interface.go
diff --git a/internal/schema/amqp.go → schema/amqp.go b/internal/schema/amqp.go → schema/amqp.go
diff --git a/internal/schema/errors/broker.go → schema/errors/broker.go b/internal/schema/errors/broker.go → schema/errors/broker.go
@@ -4,5 +4,5 @@ import "errors"
 
 var (
 	ErrUnsupportedBroker = errors.New("unsupported broker")
-	ErrEmptyMessage      = errors.New("Received an empty message")
+	ErrEmptyMessage      = errors.New("received an empty message")
 )
diff --git a/internal/schema/errors/config.go → schema/errors/config.go b/internal/schema/errors/config.go → schema/errors/config.go
diff --git a/internal/schema/errors/connection.go → schema/errors/connection.go b/internal/schema/errors/connection.go → schema/errors/connection.go
diff --git a/internal/schema/errors/retry.go → schema/errors/retry.go b/internal/schema/errors/retry.go → schema/errors/retry.go
diff --git a/internal/schema/errors/store.go → schema/errors/store.go b/internal/schema/errors/store.go → schema/errors/store.go
diff --git a/schema/errors/task.go b/schema/errors/task.go
@@ -0,0 +1,13 @@
+package errors
+
+import "errors"
+
+var (
+	// ErrTaskMustBeFunc ...
+	ErrTaskNotRegistered = errors.New("task not registered")
+	ErrTaskMustBeFunc    = errors.New("task must be a func type")
+	// ErrTaskReturnsNoValue ...
+	ErrTaskReturnsNoValue = errors.New("task must return at least a single value")
+	// ErrLastReturnValueMustBeError ..
+	ErrLastReturnValueMustBeError = errors.New("last return value of a task must be error")
+)
diff --git a/internal/schema/errors/worker.go → schema/errors/worker.go b/internal/schema/errors/worker.go → schema/errors/worker.go
diff --git a/internal/schema/task.go → schema/task.go b/internal/schema/task.go → schema/task.go
diff --git a/workerpool/workerpool.go b/workerpool/workerpool.go
@@ -5,13 +5,13 @@ import (
 	"errors"
 	"fmt"
 	"github.com/google/uuid"
+	"github.com/surendratiwari3/paota/config"
 	"github.com/surendratiwari3/paota/internal/broker"
-	"github.com/surendratiwari3/paota/internal/config"
 	"github.com/surendratiwari3/paota/internal/factory"
-	"github.com/surendratiwari3/paota/internal/logger"
-	"github.com/surendratiwari3/paota/internal/schema"
 	"github.com/surendratiwari3/paota/internal/store"
 	"github.com/surendratiwari3/paota/internal/task"
+	"github.com/surendratiwari3/paota/logger"
+	"github.com/surendratiwari3/paota/schema"
 
 	"github.com/surendratiwari3/paota/internal/workergroup"
 	"os"

diff --git a/workerpool/workerpool_interface.go b/workerpool/workerpool_interface.go
@@ -3,8 +3,8 @@ package workerpool
 import (
 	"context"
 	"github.com/surendratiwari3/paota/internal/broker"
-	"github.com/surendratiwari3/paota/internal/schema"
 	"github.com/surendratiwari3/paota/internal/store"
+	"github.com/surendratiwari3/paota/schema"
 )
 
 type Pool interface {

diff --git a/workerpool/workerpool_test.go b/workerpool/workerpool_test.go
@@ -5,11 +5,11 @@ import (
 	"errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
+	"github.com/surendratiwari3/paota/config"
 	"github.com/surendratiwari3/paota/internal/broker"
-	"github.com/surendratiwari3/paota/internal/config"
 	"github.com/surendratiwari3/paota/internal/factory"
-	"github.com/surendratiwari3/paota/internal/schema"
 	"github.com/surendratiwari3/paota/internal/task"
+	"github.com/surendratiwari3/paota/schema"
 	"os"
 	"testing"
 	"time"