MEDIUM: cluster: add PUT and DELETE methods for cluster

Added a DELETE method to handle removing the cluster settings and
PUT method for setting the cluster logging.

Author: mjuraga

cmd/dataplaneapi/main.go

@@ -29,6 +29,7 @@ import (
 	"github.com/go-openapi/runtime/security"
 	flags "github.com/jessevdk/go-flags"
 
+	"github.com/haproxytech/client-native/v2/models"
 	"github.com/haproxytech/client-native/v2/storage"
 	"github.com/haproxytech/dataplaneapi"
 	"github.com/haproxytech/dataplaneapi/configuration"
@@ -172,7 +173,8 @@ func startServer(cfg *configuration.Configuration) (reload configuration.AtomicB
 		}
 	}
 
-	if err = log.InitWithConfiguration(cfg.LogTargets, cfg.Logging, cfg.Syslog); err != nil {
+	clusterLogTargets := parseClusterLogTargets(cfg)
+	if err = log.InitWithConfiguration(cfg.LogTargets, cfg.Logging, cfg.Syslog, clusterLogTargets, cfg.Cluster.ID.Load()); err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	}
@@ -256,3 +258,10 @@ func startServer(cfg *configuration.Configuration) (reload configuration.AtomicB
 
 	return reload
 }
+
+func parseClusterLogTargets(cfg *configuration.Configuration) []*models.ClusterLogTarget {
+	if cfg.Mode.Load() == "cluster" && cfg.Cluster.ClusterLogTargets != nil && len(cfg.Cluster.ClusterLogTargets) > 0 {
+		return cfg.Cluster.ClusterLogTargets
+	}
+	return []*models.ClusterLogTarget{}
+}

configuration/configuration.go

@@ -76,20 +76,22 @@ type APIConfiguration struct {
 }
 
 type ClusterConfiguration struct {
-	ID                 AtomicString `yaml:"id,omitempty" group:"cluster" save:"true"`
-	BootstrapKey       AtomicString `yaml:"bootstrap_key,omitempty" group:"cluster" save:"true"`
-	ActiveBootstrapKey AtomicString `yaml:"active_bootstrap_key,omitempty" group:"cluster" save:"true"`
-	Token              AtomicString `yaml:"token,omitempty" group:"cluster" save:"true"`
-	URL                AtomicString `yaml:"url,omitempty" group:"cluster" save:"true"`
-	Port               AtomicInt    `yaml:"port,omitempty" group:"cluster" save:"true"`
-	APIBasePath        AtomicString `yaml:"api_base_path,omitempty" group:"cluster" save:"true"`
-	APINodesPath       AtomicString `yaml:"api_nodes_path,omitempty" group:"cluster" save:"true"`
-	APIRegisterPath    AtomicString `yaml:"api_register_path,omitempty" group:"cluster" save:"true"`
-	StorageDir         AtomicString `yaml:"storage_dir,omitempty" group:"cluster" save:"true"`
-	CertificateDir     AtomicString `yaml:"cert_path,omitempty" group:"cluster" save:"true"`
-	CertificateFetched AtomicBool   `yaml:"cert_fetched,omitempty" group:"cluster" save:"true" example:"false"`
-	Name               AtomicString `yaml:"name,omitempty" group:"cluster" save:"true"`
-	Description        AtomicString `yaml:"description,omitempty" group:"cluster" save:"true"`
+	ID                 AtomicString               `yaml:"id,omitempty" group:"cluster" save:"true"`
+	BootstrapKey       AtomicString               `yaml:"bootstrap_key,omitempty" group:"cluster" save:"true"`
+	ActiveBootstrapKey AtomicString               `yaml:"active_bootstrap_key,omitempty" group:"cluster" save:"true"`
+	Token              AtomicString               `yaml:"token,omitempty" group:"cluster" save:"true"`
+	URL                AtomicString               `yaml:"url,omitempty" group:"cluster" save:"true"`
+	Port               AtomicInt                  `yaml:"port,omitempty" group:"cluster" save:"true"`
+	APIBasePath        AtomicString               `yaml:"api_base_path,omitempty" group:"cluster" save:"true"`
+	APINodesPath       AtomicString               `yaml:"api_nodes_path,omitempty" group:"cluster" save:"true"`
+	APIRegisterPath    AtomicString               `yaml:"api_register_path,omitempty" group:"cluster" save:"true"`
+	StorageDir         AtomicString               `yaml:"storage_dir,omitempty" group:"cluster" save:"true"`
+	CertificateDir     AtomicString               `yaml:"cert_path,omitempty" group:"cluster" save:"true"`
+	CertificateFetched AtomicBool                 `yaml:"cert_fetched,omitempty" group:"cluster" save:"true" example:"false"`
+	Name               AtomicString               `yaml:"name,omitempty" group:"cluster" save:"true"`
+	Description        AtomicString               `yaml:"description,omitempty" group:"cluster" save:"true"`
+	ClusterLogTargets  []*models.ClusterLogTarget `yaml:"cluster_log_targets,omitempty" group:"cluster" save:"true"`
+	ClusterID          AtomicString               `yaml:"cluster_id,omitempty" group:"cluster" save:"true"`
 }
 
 func (c *ClusterConfiguration) Clear() {
@@ -103,6 +105,8 @@ func (c *ClusterConfiguration) Clear() {
 	c.CertificateFetched.Store(false)
 	c.Name.Store("")
 	c.Description.Store("")
+	c.ClusterID.Store("")
+	c.ClusterLogTargets = nil
 }
 
 type RuntimeData struct {
@@ -269,6 +273,10 @@ func (c *Configuration) Save() error {
 		cfg := c.storage.Get()
 		cfg.LogTargets = nil
 	}
+	if len(c.Cluster.ClusterLogTargets) == 0 {
+		cfg := c.storage.Get()
+		cfg.Cluster.ClusterLogTargets = nil
+	}
 	// clean storage data if we are not in cluster mode or preparing to go into that mode
 	if cfg.Mode.Load() != "cluster" && cfg.Cluster.BootstrapKey.Load() == "" {
 		storage := cfg.storage.Get()

configuration/configuration_storage.go

@@ -510,8 +510,10 @@ func configureAPI(api *operations.DataPlaneAPI) http.Handler {
 	api.InformationGetInfoHandler = &handlers.GetInfoHandlerImpl{SystemInfo: haproxyOptions.ShowSystemInfo, BuildTime: BuildTime, Version: Version}
 
 	// setup cluster handlers
-	api.DiscoveryGetClusterHandler = &handlers.GetClusterHandlerImpl{Config: cfg}
+	api.ClusterGetClusterHandler = &handlers.GetClusterHandlerImpl{Config: cfg}
 	api.ClusterPostClusterHandler = &handlers.CreateClusterHandlerImpl{Client: client, Config: cfg, ReloadAgent: ra}
+	api.ClusterDeleteClusterHandler = &handlers.DeleteClusterHandlerImpl{Client: client, Config: cfg, ReloadAgent: ra}
+	api.ClusterEditClusterHandler = &handlers.EditClusterHandlerImpl{Config: cfg}
 	api.ClusterInitiateCertificateRefreshHandler = &handlers.ClusterInitiateCertificateRefreshHandlerImpl{Config: cfg}
 
 	clusterSync := dataplaneapi_config.ClusterSync{ReloadAgent: ra, Context: ctx}