Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Renovate: Update External dependencies (major) #572

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
goveralls -service=github -coverprofile=build/cover.out
services:
postgres:
image: postgres:16
image: postgres:17
env:
POSTGRES_PASSWORD: postgres
ports:
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ require (
github.com/sapcc/go-api-declarations v1.12.6
github.com/sapcc/go-bits v0.0.0-20240925150026-37945f71a03e
go.uber.org/automaxprocs v1.6.0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
)

require (
Expand All @@ -43,5 +43,5 @@ require (
golang.org/x/sys v0.25.0 // indirect
golang.org/x/text v0.18.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)
2 changes: 1 addition & 1 deletion internal/core/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
limesresources "github.com/sapcc/go-api-declarations/limes/resources"
"github.com/sapcc/go-api-declarations/liquid"
"github.com/sapcc/go-bits/errext"
yaml "gopkg.in/yaml.v2"
yaml "gopkg.in/yaml.v3"

"github.com/sapcc/limes/internal/db"
"github.com/sapcc/limes/internal/util"
Expand Down Expand Up @@ -91,7 +91,7 @@
// calling Init() on all quota plugins.
func (c *Cluster) Connect(ctx context.Context, provider *gophercloud.ProviderClient, eo gophercloud.EndpointOpts) (errs errext.ErrorSet) {
// initialize discovery plugin
err := yaml.UnmarshalStrict([]byte(c.Config.Discovery.Parameters), c.DiscoveryPlugin)

Check failure on line 94 in internal/core/cluster.go

View workflow job for this annotation

GitHub Actions / CodeQL

undefined: yaml.UnmarshalStrict

Check failure on line 94 in internal/core/cluster.go

View workflow job for this annotation

GitHub Actions / Build

undefined: yaml.UnmarshalStrict

Check failure on line 94 in internal/core/cluster.go

View workflow job for this annotation

GitHub Actions / Checks

undefined: yaml.UnmarshalStrict

Check failure on line 94 in internal/core/cluster.go

View workflow job for this annotation

GitHub Actions / Checks

undefined: yaml.UnmarshalStrict
if err != nil {
errs.Addf("failed to supply params to discovery method: %w", err)
} else {
Expand All @@ -104,7 +104,7 @@
// initialize quota plugins
for _, srv := range c.Config.Services {
plugin := c.QuotaPlugins[srv.ServiceType]
err = yaml.UnmarshalStrict([]byte(srv.Parameters), plugin)

Check failure on line 107 in internal/core/cluster.go

View workflow job for this annotation

GitHub Actions / CodeQL

undefined: yaml.UnmarshalStrict

Check failure on line 107 in internal/core/cluster.go

View workflow job for this annotation

GitHub Actions / Build

undefined: yaml.UnmarshalStrict

Check failure on line 107 in internal/core/cluster.go

View workflow job for this annotation

GitHub Actions / Checks

undefined: yaml.UnmarshalStrict

Check failure on line 107 in internal/core/cluster.go

View workflow job for this annotation

GitHub Actions / Checks

undefined: yaml.UnmarshalStrict
if err != nil {
errs.Addf("failed to supply params to service %s: %w", srv.ServiceType, err)
continue
Expand All @@ -118,7 +118,7 @@
// initialize capacity plugins
for _, capa := range c.Config.Capacitors {
plugin := c.CapacityPlugins[capa.ID]
err = yaml.UnmarshalStrict([]byte(capa.Parameters), plugin)

Check failure on line 121 in internal/core/cluster.go

View workflow job for this annotation

GitHub Actions / CodeQL

undefined: yaml.UnmarshalStrict

Check failure on line 121 in internal/core/cluster.go

View workflow job for this annotation

GitHub Actions / Build

undefined: yaml.UnmarshalStrict

Check failure on line 121 in internal/core/cluster.go

View workflow job for this annotation

GitHub Actions / Checks

undefined: yaml.UnmarshalStrict

Check failure on line 121 in internal/core/cluster.go

View workflow job for this annotation

GitHub Actions / Checks

undefined: yaml.UnmarshalStrict
if err != nil {
errs.Addf("failed to supply params to capacitor %s: %w", capa.ID, err)
continue
Expand Down
2 changes: 1 addition & 1 deletion internal/core/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
limesresources "github.com/sapcc/go-api-declarations/limes/resources"
"github.com/sapcc/go-bits/errext"
"github.com/sapcc/go-bits/regexpext"
yaml "gopkg.in/yaml.v2"
yaml "gopkg.in/yaml.v3"

"github.com/sapcc/limes/internal/db"
"github.com/sapcc/limes/internal/util"
Expand Down Expand Up @@ -150,7 +150,7 @@
// Errors are logged and will result in program termination, causing the function to not return.
func NewClusterFromYAML(configBytes []byte) (cluster *Cluster, errs errext.ErrorSet) {
var config ClusterConfiguration
err := yaml.UnmarshalStrict(configBytes, &config)

Check failure on line 153 in internal/core/config.go

View workflow job for this annotation

GitHub Actions / CodeQL

undefined: yaml.UnmarshalStrict

Check failure on line 153 in internal/core/config.go

View workflow job for this annotation

GitHub Actions / Build

undefined: yaml.UnmarshalStrict

Check failure on line 153 in internal/core/config.go

View workflow job for this annotation

GitHub Actions / Checks

undefined: yaml.UnmarshalStrict) (typecheck)

Check failure on line 153 in internal/core/config.go

View workflow job for this annotation

GitHub Actions / Checks

undefined: yaml.UnmarshalStrict) (typecheck)
if err != nil {
errs.Addf("parse configuration: %w", err)
return nil, errs
Expand Down
2 changes: 1 addition & 1 deletion internal/test/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
"github.com/sapcc/go-bits/mock"
"github.com/sapcc/go-bits/osext"
"github.com/sapcc/go-bits/sqlext"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"

"github.com/sapcc/limes/internal/core"
"github.com/sapcc/limes/internal/db"
Expand Down
2 changes: 1 addition & 1 deletion internal/util/datatypes.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"encoding/json"
"time"

"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

// Float64OrUnknown extracts a value of type float64 or unknown from a json
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ import (
"github.com/sapcc/go-bits/must"
"github.com/sapcc/go-bits/osext"
"go.uber.org/automaxprocs/maxprocs"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"

"github.com/sapcc/limes/internal/api"
"github.com/sapcc/limes/internal/collector"
Expand Down
Loading