Skip to content

Commit 336a6aa

Browse files
committed
Merge branch 'crossplane-contrib:master' into issue-227-generate-new-postgreSQL-password-for-role-after-restoration
2 parents 133108a + e2a4811 commit 336a6aa

7 files changed

Lines changed: 93 additions & 70 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ on:
1010

1111
env:
1212
# Common versions
13-
GO_VERSION: '1.24'
14-
GOLANGCI_VERSION: 'v2.1.2'
13+
GO_VERSION: '1.26'
14+
GOLANGCI_VERSION: 'v2.10.1'
1515
DOCKER_BUILDX_VERSION: 'v0.23.0'
1616

1717
# Common users. We can't run a step 'if secrets.AWS_USR != ""' but we can run

.github/workflows/publish-provider-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
required: false
1010
go-version:
1111
description: 'Go version to use if building needs to be done'
12-
default: '1.24'
12+
default: '1.26'
1313
required: false
1414

1515
jobs:

cmd/provider/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020
"os"
2121
"path/filepath"
2222

23-
_ "github.com/denisenkom/go-mssqldb"
2423
_ "github.com/go-sql-driver/mysql"
2524
_ "github.com/lib/pq"
25+
_ "github.com/microsoft/go-mssqldb"
2626

2727
"github.com/alecthomas/kingpin/v2"
2828
ctrl "sigs.k8s.io/controller-runtime"

go.mod

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
module github.com/crossplane-contrib/provider-sql
22

3-
go 1.24.7
3+
go 1.26.1
44

55
require (
66
github.com/DATA-DOG/go-sqlmock v1.5.2
77
github.com/alecthomas/kingpin/v2 v2.4.0
88
github.com/crossplane/crossplane-runtime/v2 v2.1.0
99
github.com/crossplane/crossplane-tools v0.0.0-20250731192036-00d407d8b7ec
1010
github.com/crossplane/upjet/v2 v2.2.0
11-
github.com/denisenkom/go-mssqldb v0.11.0
1211
github.com/go-sql-driver/mysql v1.9.3
1312
github.com/google/go-cmp v0.7.0
1413
github.com/lib/pq v1.11.2
14+
github.com/microsoft/go-mssqldb v1.9.8
1515
github.com/pkg/errors v0.9.1
1616
k8s.io/api v0.34.0
1717
k8s.io/apimachinery v0.34.0
@@ -46,7 +46,8 @@ require (
4646
github.com/go-openapi/swag v0.23.0 // indirect
4747
github.com/gobuffalo/flect v1.0.3 // indirect
4848
github.com/gogo/protobuf v1.3.2 // indirect
49-
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect
49+
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
50+
github.com/golang-sql/sqlexp v0.1.0 // indirect
5051
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5152
github.com/google/btree v1.1.3 // indirect
5253
github.com/google/gnostic-models v0.7.0 // indirect
@@ -67,6 +68,7 @@ require (
6768
github.com/prometheus/client_model v0.6.1 // indirect
6869
github.com/prometheus/common v0.62.0 // indirect
6970
github.com/prometheus/procfs v0.15.1 // indirect
71+
github.com/shopspring/decimal v1.4.0 // indirect
7072
github.com/spf13/afero v1.12.0 // indirect
7173
github.com/spf13/cobra v1.9.1 // indirect
7274
github.com/spf13/pflag v1.0.6 // indirect
@@ -75,27 +77,27 @@ require (
7577
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
7678
github.com/yuin/goldmark v1.4.13 // indirect
7779
github.com/zclconf/go-cty v1.16.2 // indirect
78-
go.opentelemetry.io/otel v1.35.0 // indirect
79-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
80+
go.opentelemetry.io/otel v1.39.0 // indirect
81+
go.opentelemetry.io/otel/trace v1.39.0 // indirect
8082
go.uber.org/multierr v1.11.0 // indirect
8183
go.uber.org/zap v1.27.0 // indirect
8284
go.yaml.in/yaml/v2 v2.4.2 // indirect
8385
go.yaml.in/yaml/v3 v3.0.4 // indirect
84-
golang.org/x/crypto v0.45.0 // indirect
85-
golang.org/x/mod v0.29.0 // indirect
86-
golang.org/x/net v0.47.0 // indirect
87-
golang.org/x/oauth2 v0.29.0 // indirect
88-
golang.org/x/sync v0.18.0 // indirect
89-
golang.org/x/sys v0.38.0 // indirect
90-
golang.org/x/term v0.37.0 // indirect
91-
golang.org/x/text v0.31.0 // indirect
86+
golang.org/x/crypto v0.48.0 // indirect
87+
golang.org/x/mod v0.32.0 // indirect
88+
golang.org/x/net v0.51.0 // indirect
89+
golang.org/x/oauth2 v0.34.0 // indirect
90+
golang.org/x/sync v0.19.0 // indirect
91+
golang.org/x/sys v0.41.0 // indirect
92+
golang.org/x/term v0.40.0 // indirect
93+
golang.org/x/text v0.34.0 // indirect
9294
golang.org/x/time v0.11.0 // indirect
93-
golang.org/x/tools v0.38.0 // indirect
95+
golang.org/x/tools v0.41.0 // indirect
9496
golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated // indirect
9597
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
96-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
97-
google.golang.org/grpc v1.72.1 // indirect
98-
google.golang.org/protobuf v1.36.6 // indirect
98+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
99+
google.golang.org/grpc v1.79.3 // indirect
100+
google.golang.org/protobuf v1.36.10 // indirect
99101
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
100102
gopkg.in/inf.v0 v0.9.1 // indirect
101103
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)