feat: Preserve comprehensive CHORUS enhancements and P2P improvements
This commit preserves substantial development work including: ## Core Infrastructure: - **Bootstrap Pool Manager** (pkg/bootstrap/pool_manager.go): Advanced peer discovery and connection management for distributed CHORUS clusters - **Runtime Configuration System** (pkg/config/runtime_config.go): Dynamic configuration updates and assignment-based role management - **Cryptographic Key Derivation** (pkg/crypto/key_derivation.go): Secure key management for P2P networking and DHT operations ## Enhanced Monitoring & Operations: - **Comprehensive Monitoring Stack**: Added Prometheus and Grafana services with full metrics collection, alerting, and dashboard visualization - **License Gate System** (internal/licensing/license_gate.go): Advanced license validation with circuit breaker patterns - **Enhanced P2P Configuration**: Improved networking configuration for better peer discovery and connection reliability ## Health & Reliability: - **DHT Health Check Fix**: Temporarily disabled problematic DHT health checks to prevent container shutdown issues - **Enhanced License Validation**: Improved error handling and retry logic for license server communication ## Docker & Deployment: - **Optimized Container Configuration**: Updated Dockerfile and compose configurations for better resource management and networking - **Static Binary Support**: Proper compilation flags for Alpine containers This work addresses the P2P networking issues that were preventing proper leader election in CHORUS clusters and establishes the foundation for reliable distributed operation. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -2,6 +2,7 @@ package licensing
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
@@ -21,35 +22,60 @@ type LicenseConfig struct {
|
||||
}
|
||||
|
||||
// Validator handles license validation with KACHING
|
||||
// Enhanced with license gate for burst-proof validation
|
||||
type Validator struct {
|
||||
config LicenseConfig
|
||||
kachingURL string
|
||||
client *http.Client
|
||||
gate *LicenseGate // New: License gate for scaling support
|
||||
}
|
||||
|
||||
// NewValidator creates a new license validator
|
||||
// NewValidator creates a new license validator with enhanced scaling support
|
||||
func NewValidator(config LicenseConfig) *Validator {
|
||||
kachingURL := config.KachingURL
|
||||
if kachingURL == "" {
|
||||
kachingURL = DefaultKachingURL
|
||||
}
|
||||
|
||||
return &Validator{
|
||||
|
||||
validator := &Validator{
|
||||
config: config,
|
||||
kachingURL: kachingURL,
|
||||
client: &http.Client{
|
||||
Timeout: LicenseTimeout,
|
||||
},
|
||||
}
|
||||
|
||||
// Initialize license gate for scaling support
|
||||
validator.gate = NewLicenseGate(config)
|
||||
|
||||
return validator
|
||||
}
|
||||
|
||||
// Validate performs license validation with KACHING license authority
|
||||
// CRITICAL: CHORUS will not start without valid license validation
|
||||
// Enhanced with caching, circuit breaker, and lease token support
|
||||
func (v *Validator) Validate() error {
|
||||
return v.ValidateWithContext(context.Background())
|
||||
}
|
||||
|
||||
// ValidateWithContext performs license validation with context and agent ID
|
||||
func (v *Validator) ValidateWithContext(ctx context.Context) error {
|
||||
if v.config.LicenseID == "" || v.config.ClusterID == "" {
|
||||
return fmt.Errorf("license ID and cluster ID are required")
|
||||
}
|
||||
|
||||
// Use enhanced license gate for validation
|
||||
agentID := "default-agent" // TODO: Get from config/environment
|
||||
if err := v.gate.Validate(ctx, agentID); err != nil {
|
||||
// Fallback to legacy validation for backward compatibility
|
||||
fmt.Printf("⚠️ License gate validation failed, trying legacy validation: %v\n", err)
|
||||
return v.validateLegacy()
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// validateLegacy performs the original license validation (for fallback)
|
||||
func (v *Validator) validateLegacy() error {
|
||||
// Prepare validation request
|
||||
request := map[string]interface{}{
|
||||
"license_id": v.config.LicenseID,
|
||||
@@ -66,7 +92,7 @@ func (v *Validator) Validate() error {
|
||||
return fmt.Errorf("failed to marshal license request: %w", err)
|
||||
}
|
||||
|
||||
// Call KACHING license authority
|
||||
// Call KACHING license authority
|
||||
licenseURL := fmt.Sprintf("%s/v1/license/activate", v.kachingURL)
|
||||
resp, err := v.client.Post(licenseURL, "application/json", bytes.NewReader(requestBody))
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user