Merge pull request #42 from kamil-holubicki/DISTMYSQL-423

DISTMYSQL-423: Improve code formatting checks, adjust Docker images to use go-1.22.3

Author: kamil-holubicki

docker/Dockerfile

@@ -14,7 +14,7 @@
 # ORC_USER (default: orc_server_user): username used to login to orchestrator backend MySQL server
 # ORC_PASSWORD (default: orc_server_password): password used to login to orchestrator backend MySQL server
 
-FROM golang:1.20.3-alpine3.17 as build
+FROM golang:1.22.3-alpine3.20 as build
 
 ENV GOPATH=/tmp/go
 
@@ -28,7 +28,7 @@ RUN rsync -av $(find /tmp/orchestrator-release -type d -name orchestrator -maxde
 RUN rsync -av $(find /tmp/orchestrator-release -type d -name orchestrator-client -maxdepth 2)/ /
 RUN cp conf/orchestrator-sample-sqlite.conf.json /etc/orchestrator.conf.json
 
-FROM alpine:3.17
+FROM alpine:3.20
 
 RUN apk --no-cache add bash curl jq
 

docker/Dockerfile.packaging

@@ -14,7 +14,7 @@
 # ORC_USER (default: orc_server_user): username used to login to orchestrator backend MySQL server
 # ORC_PASSWORD (default: orc_server_password): password used to login to orchestrator backend MySQL server
 
-FROM golang:1.20.3-bullseye
+FROM golang:1.22.3-bullseye
 
 RUN apt-get update
 RUN apt-get install -y ruby ruby-dev rubygems build-essential

docker/Dockerfile.raft

@@ -1,4 +1,4 @@
-FROM golang:1.20.3-bullseye
+FROM golang:1.22.3-bullseye
 LABEL maintainer="[email protected]"
 
 RUN apt-get update -q -y

docker/Dockerfile.system

@@ -1,4 +1,4 @@
-FROM golang:1.20.3-bullseye
+FROM golang:1.22.3-bullseye
 LABEL maintainer="[email protected]"
 
 ARG ci_env_repo="https://github.com/percona/orchestrator-ci-env.git"

docker/Dockerfile.test

@@ -1,4 +1,4 @@
-FROM golang:1.20.3-bullseye
+FROM golang:1.22.3-bullseye
 LABEL maintainer="[email protected]"
 
 RUN apt-get update

go/collection/collection.go

@@ -15,7 +15,6 @@
 */
 
 /*
-
 Package collection holds routines for collecting "high frequency"
 metrics and handling their auto-expiry based on a configured retention
 time. This becomes more interesting as the number of MySQL servers
@@ -31,10 +30,10 @@ data or the raw data for custom analysis over the period requested.
 
 This is expected to be used for the following types of metric:
 
-* discovery metrics (time to poll a MySQL server and collect status)
-* queue metrics (statistics within the discovery queue itself)
-* query metrics (statistics on the number of queries made to the
-  backend MySQL database)
+  - discovery metrics (time to poll a MySQL server and collect status)
+  - queue metrics (statistics within the discovery queue itself)
+  - query metrics (statistics on the number of queries made to the
+    backend MySQL database)
 
 Orchestrator code can just add a new metric without worrying about
 removing it later, and other code which serves API requests can
@@ -57,7 +56,6 @@ orchestrator run out of memory eventually.
 
 Current code uses DiscoveryCollectionRetentionSeconds as the
 time to keep metric data.
-
 */
 package collection
 

go/inst/cluster_alias_dao.go

@@ -152,9 +152,9 @@ func updateClusterAliasesUsingReplace() error {
 //
 // The data which is going to be inserted originates from database_instance
 // table, in particular the following columns:
-// 1. `cluster_name` varchar(128) NOT NULL
-// 2. `suggested_cluster_alias` varchar(128) CHARACTER SET ascii COLLATE
-//	   ascii_general_ci NOT NULL
+//  1. `cluster_name` varchar(128) NOT NULL
+//  2. `suggested_cluster_alias` varchar(128) CHARACTER SET ascii COLLATE
+//     ascii_general_ci NOT NULL
 //
 // So it is possible to end up in the following situation when we use this
 // approach:

go/inst/instance_binlog.go

@@ -51,12 +51,10 @@ type BinlogEvent struct {
 	Info         string
 }
 
-//
 func (this *BinlogEvent) NextBinlogCoordinates() BinlogCoordinates {
 	return BinlogCoordinates{LogFile: this.Coordinates.LogFile, LogPos: this.NextEventPos, Type: this.Coordinates.Type}
 }
 
-//
 func (this *BinlogEvent) NormalizeInfo() {
 	for reg, replace := range eventInfoTransformations {
 		this.Info = reg.ReplaceAllString(this.Info, replace)
@@ -76,7 +74,6 @@ func (this *BinlogEvent) EqualsIgnoreCoordinates(other *BinlogEvent) bool {
 
 const maxEmptyEventsEvents int = 10
 
-//
 type BinlogEventCursor struct {
 	cachedEvents      []BinlogEvent
 	currentEventIndex int

go/inst/instance_binlog_dao.go

@@ -133,11 +133,11 @@ func getLastPseudoGTIDEntryInBinlog(pseudoGTIDRegexp *regexp.Regexp, instanceKey
 }
 
 // getLastPseudoGTIDEntryInInstance will search for the last pseudo GTID entry in an instance's binary logs. Arguments:
-// - instance
-// - minBinlogCoordinates: a hint, suggested coordinates to start with. The search will _attempt_ to begin search from
-//   these coordinates, but if search is empty, then we failback to full search, ignoring this hint
-// - maxBinlogCoordinates: a hard limit on the maximum position we're allowed to investigate.
-// - exhaustiveSearch: when 'true', continue iterating binary logs. When 'false', only investigate most recent binary log.
+//   - instance
+//   - minBinlogCoordinates: a hint, suggested coordinates to start with. The search will _attempt_ to begin search from
+//     these coordinates, but if search is empty, then we failback to full search, ignoring this hint
+//   - maxBinlogCoordinates: a hard limit on the maximum position we're allowed to investigate.
+//   - exhaustiveSearch: when 'true', continue iterating binary logs. When 'false', only investigate most recent binary log.
 func getLastPseudoGTIDEntryInInstance(instance *Instance, minBinlogCoordinates *BinlogCoordinates, maxBinlogCoordinates *BinlogCoordinates, exhaustiveSearch bool) (*BinlogCoordinates, string, error) {
 	pseudoGTIDRegexp, err := compilePseudoGTIDPattern()
 	if err != nil {

go/inst/instance_dao.go

@@ -70,11 +70,11 @@ func (this InstancesByCountReplicas) Less(i, j int) bool {
 }
 
 // InstancesByDc is a sortable type for Instance
-// 1. Instances are sorted by DC
-// 2. Within DC group instances are sorted by replicas count
-// 3. Within ReplicasCount group insances are:
-//    a) not sorted if ReplicasCount > 0
-//    b) sorted by replication lag if ReplicasCount == 0
+//  1. Instances are sorted by DC
+//  2. Within DC group instances are sorted by replicas count
+//  3. Within ReplicasCount group insances are:
+//     a) not sorted if ReplicasCount > 0
+//     b) sorted by replication lag if ReplicasCount == 0
 //
 // DC1 < DC2
 // if DC1 == DC2 => len(Replicas1) < len (Replicas2)
@@ -1209,9 +1209,9 @@ func (this byNamePort) Less(i, j int) bool {
 }
 
 // BulkReadInstance returns a list of all instances from the database
-// - I only need the Hostname and Port fields.
-// - I must use readInstancesByCondition to ensure all column
-//   settings are correct.
+//   - I only need the Hostname and Port fields.
+//   - I must use readInstancesByCondition to ensure all column
+//     settings are correct.
 func BulkReadInstance() ([](*InstanceKey), error) {
 	// no condition (I want all rows) and no sorting (but this is done by Hostname, Port anyway)
 	const (