Stephan Lo
7b062612f5
This commit introduces a significant architectural refactoring to decouple the driven adapter from low-level infrastructure concerns, adhering more strictly to the principles of Hexagonal Architecture. Problem: The driven adapter in `internal/adapters/driven/edgeconnect` was responsible for both adapting data structures and handling direct HTTP communication, authentication, and request/response logic. This violated the separation of concerns, making the adapter difficult to test and maintain. Solution: A new infrastructure layer has been created at `internal/infrastructure`. This layer now contains all the low-level details of interacting with the EdgeConnect API. Key Changes: - **New Infrastructure Layer:** Created `internal/infrastructure` to house components that connect to external systems. - **Generic HTTP Client:** A new, generic `edgeconnect_client` was created in `internal/infrastructure/edgeconnect_client`. It is responsible for authentication, making HTTP requests, and handling raw responses. It has no knowledge of the application's domain models. - **Config & Transport Moved:** The `config` and `http` (now `transport`) packages were moved into the infrastructure layer, as they are details of how the application is configured and communicates. - **Consolidated Driven Adapter:** The logic from the numerous old adapter files (`apps.go`, `cloudlet.go`, etc.) has been consolidated into a single, true adapter at `internal/adapters/driven/edgeconnect/adapter.go`. - **Clear Responsibility:** The new `adapter.go` is now solely responsible for: 1. Implementing the driven port (repository) interfaces. 2. Translating domain models into the data structures required by the `edgeconnect_client`. 3. Calling the `edgeconnect_client` to perform the API operations. 4. Translating the results back into domain models. - **Updated Dependency Injection:** The application's entry point (`cmd/cli/main.go`) has been updated to construct and inject dependencies according to the new architecture: `infra_client` -> `adapter` -> `service` -> `cli_command`. - **SDK & Apply Command:** The SDK examples and the `apply` command have been updated to use the new adapter and its repository methods, removing all direct client instantiation.
56 lines
2.3 KiB
Go
56 lines
2.3 KiB
Go
package main
|
|
|
|
import (
|
|
"log"
|
|
"os"
|
|
|
|
"edp.buildth.ing/DevFW-CICD/edge-connect-client/internal/adapters/driven/edgeconnect"
|
|
"edp.buildth.ing/DevFW-CICD/edge-connect-client/internal/adapters/driving/cli"
|
|
"edp.buildth.ing/DevFW-CICD/edge-connect-client/internal/application/app"
|
|
"edp.buildth.ing/DevFW-CICD/edge-connect-client/internal/application/cloudlet"
|
|
"edp.buildth.ing/DevFW-CICD/edge-connect-client/internal/application/instance"
|
|
"edp.buildth.ing/DevFW-CICD/edge-connect-client/internal/application/organization"
|
|
"edp.buildth.ing/DevFW-CICD/edge-connect-client/internal/infrastructure/edgeconnect_client"
|
|
)
|
|
|
|
func main() {
|
|
// Hexagonal Architecture Wiring
|
|
|
|
// 1. Infrastructure Layer: Create the low-level EdgeConnect client
|
|
baseURL := getEnvOrDefault("EDGE_CONNECT_BASE_URL", "https://console.mobiledgex.net")
|
|
username := os.Getenv("EDGE_CONNECT_USERNAME")
|
|
password := os.Getenv("EDGE_CONNECT_PASSWORD")
|
|
|
|
// Use a logger for the infrastructure client
|
|
logger := log.New(os.Stderr, "[edgeconnect-client] ", log.LstdFlags)
|
|
clientOpts := []edgeconnect_client.Option{
|
|
edgeconnect_client.WithLogger(logger),
|
|
}
|
|
|
|
var infraClient *edgeconnect_client.Client
|
|
if username != "" && password != "" {
|
|
infraClient = edgeconnect_client.NewClientWithCredentials(baseURL, username, password, clientOpts...)
|
|
} else {
|
|
infraClient = edgeconnect_client.NewClient(baseURL, clientOpts...)
|
|
}
|
|
|
|
// 2. Adapter Layer: Create the driven adapter, injecting the infrastructure client.
|
|
// This adapter implements the repository interfaces required by the application layer.
|
|
edgeConnectAdapter := edgeconnect.NewAdapter(infraClient)
|
|
|
|
// 3. Application Layer: Create services, injecting the adapter (which fulfills the repository port).
|
|
appService := app.NewService(edgeConnectAdapter)
|
|
instanceService := instance.NewService(edgeConnectAdapter)
|
|
cloudletService := cloudlet.NewService(edgeConnectAdapter)
|
|
organizationService := organization.NewService(edgeConnectAdapter)
|
|
|
|
// 4. Driving Adapter (Presentation Layer): Execute the CLI, injecting the application services.
|
|
cli.ExecuteWithServices(appService, instanceService, cloudletService, organizationService)
|
|
}
|
|
|
|
func getEnvOrDefault(key, defaultValue string) string {
|
|
if value := os.Getenv(key); value != "" {
|
|
return value
|
|
}
|
|
return defaultValue
|
|
}
|