REORG/MEDIUM: config: fixing code-generation for configuration files

Author: prometherion

configuration/cluster_sync.go

@@ -32,6 +32,7 @@ import (
 	"os"
 	"path"
 	"runtime"
+	"strconv"
 	"strings"
 	"time"
 
@@ -213,7 +214,10 @@ func (c *ClusterSync) monitorBootstrapKey() {
 			}
 			url := fmt.Sprintf("%s://%s", data["schema"], data["address"])
 			c.cfg.Cluster.URL.Store(url)
-			c.cfg.Cluster.Port.Store(data["port"])
+			c.cfg.Cluster.Port.Store(func() int {
+				i, _ := strconv.Atoi(data["port"])
+				return i
+			}())
 			c.cfg.Cluster.APIBasePath.Store(data["api-base-path"])
 			registerPath, ok := data["register-path"]
 			if !ok {
@@ -480,7 +484,7 @@ func (c *ClusterSync) fetchCert() {
 				apiBasePath := c.cfg.Cluster.APIBasePath.Load()
 				apiNodesPath := c.cfg.Cluster.APINodesPath.Load()
 				id := c.cfg.Cluster.ID.Load()
-				url = fmt.Sprintf("%s:%s/%s", url, port, strings.TrimLeft(path.Join(apiBasePath, apiNodesPath, id), "/"))
+				url = fmt.Sprintf("%s:%d/%s/%s/%s", url, port, apiBasePath, apiNodesPath, id)
 				req, err := http.NewRequest("GET", url, nil)
 				if err != nil {
 					c.activateFetchCert(err)

configuration/configuration.go

@@ -101,13 +101,13 @@ type ClusterConfiguration struct {
 	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               AtomicString `yaml:"port,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"`
+	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"`
 }
@@ -116,7 +116,7 @@ func (c *ClusterConfiguration) Clear() {
 	c.ID.Store("")
 	c.ActiveBootstrapKey.Store("")
 	c.Token.Store("")
-	c.Port.Store("")
+	c.Port.Store(0)
 	c.APIBasePath.Store("")
 	c.APINodesPath.Store("")
 	c.APIRegisterPath.Store("")

configuration/configuration_generated.go

@@ -10,31 +10,31 @@ dataplaneapi {
   max-header-size =  "1MiB"
   socket-path =  "/var/run/data-plane.sock"
   host =  "localhost"
-  port =  "80"
-  listen-limit =  "null"
+  port =  80
+  listen-limit =  1024
   keep-alive =  "3m"
   read-timeout =  "30s"
   write-timeout =  "60s"
-  show-system-info =  "false"
-  disable-inotify =  "false"
+  show-system-info =  false
+  disable-inotify =  false
   pid-file =  "/tmp/dataplane.pid"
-  uid =  "1000"
-  gid =  "1000"
+  uid =  1000
+  gid =  1000
 
   tls {
     tls-host =  "null"
-    tls-port =  "null"
+    tls-port =  6443
     tls-certificate =  "null"
     tls-key =  "null"
     tls-ca =  "null"
-    tls-listen-limit =  "null"
-    tls-keep-alive =  "null"
-    tls-read-timeout =  "null"
-    tls-write-timeout =  "null"
+    tls-listen-limit =  10
+    tls-keep-alive =  "1m"
+    tls-read-timeout =  "10s"
+    tls-write-timeout =  "10s"
   }
 
   user "admin" {
-    insecure =  "true"
+    insecure =  true
     password =  "adminpwd"
   }
 
@@ -45,23 +45,23 @@ dataplaneapi {
 
   transaction {
     transaction-dir =  "/tmp/haproxy"
-    backups-number =  "0"
+    backups-number =  0
     backups-dir =  "/tmp/backups"
-    max-open-transactions =  "20"
+    max-open-transactions =  20
   }
 
   resources {
     maps-dir =  "/etc/haproxy/maps"
     ssl-certs-dir =  "/etc/haproxy/ssl"
-    update-map-files =  "false"
-    update-map-files-period =  "10"
+    update-map-files =  false
+    update-map-files-period =  10
     spoe-dir =  "/etc/haproxy/spoe"
     spoe-transaction-dir =  "/tmp/spoe-haproxy"
   }
 
   advertised {
     api-address =  "10.2.3.4"
-    api-port =  "80"
+    api-port =  80
   }
 }
 
@@ -70,13 +70,13 @@ haproxy {
   haproxy-bin =  "haproxy"
   master-runtime =  "null"
   fid =  "null"
-  master-worker-mode =  "false"
+  master-worker-mode =  false
 
   reload {
-    reload-delay =  "5"
+    reload-delay =  5
     reload-cmd =  "null"
     restart-cmd =  "null"
-    reload-retention =  "1"
+    reload-retention =  1
     validate-cmd =  "null"
   }
 }
@@ -88,20 +88,20 @@ cluster {
   active_bootstrap_key =  "null"
   token =  "null"
   url =  "null"
-  port =  "80"
+  port =  80
   api_base_path =  "null"
   api_nodes_path =  "null"
   api_register_path =  "null"
   storage-dir =  "null"
   cert-path =  "null"
-  cert-fetched =  "null"
+  cert-fetched =  false
   name =  "null"
   description =  "null"
 }
 
 service_discovery {
-  consuls =  "null"
-  aws-regions =  "null"
+  consuls =  []
+  aws-regions =  []
 }
 
 log {

configuration/examples/example-full.hcl

@@ -11,7 +11,7 @@ dataplaneapi:
   socket-path: "/var/run/data-plane.sock" # flags.Filename
   host: "localhost" # string
   port: 80 # int
-  listen-limit: null # int
+  listen-limit: 1024 # int
   keep-alive: "3m" # time.Duration
   read-timeout: "30s" # time.Duration
   write-timeout: "60s" # time.Duration
@@ -22,14 +22,14 @@ dataplaneapi:
   gid: 1000 # int
   tls:
     tls-host: null # string 2
-    tls-port: null # int 2
+    tls-port: 6443 # int 2
     tls-certificate: null # flags.Filename 2
     tls-key: null # flags.Filename 2
     tls-ca: null # flags.Filename 2
-    tls-listen-limit: null # int 2
-    tls-keep-alive: null # time.Duration 2
-    tls-read-timeout: null # time.Duration 2
-    tls-write-timeout: null # time.Duration 2
+    tls-listen-limit: 10 # int 2
+    tls-keep-alive: 1m # time.Duration 2
+    tls-read-timeout: 10s # time.Duration 2
+    tls-write-timeout: 10s # time.Duration 2
   user:
   - name: admin # string 2
     insecure: true # bool 2
@@ -39,14 +39,14 @@ dataplaneapi:
     userlist-file: null # string 2
   transaction:
     transaction-dir: "/tmp/haproxy" # string 2
-    backups-number: "0" # int 2
+    backups-number: 0 # int 2
     backups-dir: /tmp/backups # string 2
-    max-open-transactions: "20" # int64 2
+    max-open-transactions: 20 # int64 2
   resources:
     maps-dir: "/etc/haproxy/maps" # string 2
     ssl-certs-dir: "/etc/haproxy/ssl" # string 2
     update-map-files: false # bool 2
-    update-map-files-period: "10" # int64 2
+    update-map-files-period: 10 # int64 2
     spoe-dir: "/etc/haproxy/spoe" # string 2
     spoe-transaction-dir: "/tmp/spoe-haproxy" # string 2
   advertised:
@@ -59,10 +59,10 @@ haproxy:
   fid: null # string
   master-worker-mode: false # bool
   reload:
-    reload-delay: "5" # int 2
+    reload-delay: 5 # int 2
     reload-cmd: null # string 2
     restart-cmd: null # string 2
-    reload-retention: "1" # int 2
+    reload-retention: 1 # int 2
     validate-cmd: null # string 2
 cluster:
   cluster-tls-dir: null # string
@@ -71,18 +71,18 @@ cluster:
   active_bootstrap_key: null # string
   token: null # string
   url: null # string
-  port: 80 # string
+  port: 80 # int
   api_base_path: null # string
   api_nodes_path: null # string
   api_register_path: null # string
   storage-dir: null # string
   cert-path: null # string
-  cert-fetched: null # bool
+  cert-fetched: false # bool
   name: null # string
   description: null # string
 service_discovery:
-  consuls: null # []*models.Consul
-  aws-regions: null # []*models.AwsRegion
+  consuls: [] # []*models.Consul
+  aws-regions: [] # []*models.AwsRegion
 log:
   log-to: "stdout" # string
   log-file: "/var/log/dataplaneapi/dataplaneapi.log" # string

configuration/examples/example-full.yaml

@@ -0,0 +1,56 @@
+// Copyright 2019 HAProxy Technologies
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+package configuration
+
+import (
+	"fmt"
+	"sync/atomic"
+)
+
+type AtomicInt struct {
+	value atomic.Value
+}
+
+func (s *AtomicInt) Load() int {
+	v := s.value.Load()
+	if v == nil {
+		return 0
+	}
+	return v.(int)
+}
+
+func (s *AtomicInt) Store(str int) {
+	s.value.Store(str)
+}
+
+func (s *AtomicInt) String() string {
+	return fmt.Sprintf("%d", s.Load())
+}
+
+func (s *AtomicInt) UnmarshalYAML(unmarshal func(interface{}) error) error {
+	var buf int
+	err := unmarshal(&buf)
+	if err != nil {
+		return err
+	}
+
+	s.Store(buf)
+	return nil
+}
+
+func (s AtomicInt) MarshalYAML() (interface{}, error) {
+	return s.Load(), nil
+}