OPTIM/MAJOR: go: Optimize struct field alignments

dkorunic · dkorunic · commit 5676edd61e6e · 2024-08-14T09:44:25.000Z
diff --git a/pkg/annotations/cfgSnippet.go b/pkg/annotations/cfgSnippet.go
@@ -28,18 +28,18 @@ const (
 )
 
 type CfgSnippet struct {
+	ingress  *store.Ingress
+	service  *store.Service
 	name     string
 	frontend string
 	backend  string
-	ingress  *store.Ingress
-	service  *store.Service
 }
 
 type cfgData struct {
+	status   store.Status
 	value    []string
 	updated  []string
 	disabled bool
-	status   store.Status
 }
 
 // CfgSnippetType represents type of a config snippet
@@ -82,10 +82,10 @@ func InitCfgSnippet() {
 }
 
 type ConfigSnippetOptions struct {
-	Name     string
 	Backend  *string
 	Frontend *string
 	Ingress  *store.Ingress
+	Name     string
 }
 
 // DisableConfigSnippets fills a map[cfgSnippetType]struct{} of disabled config snippet types:
diff --git a/pkg/controller/builder.go b/pkg/controller/builder.go
@@ -44,20 +44,20 @@ import (
 )
 
 type Builder struct {
+	store                    store.K8s
 	annotations              annotations.Annotations
 	haproxyClient            api.HAProxyClient
 	gatewayManager           gateway.GatewayManager
 	haproxyProcess           process.Process
 	haproxyRules             rules.Rules
 	restClientSet            client.Client
+	updateStatusManager      status.UpdateStatusManager
 	updatePublishServiceFunc func(ingresses []*ingress.Ingress, publishServiceAddresses []string)
 	eventChan                chan k8ssync.SyncDataEvent
 	clientSet                *kubernetes.Clientset
-	haproxyEnv               env.Env
 	haproxyCfgFile           []byte
-	store                    store.K8s
+	haproxyEnv               env.Env
 	osArgs                   utils.OSArgs
-	updateStatusManager      status.UpdateStatusManager
 }
 
 var defaultEnv = env.Env{
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -41,24 +41,24 @@ var logger = utils.GetLogger()
 
 // HAProxyController is ingress controller
 type HAProxyController struct {
+	store                    store.K8s
+	prometheusMetricsManager metrics.PrometheusMetricsManager
 	gatewayManager           gateway.GatewayManager
 	annotations              annotations.Annotations
+	updateStatusManager      status.UpdateStatusManager
 	eventChan                chan k8ssync.SyncDataEvent
 	updatePublishServiceFunc func(ingresses []*ingress.Ingress, publishServiceAddresses []string)
 	chShutdown               chan struct{}
 	podNamespace             string
 	podPrefix                string
-	haproxy                  haproxy.HAProxy
+	PodIP                    string
+	Hostname                 string
 	updateHandlers           []UpdateHandler
-	store                    store.K8s
+	beforeUpdateHandlers     []UpdateHandler
+	haproxy                  haproxy.HAProxy
 	osArgs                   utils.OSArgs
 	auxCfgModTime            int64
 	ready                    bool
-	updateStatusManager      status.UpdateStatusManager
-	beforeUpdateHandlers     []UpdateHandler
-	prometheusMetricsManager metrics.PrometheusMetricsManager
-	PodIP                    string
-	Hostname                 string
 }
 
 // Wrapping a Native-Client transaction and commit it.
diff --git a/pkg/handler/quic.go b/pkg/handler/quic.go
@@ -21,12 +21,12 @@ const (
 type Quic struct {
 	AddrIPv4         string
 	AddrIPv6         string
-	IPv4             bool
-	IPv6             bool
 	CertDir          string
-	QuicAnnouncePort int64
 	MaxAge           string
+	QuicAnnouncePort int64
 	QuicBindPort     int64
+	IPv4             bool
+	IPv6             bool
 }
 
 func (q *Quic) Update(k store.K8s, h haproxy.HAProxy, a annotations.Annotations) (err error) {
diff --git a/pkg/handler/tcp-cr.go b/pkg/handler/tcp-cr.go
@@ -38,8 +38,8 @@ type TCPCustomResource struct{}
 
 type tcpcontext struct {
 	k         store.K8s
-	h         haproxy.HAProxy
 	namespace string
+	h         haproxy.HAProxy
 }
 
 func (handler TCPCustomResource) Update(k store.K8s, h haproxy.HAProxy, a annotations.Annotations) (err error) {
diff --git a/pkg/haproxy/api/runtime.go b/pkg/haproxy/api/runtime.go
@@ -20,8 +20,8 @@ type RuntimeServerData struct {
 	BackendName string
 	ServerName  string
 	IP          string
-	Port        int
 	State       string
+	Port        int
 }
 
 func (c *clientNative) ExecuteRaw(command string) (result []string, err error) {
diff --git a/pkg/haproxy/instance/configuration.go b/pkg/haproxy/instance/configuration.go
@@ -42,8 +42,8 @@ func NeedAction() bool {
 }
 
 type configurationManagerImpl struct {
-	reload, restart bool
 	logger          utils.Logger
+	reload, restart bool
 }
 
 func NewConfigurationManager() *configurationManagerImpl {
diff --git a/pkg/k8s/main.go b/pkg/k8s/main.go
@@ -77,13 +77,13 @@ type k8s struct {
 	apiExtensionsClient    *crdclientset.Clientset
 	publishSvc             *utils.NamespaceValue
 	gatewayClient          *gatewayclientset.Clientset
+	crdClient              *crdclientset.Clientset
 	podPrefix              string
 	podNamespace           string
 	whiteListedNS          []string
 	syncPeriod             time.Duration
 	cacheResyncPeriod      time.Duration
 	disableSvcExternalName bool // CVE-2021-25740
-	crdClient              *crdclientset.Clientset
 	gatewayAPIInstalled    bool
 }
 
diff --git a/pkg/reference-counter/reference-counter.go b/pkg/reference-counter/reference-counter.go
@@ -43,9 +43,9 @@ type (
 )
 
 type ResourceCounter struct {
-	mu     sync.Mutex
 	owners map[HaproxyCfgResourceName]Owners
 	owned  map[OwnerKey]Owned
+	mu     sync.Mutex
 }
 
 func NewResourceCounter() *ResourceCounter {
diff --git a/pkg/secret/secret.go b/pkg/secret/secret.go
@@ -29,9 +29,9 @@ type Manager struct {
 
 type Secret struct {
 	Name       types.NamespacedName
-	SecretType certs.SecretType
 	OwnerType  OwnerType
 	OwnerName  string
+	SecretType certs.SecretType
 }
 
 // module logger
diff --git a/pkg/service/service.go b/pkg/service/service.go
@@ -35,17 +35,17 @@ var logger = utils.GetLogger()
 const cookieKey = "ohph7OoGhong"
 
 type Service struct {
-	path        *store.IngressPath
-	resource    *store.Service
-	backend     *models.Backend
-	certs       certs.Certificates
+	certs    certs.Certificates
+	path     *store.IngressPath
+	resource *store.Service
+	backend  *models.Backend
+	// ingressName      string
+	// ingressNamespace string
+	ingress     *store.Ingress
 	annotations []map[string]string
 	modeTCP     bool
 	newBackend  bool
 	standalone  bool
-	// ingressName      string
-	// ingressNamespace string
-	ingress *store.Ingress
 }
 
 // New returns a Service instance to handle the k8s IngressPath resource given in params.
diff --git a/pkg/status/updatestatus.go b/pkg/status/updatestatus.go
@@ -17,9 +17,9 @@ type UpdateStatusManager interface {
 }
 
 type UpdateStatusManagerImpl struct {
-	updateIngresses   []*ingress.Ingress
 	client            *kubernetes.Clientset
 	ingressClass      string
+	updateIngresses   []*ingress.Ingress
 	emptyIngressClass bool
 }
 
diff --git a/pkg/store/store.go b/pkg/store/store.go
@@ -32,12 +32,12 @@ type K8s struct {
 	SecretsProcessed             map[string]struct{}
 	BackendsProcessed            map[string]struct{}
 	GatewayClasses               map[string]*GatewayClass
-	GatewayControllerName        string
-	PublishServiceAddresses      []string
 	HaProxyPods                  map[string]struct{}
-	UpdateAllIngresses           bool
 	BackendsWithNoConfigSnippets map[string]struct{}
 	FrontendRC                   *rc.ResourceCounter
+	GatewayControllerName        string
+	PublishServiceAddresses      []string
+	UpdateAllIngresses           bool
 }
 
 type NamespacesWatch struct {
diff --git a/pkg/store/types-tcp-cr.go b/pkg/store/types-tcp-cr.go
@@ -31,15 +31,15 @@ const (
 )
 
 type TCPResource struct {
-	v1.TCPModel `json:"tcpmodel"`
+	CreationTimestamp time.Time `json:"creation_timestamp"` //nolint: tagliatelle
 	// ParentName is the name of TCP CR containing this TCP resource
 	ParentName      string `json:"parent_name,omitempty"` //nolint: tagliatelle
 	Namespace       string `json:"namespace,omitempty"`
 	CollisionStatus Status `json:"collision_status,omitempty"` //nolint: tagliatelle
 	// If Status is ERROR, Reason will contain the reason
 	// Leave it as a fully flexible string
-	Reason            string    `json:"reason,omitempty"`
-	CreationTimestamp time.Time `json:"creation_timestamp"` //nolint: tagliatelle
+	Reason      string `json:"reason,omitempty"`
+	v1.TCPModel `json:"tcpmodel"`
 }
 
 type TCPResourceList []*TCPResource
diff --git a/pkg/utils/flags.go b/pkg/utils/flags.go
@@ -81,6 +81,7 @@ type OSArgs struct {
 	CfgDir                     string         `long:"config-dir" description:"path to HAProxy configuration directory. NOTE: works only in External mode"`
 	Program                    string         `long:"program" description:"path to HAProxy program. NOTE: works only with External mode"`
 	KubeConfig                 string         `long:"kubeconfig" default:"" description:"combined with -e. location of kube config file"`
+	DisableConfigSnippets      string         `long:"disable-config-snippets" description:"Allow to disable config snippets. List of comma separated values (possible values: all/global/backend/frontend)"`
 	Version                    []bool         `short:"v" long:"version" description:"version"`
 	NamespaceWhitelist         []string       `long:"namespace-whitelist" description:"whitelisted namespaces"`
 	NamespaceBlacklist         []string       `long:"namespace-blacklist" description:"blacklisted namespaces"`
@@ -95,6 +96,8 @@ type OSArgs struct {
 	SyncPeriod                 time.Duration  `long:"sync-period" default:"5s" description:"Sets the period at which the controller syncs HAProxy configuration file"`
 	CacheResyncPeriod          time.Duration  `long:"cache-resync-period" default:"10m" description:"Sets the underlying Shared Informer resync period: resyncing controller with informers cache"`
 	HealthzBindPort            int64          `long:"healthz-bind-port" default:"1042" description:"port to listen on for probes"`
+	QuicAnnouncePort           int64          `long:"quic-announce-port" description:"sets the port in the alt-svc header"`
+	QuicBindPort               int64          `long:"quic-bind-port" description:"sets the binding port for quic in HTTPS frontend"`
 	LogLevel                   LogLevelValue  `long:"log" default:"info" description:"level of log messages you can see"`
 	DisableIPV4                bool           `long:"disable-ipv4" description:"toggle to disable the IPv4 protocol from all frontends"`
 	External                   bool           `short:"e" long:"external" description:"use as external Ingress Controller (out of k8s cluster)"`
@@ -107,10 +110,7 @@ type OSArgs struct {
 	PrometheusEnabled          bool           `long:"prometheus" description:"enable prometheus of IC data"`
 	DisableHTTP                bool           `long:"disable-http" description:"toggle to disable the HTTP frontend"`
 	DisableIPV6                bool           `long:"disable-ipv6" description:"toggle to disable the IPv6 protocol from all frontends"`
-	DisableConfigSnippets      string         `long:"disable-config-snippets" description:"Allow to disable config snippets. List of comma separated values (possible values: all/global/backend/frontend)"`
 	UseWithPebble              bool           `long:"with-pebble" description:"use pebble to start/stop/reload HAProxy"`
 	JobCheckCRD                bool           `long:"job-check-crd" description:"does not execute IC, but adds/updates CRDs"`
 	DisableQuic                bool           `long:"disable-quic" description:"disable quic protocol in http frontend bindings"`
-	QuicAnnouncePort           int64          `long:"quic-announce-port" description:"sets the port in the alt-svc header"`
-	QuicBindPort               int64          `long:"quic-bind-port" description:"sets the binding port for quic in HTTPS frontend"`
 }
diff --git a/pkg/utils/logging.go b/pkg/utils/logging.go
@@ -92,9 +92,9 @@ type Logger interface { //nolint:interfacebloat
 }
 
 type logger struct {
+	fields   map[string]interface{}
 	Level    LogLevel
 	FileName bool
-	fields   map[string]interface{}
 }
 
 var (

Original file line number	Diff line number	Diff line change
`@@ -28,18 +28,18 @@ const (`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`type CfgSnippet struct {`
	`31`	`+ ingress *store.Ingress`
	`32`	`+ service *store.Service`
`31`	`33`	`name string`
`32`	`34`	`frontend string`
`33`	`35`	`backend string`
`34`		`- ingress *store.Ingress`
`35`		`- service *store.Service`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`type cfgData struct {`
	`39`	`+ status store.Status`
`39`	`40`	`value []string`
`40`	`41`	`updated []string`
`41`	`42`	`disabled bool`
`42`		`- status store.Status`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`// CfgSnippetType represents type of a config snippet`
`@@ -82,10 +82,10 @@ func InitCfgSnippet() {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`type ConfigSnippetOptions struct {`
`85`		`- Name string`
`86`	`85`	`Backend *string`
`87`	`86`	`Frontend *string`
`88`	`87`	`Ingress *store.Ingress`
	`88`	`+ Name string`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`// DisableConfigSnippets fills a map[cfgSnippetType]struct{} of disabled config snippet types:`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ type TCPCustomResource struct{}`
`38`	`38`
`39`	`39`	`type tcpcontext struct {`
`40`	`40`	`k store.K8s`
`41`		`- h haproxy.HAProxy`
`42`	`41`	`namespace string`
	`42`	`+ h haproxy.HAProxy`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`func (handler TCPCustomResource) Update(k store.K8s, h haproxy.HAProxy, a annotations.Annotations) (err error) {`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ type RuntimeServerData struct {`
`20`	`20`	`BackendName string`
`21`	`21`	`ServerName string`
`22`	`22`	`IP string`
`23`		`- Port int`
`24`	`23`	`State string`
	`24`	`+ Port int`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`func (c *clientNative) ExecuteRaw(command string) (result []string, err error) {`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@ func NeedAction() bool {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`type configurationManagerImpl struct {`
`45`		`- reload, restart bool`
`46`	`45`	`logger utils.Logger`
	`46`	`+ reload, restart bool`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`func NewConfigurationManager() *configurationManagerImpl {`
Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,9 @@ type (`
`43`	`43`	`)`
`44`	`44`
`45`	`45`	`type ResourceCounter struct {`
`46`		`- mu sync.Mutex`
`47`	`46`	`owners map[HaproxyCfgResourceName]Owners`
`48`	`47`	`owned map[OwnerKey]Owned`
	`48`	`+ mu sync.Mutex`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`func NewResourceCounter() *ResourceCounter {`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@ type Manager struct {`
`29`	`29`
`30`	`30`	`type Secret struct {`
`31`	`31`	`Name types.NamespacedName`
`32`		`- SecretType certs.SecretType`
`33`	`32`	`OwnerType OwnerType`
`34`	`33`	`OwnerName string`
	`34`	`+ SecretType certs.SecretType`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`// module logger`