wip: prefix apis

.air.toml

@@ -0,0 +1,10 @@
+# .air.toml
+root = "."
+tmp_dir = "tmp"
+[build]
+  cmd = "go build -o ./tmp/main cmd/api/main.go"
+  bin = "./tmp/main"
+  delay = 1000 # ms
+  exclude_dir = ["assets", "tmp", "vendor"]
+  include_ext = ["go", "tpl", "tmpl", "html"]
+  exclude_regex = ["_test\\.go"]

.gitignore

@@ -15,11 +15,12 @@
 # Test binary, built with `go test -c`
 *.test
 
-# Output of the go coverage tool, specifically when used with LiteIDE
+# Output of the go coverage ctool, specifically when used with LiteIDE
 *.out
 
 # Dependency directories (remove the comment below to include it)
 # vendor/
+tmp
 
 # Go workspace file
 go.work

api/api.yml

@@ -6,20 +6,24 @@ info:
   description: |
     # Introduction
 
-    The Typhoon API allows you to NATS.io
+    Typhoon is an event bridge for applications and services.
   license:
     name: Apache 2.0
     url: 'https://www.apache.org/licenses/LICENSE-2.0.html'
 
 servers:
-  - url: http://localhost:8080
+  - url: /v1
 
 tags:
   - name: System
     description: |-
-      These are the NATS.io that are managed by Typhoon.
+      These are the system managed by Typhoon.
   - name: Team
-  - name: Server
+    description: |-
+      These are the teams that are using Typhoon.
+  - name: Triggers
+    description: |-
+      These are the triggers that are used to send events to Typhoon.
 
 consumes:
   - "application/json"

api/config.client.yml

@@ -1,6 +1,6 @@
-package: api
+package: apis
 generate:
   client: true
-output: api/client.gen.go
+output: pkg/apis/client.gen.go
 output-options:
   skip-prune: true

api/config.models.yml

@@ -1,7 +1,7 @@
-package: api
+package: apis
 generate:
   models: true
   embedded-spec: true
-output: examples/api/models.gen.go
+output: pkg/apis/models.gen.go
 output-options:
   skip-prune: true

api/config.server.yml

@@ -1,8 +1,8 @@
-package: api
+package: apis
 generate:
   fiber-server: true
   strict-server: true
-output: api/server.gen.go
+output: pkg/apis/server.gen.go
 output-options:
   skip-prune: true
 

cmd/api/main.go

@@ -5,11 +5,9 @@ import (
 	"log"
 	"os"
 
-	"github.com/zeiss/typhoon/internal/adapter"
-	"github.com/zeiss/typhoon/internal/adapter/handlers"
-	"github.com/zeiss/typhoon/internal/config"
-	"github.com/zeiss/typhoon/internal/controllers"
-	"github.com/zeiss/typhoon/internal/services/api"
+	"github.com/zeiss/typhoon/internal/api/adapter"
+	"github.com/zeiss/typhoon/internal/api/config"
+	"github.com/zeiss/typhoon/internal/api/services"
 
 	"github.com/katallaxie/pkg/logger"
 	"github.com/katallaxie/pkg/server"
@@ -60,18 +58,11 @@ func run(ctx context.Context) error {
 		return err
 	}
 
-	db := adapter.NewDB(conn)
+	// db := adapter.NewDB(conn)
 	srv, _ := server.WithContext(ctx)
 
-	teamsCtrl := controllers.NewTeamsController(db)
-
-	h := adapter.NewHandlers(
-		handlers.NewTeamsHandler(teamsCtrl),
-		handlers.NewSystemsHandler(),
-		handlers.NewVersionHandler(),
-	)
-
-	service := api.New(cfg, h)
+	h := adapter.NewHandlers()
+	service := services.NewWebSrv(cfg, h)
 
 	srv.Listen(service, true)
 	if err := srv.Wait(); err != nil {

docker-compose.yml

@@ -85,6 +85,7 @@ volumes:
   east1:
   west1:
   central1:
+  db:
 
 
 networks:

internal/adapter/db.go → internal/api/adapter/db.go

@@ -3,9 +3,9 @@ package adapter
 import (
 	"context"
 
-	openapi "github.com/zeiss/typhoon/api"
-	"github.com/zeiss/typhoon/internal/models"
-	"github.com/zeiss/typhoon/internal/ports"
+	"github.com/zeiss/typhoon/internal/api/models"
+	"github.com/zeiss/typhoon/internal/api/ports"
+	openapi "github.com/zeiss/typhoon/pkg/apis"
 
 	openapi_types "github.com/oapi-codegen/runtime/types"
 	"gorm.io/gorm"

internal/api/adapter/handlers.go

@@ -0,0 +1,17 @@
+package adapter
+
+import (
+	openapi "github.com/zeiss/typhoon/pkg/apis"
+)
+
+var _ openapi.StrictServerInterface = (*Handlers)(nil)
+
+// Handlers ...
+type Handlers struct {
+	openapi.Unimplemented
+}
+
+// NewHandlers ...
+func NewHandlers() *Handlers {
+	return &Handlers{}
+}

internal/config/migration.go → internal/api/config/migration.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	"github.com/zeiss/typhoon/internal/models"
+	"github.com/zeiss/typhoon/internal/api/models"
 	"gorm.io/gorm"
 )
 

internal/controllers/teams.go → internal/api/controllers/teams.go

@@ -3,9 +3,9 @@ package controllers
 import (
 	"context"
 
-	openapi "github.com/zeiss/typhoon/api"
-	"github.com/zeiss/typhoon/internal/models"
-	"github.com/zeiss/typhoon/internal/ports"
+	"github.com/zeiss/typhoon/internal/api/models"
+	"github.com/zeiss/typhoon/internal/api/ports"
+	openapi "github.com/zeiss/typhoon/pkg/apis"
 
 	openapi_types "github.com/oapi-codegen/runtime/types"
 )

internal/models/teams.go → internal/api/models/teams.go

@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	openapi "github.com/zeiss/typhoon/api"
+	openapi "github.com/zeiss/typhoon/pkg/apis"
 	"gorm.io/gorm"
 )
 

internal/ports/teams.go → internal/api/ports/teams.go

@@ -4,8 +4,8 @@ import (
 	"context"
 
 	openapi_types "github.com/oapi-codegen/runtime/types"
-	openapi "github.com/zeiss/typhoon/api"
-	"github.com/zeiss/typhoon/internal/models"
+	"github.com/zeiss/typhoon/internal/api/models"
+	openapi "github.com/zeiss/typhoon/pkg/apis"
 )
 
 // Teams ...