go/solution-operator-lib: bump Go version to 1.24

Author: TeddyAndrieux

CHANGELOG.md

@@ -33,6 +33,9 @@
 - Allow to enable metrics collection for the solutions operators
   (PR[#4813](https://github.com/scality/metalk8s/pull/4813))
 
+- Bump solution-operator-lib Go version to 1.24
+  (PR[#4817](https://github.com/scality/metalk8s/pull/4817))
+
 ### Bug Fixes
 
 - Fix a bug where part of the upgrade process would silently be skipped

go/solution-operator-lib/go.mod

@@ -1,8 +1,13 @@
 module github.com/scality/metalk8s/go/solution-operator-lib
 
-go 1.13
+go 1.24.0
 
 require (
-	github.com/stretchr/testify v1.6.1
-	gopkg.in/yaml.v2 v2.3.0
+	github.com/stretchr/testify v1.11.1
+	gopkg.in/yaml.v3 v3.0.1
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 )

go/solution-operator-lib/go.sum

@@ -1,13 +1,10 @@
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

go/solution-operator-lib/pkg/config/config.go

@@ -3,10 +3,9 @@ package config
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 const expectedAPIVersion = "solutions.metalk8s.scality.com/v1alpha1"
@@ -32,12 +31,10 @@ type Repository struct {
 func LoadConfiguration(input io.Reader) (*OperatorConfig, error) {
 	var config OperatorConfig
 
-	buffer, err := ioutil.ReadAll(input)
-	if err != nil {
-		return nil, fmt.Errorf("cannot read operator configuration: %w", err)
-	}
+	decoder := yaml.NewDecoder(input)
+	decoder.KnownFields(true)
 
-	if err := yaml.UnmarshalStrict(buffer, &config); err != nil {
+	if err := decoder.Decode(&config); err != nil {
 		return nil, validationError(err)
 	}
 

go/solution-operator-lib/pkg/config/config_test.go

@@ -177,12 +177,7 @@ func TestLoadConfigurationOnBrokenFile(t *testing.T) {
 
 	assert.Nil(t, result)
 	assert.Error(t, err)
-	// This error is not about validation
-	assert.False(t, errors.Is(err, ErrValidation))
-	assert.True(t, errors.Is(err, errBrokenBuffer))
-	assert.Equal(
-		t,
-		"cannot read operator configuration: this buffer is broken",
-		err.Error(),
-	)
+	// This error is about parsing the YAML file
+	assert.True(t, errors.Is(err, ErrValidation))
+	assert.Contains(t, err.Error(), "yaml: input error: this buffer is broken")
 }