OPTIM/MINOR: go: Optimize struct field alignments

configuration/configuration.go

@@ -38,22 +38,22 @@ import (
 
 // ClientParams is just a placeholder for all client options
 type ClientParams struct {
-	ConfigurationFile         string
-	Haproxy                   string
-	TransactionDir            string
+	ConfigurationFile string
+	Haproxy           string
+	TransactionDir    string
+
+	// ValidateCmd allows specifying a custom script to validate the transaction file.
+	// The injected environment variable DATAPLANEAPI_TRANSACTION_FILE must be used to get the location of the file.
+	ValidateCmd               string
+	ValidateConfigFilesBefore []string
+	ValidateConfigFilesAfter  []string
 	BackupsNumber             int
 	UseValidation             bool
 	PersistentTransactions    bool
 	ValidateConfigurationFile bool
 	MasterWorker              bool
 	SkipFailedTransactions    bool
 	UseMd5Hash                bool
-
-	// ValidateCmd allows specifying a custom script to validate the transaction file.
-	// The injected environment variable DATAPLANEAPI_TRANSACTION_FILE must be used to get the location of the file.
-	ValidateCmd               string
-	ValidateConfigFilesBefore []string
-	ValidateConfigFilesAfter  []string
 }
 
 // Client configuration client
@@ -63,10 +63,10 @@ type ClientParams struct {
 // transaction files on StartTransaction, and deletes on CommitTransaction. We save
 // data to file on every change for persistence.
 type client struct {
-	Transaction
+	parser   parser.Parser
 	parsers  map[string]parser.Parser
 	services map[string]*Service
-	parser   parser.Parser
+	Transaction
 	clientMu sync.Mutex
 }
 
@@ -240,9 +240,9 @@ func NewParseSection(section parser.Section, pName string, p parser.Parser) *Sec
 // SectionParser is used set fields of a section based on the provided parser
 type SectionParser struct {
 	Object  interface{}
+	Parser  parser.Parser
 	Section parser.Section
 	Name    string
-	Parser  parser.Parser
 }
 
 // Parse parses the sections fields and sets their values with the data from the parser
@@ -1454,9 +1454,9 @@ func (s *SectionParser) originalto() interface{} {
 // SectionObject represents a configuration section
 type SectionObject struct {
 	Object  interface{}
+	Parser  parser.Parser
 	Section parser.Section
 	Name    string
-	Parser  parser.Parser
 	// In the context of the deprecation of the fields:
 	//	 HTTPKeepAlive, HTTPServerClose and Httpclose.
 	// This flag is used to set a priority on HTTPConnectionMode field over

configuration/options/options.go

@@ -17,23 +17,23 @@ limitations under the License.
 package options
 
 type ConfigurationOptions struct {
-	ConfigurationFile               string
-	Haproxy                         string
-	TransactionDir                  string
-	BackupsDir                      string
+	ConfigurationFile string
+	Haproxy           string
+	TransactionDir    string
+	BackupsDir        string
+
+	// ValidateCmd allows specifying a custom script to validate the transaction file.
+	// The injected environment variable DATAPLANEAPI_TRANSACTION_FILE must be used to get the location of the file.
+	ValidateCmd                     string
+	ValidateConfigFilesBefore       []string
+	ValidateConfigFilesAfter        []string
+	BackupsNumber                   int
 	PersistentTransactions          bool
 	SkipFailedTransactions          bool
-	BackupsNumber                   int
 	UseModelsValidation             bool
 	SkipConfigurationFileValidation bool // opposite of previously available ValidateConfigurationFile
 	MasterWorker                    bool
 	UseMd5Hash                      bool
-
-	// ValidateCmd allows specifying a custom script to validate the transaction file.
-	// The injected environment variable DATAPLANEAPI_TRANSACTION_FILE must be used to get the location of the file.
-	ValidateCmd               string
-	ValidateConfigFilesBefore []string
-	ValidateConfigFilesAfter  []string
 }
 
 type ConfigurationOption interface {

configuration/service.go

@@ -36,8 +36,8 @@ type ServiceServer struct {
 
 type serviceNode struct {
 	address  string
-	port     int64
 	name     string
+	port     int64
 	disabled bool
 	modified bool
 }
@@ -59,8 +59,8 @@ type ServiceI interface {
 
 // ScalingParams defines parameter for dynamic server scaling of the Service backend.
 type ScalingParams struct {
-	BaseSlots       int
 	SlotsGrowthType string
+	BaseSlots       int
 	SlotsIncrement  int
 }
 

configuration/transaction.go

@@ -58,10 +58,10 @@ type TransactionClient interface {
 type transactionCleanerHandler func(transactionId, configurationFile string)
 
 type Transaction struct {
+	TransactionClient TransactionClient
 	options.ConfigurationOptions
-	noNamedDefaultsFrom bool
-	TransactionClient   TransactionClient
 	mu                  sync.Mutex
+	noNamedDefaultsFrom bool
 }
 
 type Transactions interface {

runtime/crt-lists.go

@@ -18,10 +18,10 @@ type CrtList struct {
 type CrtListEntries []*CrtListEntry
 
 type CrtListEntry struct {
-	LineNumber    int
 	File          string
 	SSLBindConfig string
 	SNIFilter     []string
+	LineNumber    int
 }
 
 // ShowCrtLists returns CrtList files description from runtime

runtime/haproxy_mock.go

@@ -13,9 +13,9 @@ import (
 // HAProxyMock - Mock HAProxy Server for testing the socket communication
 type HAProxyMock struct {
 	net.Listener
-	running   bool
 	responses map[string]string
 	t         *testing.T
+	running   bool
 }
 
 // NewHAProxyMock - create new haproxy mock

runtime/runtime_single_client.go

@@ -34,8 +34,8 @@ type socketType string
 
 // TaskResponse ...
 type TaskResponse struct {
-	result string
 	err    error
+	result string
 }
 
 // Task has command to execute on runtime api, and response channel for result

runtime/version.go

@@ -22,11 +22,11 @@ import (
 )
 
 type HAProxyVersion struct {
+	Commit  string
+	Version string
 	Major   int
 	Minor   int
 	Patch   int
-	Commit  string
-	Version string
 }
 
 func (v *HAProxyVersion) ParseHAProxyVersion(version string) error {

spoe/spoe_single_client.go

@@ -43,13 +43,13 @@ type SingleSpoe struct {
 }
 
 type Params struct {
-	SpoeDir                string
 	UseValidation          *bool
 	PersistentTransactions *bool
 	SkipFailedTransactions *bool
+	SpoeDir                string
 	TransactionDir         string
-	BackupsNumber          int
 	ConfigurationFile      string
+	BackupsNumber          int
 }
 
 // newSingleSpoe returns Spoe with default options

test/HAProxyMock.go

@@ -12,9 +12,9 @@ import (
 // HAProxyMock - Mock HAProxy Server for testing the socket communication
 type HAProxyMock struct {
 	net.Listener
-	running   bool
 	responses map[string]string
 	t         *testing.T
+	running   bool
 }
 
 // NewHAProxyMock - create new haproxy mock