Skip to content

Commit

Permalink
Bump github.com/ClickHouse/clickhouse-go/v2 from 2.23.0 to 2.29.0 (#3212
Browse files Browse the repository at this point in the history 
)

* Bump github.com/ClickHouse/clickhouse-go/v2 from 2.23.0 to 2.29.0

Bumps [github.com/ClickHouse/clickhouse-go/v2](https://github.com/ClickHouse/clickhouse-go) from 2.23.0 to 2.29.0.
- [Release notes](https://github.com/ClickHouse/clickhouse-go/releases)
- [Changelog](https://github.com/ClickHouse/clickhouse-go/blob/main/CHANGELOG.md)
- [Commits](ClickHouse/clickhouse-go@v2.23.0...v2.29.0)

---
updated-dependencies:
- dependency-name: github.com/ClickHouse/clickhouse-go/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore: fix image.PullOptions type

* chore: fix container.ListOptions type

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alex Demidoff <[email protected]>
  • Loading branch information
@dependabot @ademidoff
dependabot[bot] and ademidoff authored Oct 9, 2024
1 parent 0837e06 commit 4e5e2e9
Show file tree
Hide file tree
Showing 9 changed files with 56 additions and 50 deletions.
3 changes: 2 additions & 1 deletion admin/commands/pmm/server/docker/deps.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
tea "github.com/charmbracelet/bubbletea"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/image"
"github.com/docker/docker/api/types/volume"
"github.com/docker/docker/client"

Expand All @@ -47,7 +48,7 @@ type Functions interface { //nolint:interfacebloat
// Imager holds methods to interact with Docker images.
type Imager interface {
ParsePullImageProgress(r io.Reader, p *tea.Program) (<-chan struct{}, <-chan error)
PullImage(ctx context.Context, dockerImage string, opts types.ImagePullOptions) (io.Reader, error)
PullImage(ctx context.Context, dockerImage string, opts image.PullOptions) (io.Reader, error)
}

// Installer holds methods related to Docker installation.
Expand Down
4 changes: 2 additions & 2 deletions admin/commands/pmm/server/docker/install.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"strconv"

tea "github.com/charmbracelet/bubbletea"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/image"
"github.com/docker/docker/api/types/volume"
"github.com/docker/go-connections/nat"
"github.com/pkg/errors"
Expand Down Expand Up @@ -145,7 +145,7 @@ func (c *InstallCommand) runContainer(ctx context.Context, volume *volume.Volume

// pullImage pulls a docker image and displays progress.
func (c *InstallCommand) pullImage(ctx context.Context, globals *flags.GlobalFlags) (commands.Result, error) {
reader, err := c.dockerFn.PullImage(ctx, c.DockerImage, types.ImagePullOptions{})
reader, err := c.dockerFn.PullImage(ctx, c.DockerImage, image.PullOptions{})
if err != nil {
return nil, err
}
Expand Down
9 changes: 5 additions & 4 deletions admin/commands/pmm/server/docker/mock_functions_test.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion admin/commands/pmm/server/docker/upgrade.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (

"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/image"
"github.com/docker/docker/api/types/mount"
"github.com/docker/docker/api/types/strslice"
"github.com/pkg/errors"
Expand Down Expand Up @@ -204,7 +205,7 @@ func (c *UpgradeCommand) backupVolumes(ctx context.Context, container *types.Con
}

func (c *UpgradeCommand) pullImage(ctx context.Context, imageName string) error {
reader, err := c.dockerFn.PullImage(ctx, imageName, types.ImagePullOptions{})
reader, err := c.dockerFn.PullImage(ctx, imageName, image.PullOptions{})
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions admin/pkg/docker/docker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ func (b *Base) GetDockerClient() *client.Client {

// FindServerContainers finds all containers running PMM Server.
func (b *Base) FindServerContainers(ctx context.Context) ([]types.Container, error) {
return b.Cli.ContainerList(ctx, types.ContainerListOptions{ //nolint:exhaustruct
return b.Cli.ContainerList(ctx, container.ListOptions{ //nolint:exhaustruct
All: true,
Filters: filters.NewArgs(filters.KeyValuePair{
Key: "label",
Expand Down Expand Up @@ -221,7 +221,7 @@ func (b *Base) RunContainer(ctx context.Context, config *container.Config, hostC
return "", err
}

if err := b.Cli.ContainerStart(ctx, res.ID, types.ContainerStartOptions{}); err != nil { //nolint:exhaustruct
if err := b.Cli.ContainerStart(ctx, res.ID, container.StartOptions{}); err != nil { //nolint:exhaustruct
return "", err
}

Expand Down
4 changes: 2 additions & 2 deletions admin/pkg/docker/pull_image.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ import (
"io"

tea "github.com/charmbracelet/bubbletea"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/image"

"github.com/percona/pmm/admin/pkg/bubbles/progress"
)

// PullImage pulls image from Docker registry.
func (b *Base) PullImage(ctx context.Context, dockerImage string, opts types.ImagePullOptions) (io.Reader, error) {
func (b *Base) PullImage(ctx context.Context, dockerImage string, opts image.PullOptions) (io.Reader, error) {
return b.Cli.ImagePull(ctx, dockerImage, opts)
}

Expand Down
23 changes: 12 additions & 11 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ replace github.com/ClickHouse/clickhouse-go/151 => github.com/ClickHouse/clickho
require (
github.com/AlekSi/pointer v1.2.0
github.com/ClickHouse/clickhouse-go/151 v0.0.0-00010101000000-000000000000
github.com/ClickHouse/clickhouse-go/v2 v2.23.0
github.com/ClickHouse/clickhouse-go/v2 v2.29.0
github.com/DATA-DOG/go-sqlmock v1.5.0
github.com/alecthomas/kong v0.9.0
github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9
Expand All @@ -30,7 +30,7 @@ require (
github.com/charmbracelet/bubbletea v0.26.6
github.com/charmbracelet/lipgloss v0.12.1
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
github.com/docker/docker v25.0.3+incompatible
github.com/docker/docker v27.3.0+incompatible
github.com/docker/go-connections v0.5.0
github.com/envoyproxy/protoc-gen-validate v1.1.0
github.com/go-co-op/gocron v1.37.0
Expand Down Expand Up @@ -107,13 +107,13 @@ require (
github.com/charmbracelet/x/term v0.1.1 // indirect
github.com/charmbracelet/x/windows v0.1.0 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-ini/ini v1.67.0 // indirect
Expand All @@ -137,6 +137,7 @@ require (
github.com/mattn/go-ieproxy v0.0.1 // indirect
github.com/minio/minio-go v6.0.14+incompatible // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mwitkow/go-proto-validators v0.3.2 // indirect
Expand All @@ -149,9 +150,9 @@ require (
github.com/x448/float16 v0.8.4 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.26.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
golang.org/x/time v0.3.0 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
Expand All @@ -176,7 +177,7 @@ require (
github.com/ClickHouse/ch-go v0.61.5 // indirect
github.com/ClickHouse/clickhouse-go v1.5.4 // indirect
github.com/HdrHistogram/hdrhistogram-go v1.1.2
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
github.com/andybalholm/brotli v1.1.0 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
Expand Down Expand Up @@ -236,7 +237,7 @@ require (
github.com/oklog/run v1.1.0 // indirect
github.com/oklog/ulid v1.3.1 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/paulmach/orb v0.11.1 // indirect
github.com/pierrec/lz4/v4 v4.1.21 // indirect
Expand All @@ -249,15 +250,15 @@ require (
github.com/rs/xid v1.5.0 // indirect
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
github.com/segmentio/asm v1.2.0 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.1.2 // indirect
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
go.opentelemetry.io/otel v1.26.0 // indirect
go.opentelemetry.io/otel/trace v1.26.0 // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
Expand Down
Loading

0 comments on commit 4e5e2e9

Please sign in to comment.