Merge pull request #43 from bancodobrasil/fix/refactoring-router-group

fix: refactoring router group

.env.sample

@@ -3,4 +3,8 @@ FEATWS_API_GITLAB_TOKEN=123123d12d12d1
 FEATWS_API_GITLAB_URL=https://gitlab.com/api/v4
 FEATWS_API_GITLAB_NAMESPACE=teste-featws
 FEATWS_API_GITLAB_PREFIX=rules-
-FEATWS_API_GITLAB_DEFAULT_BRANCH=main
+FEATWS_API_GITLAB_DEFAULT_BRANCH=main
+TELEMETRY_DISABLED=false
+TELEMETRY_HTTPCLIENT_TLS=false
+TELEMETRY_EXPORTER_JAEGER_AGENT_HOST=localhost
+TELEMETRY_ENVIRONMENT=local

main.go

@@ -9,7 +9,6 @@ import (
 	_ "github.com/bancodobrasil/featws-api/docs"
 	"github.com/bancodobrasil/featws-api/routes"
 	ginMonitor "github.com/bancodobrasil/gin-monitor"
-	telemetry "github.com/bancodobrasil/gin-telemetry"
 	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
@@ -77,14 +76,14 @@ func main() {
 	router.Use(ginlogrus.Logger(log.StandardLogger()), gin.Recovery())
 	router.Use(monitor.Prometheus())
 	router.GET("metrics", gin.WrapH(promhttp.Handler()))
-	// inject middleware
-	router.Use(telemetry.Middleware("featws-api"))
-
+	// Setup Routers of health resources, swagger and home endpoint
+	routes.SetupRoutes(router)
 	configCors := cors.DefaultConfig()
 	configCors.AllowOrigins = strings.Split(cfg.AllowOrigins, ",")
 	router.Use(cors.New(configCors))
 
-	routes.SetupRoutes(router)
+	// Setup API routers
+	routes.APIRoutes(router)
 
 	port := cfg.Port
 

routes/apiRoutes.go

@@ -0,0 +1,7 @@
+package routes
+
+// import (
+// 	"github.com/bancodobrasil/featws-api/routes/api"
+// 	telemetry "github.com/bancodobrasil/gin-telemetry"
+// 	"github.com/gin-gonic/gin"
+// )

routes/routes.go

@@ -5,6 +5,7 @@ import (
 	"github.com/bancodobrasil/featws-api/docs"
 	"github.com/bancodobrasil/featws-api/routes/api"
 	"github.com/bancodobrasil/featws-api/routes/health"
+	telemetry "github.com/bancodobrasil/gin-telemetry"
 	"github.com/gin-gonic/gin"
 	ginSwagger "github.com/swaggo/gin-swagger"
 	"github.com/swaggo/gin-swagger/swaggerFiles"
@@ -18,8 +19,14 @@ func SetupRoutes(router *gin.Engine) {
 	docs.SwaggerInfo.Host = cfg.ExternalHost
 
 	homeRouter(router.Group("/"))
-	api.Router(router.Group("/api"))
 	health.Router(router.Group("/health"))
 	// setup swagger docs
 	router.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
 }
+
+// APIRoutes define all api routes
+func APIRoutes(router *gin.Engine) {
+	// inject middleware
+	router.Use(telemetry.Middleware("featws-api"))
+	api.Router(router.Group("/api"))
+}

services/rulesheets.go

@@ -9,6 +9,7 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
+// FindOptions ...
 type FindOptions struct {
 	Limit int
 	Page  int