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.

Sign up for GitHub

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

fix: updating go packages #1691

Merged
merged 1 commit into from
Jan 14, 2025
Merged

fix: updating go packages #1691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions cmd/database/database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/docker/docker/api/types/container"
dockerContainer "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/image"
"github.com/docker/docker/api/types/mount"
dockerVolume "github.com/docker/docker/api/types/volume"
"github.com/docker/docker/client"
Expand Down Expand Up @@ -159,7 +160,7 @@ func fetchPostgresImageIfNecessary(dockerClient *client.Client) error {

if postgresImage == nil {
fmt.Println("Pulling postgres Docker image...")
reader, err := dockerClient.ImagePull(context.Background(), postgresImageName+":"+postgresTag, types.ImagePullOptions{})
reader, err := dockerClient.ImagePull(context.Background(), postgresImageName+":"+postgresTag, image.PullOptions{})
if err != nil {
return err
}
Expand Down Expand Up @@ -187,7 +188,7 @@ func removeContainer(dockerClient *client.Client) error {
if err := dockerClient.ContainerRemove(
context.Background(),
containerMetadata.ID,
types.ContainerRemoveOptions{
dockerContainer.RemoveOptions{
RemoveVolumes: false,
Force: true,
}); err != nil {
Expand Down Expand Up @@ -256,7 +257,7 @@ func startContainer(dockerClient *client.Client, containerID string) error {
if err := dockerClient.ContainerStart(
context.Background(),
containerID,
types.ContainerStartOptions{}); err != nil {
dockerContainer.StartOptions{}); err != nil {
return err
}
return nil
Expand All @@ -265,8 +266,8 @@ func startContainer(dockerClient *client.Client, containerID string) error {
// findImage looks up the Postgres Docker Image we require in the local
// Docker Image Resistry and returns its metadata. It it is not registered,
// it signals this by returning nil metadata.
func findImage(dockerClient *client.Client) (*types.ImageSummary, error) {
images, err := dockerClient.ImageList(context.Background(), types.ImageListOptions{})
func findImage(dockerClient *client.Client) (*image.Summary, error) {
images, err := dockerClient.ImageList(context.Background(), image.ListOptions{})
if err != nil {
return nil, err
}
Expand All @@ -283,7 +284,7 @@ func findImage(dockerClient *client.Client) (*types.ImageSummary, error) {
// findContainer obtains a reference to the Postgres container we make, if one exists.
// If it cannot find it it returns container as nil.
func findContainer(dockerClient *client.Client) (container *types.Container, err error) {
containers, err := dockerClient.ContainerList(context.Background(), types.ContainerListOptions{
containers, err := dockerClient.ContainerList(context.Background(), dockerContainer.ListOptions{
All: true,
})
if err != nil {
Expand Down
163 changes: 86 additions & 77 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@ module github.com/teamkeel/keel
go 1.23

require (
github.com/99designs/gqlgen v0.17.16
github.com/Masterminds/semver/v3 v3.2.1
github.com/99designs/gqlgen v0.17.63
github.com/Masterminds/semver/v3 v3.3.1
github.com/PaesslerAG/jsonpath v0.1.1
github.com/alecthomas/participle/v2 v2.0.0-beta.5
github.com/bmatcuk/doublestar/v4 v4.2.0
github.com/bykof/gostradamus v1.0.4
github.com/charmbracelet/bubbles v0.16.1
github.com/charmbracelet/bubbletea v0.24.2
github.com/charmbracelet/lipgloss v0.7.1
github.com/alecthomas/participle/v2 v2.1.1
github.com/bmatcuk/doublestar/v4 v4.7.1
github.com/bykof/gostradamus v1.1.2
github.com/charmbracelet/bubbles v0.20.0
github.com/charmbracelet/bubbletea v1.2.4
github.com/charmbracelet/lipgloss v1.0.0
github.com/coreos/go-oidc v2.2.1+incompatible
github.com/dchest/uniuri v1.2.0
github.com/docker/docker v24.0.9+incompatible
github.com/docker/go-connections v0.4.0
github.com/docker/docker v27.4.1+incompatible
github.com/docker/go-connections v0.5.0
github.com/fatih/camelcase v1.0.0
github.com/goccy/go-yaml v1.12.0
github.com/golang-jwt/jwt/v4 v4.4.2
github.com/hashicorp/go-version v1.6.0
github.com/iancoleman/strcase v0.2.0
github.com/jackc/pgx/v5 v5.5.5
github.com/goccy/go-yaml v1.15.13
github.com/golang-jwt/jwt/v4 v4.5.1
github.com/hashicorp/go-version v1.7.0
github.com/iancoleman/strcase v0.3.0
github.com/jackc/pgx/v5 v5.7.2
github.com/jinzhu/inflection v1.0.0
github.com/jonbretman/gotestpretty v0.0.0-20200908080245-691cf3e7550c
github.com/ka-weihe/fast-levenshtein v0.0.0-20201227151214-4c99ee36a1ba
Expand All @@ -30,103 +30,112 @@ require (
github.com/manifoldco/promptui v0.9.0
github.com/nleeper/goment v1.4.4
github.com/nsf/jsondiff v0.0.0-20230430225905-43f6cf3098c1
github.com/otiai10/copy v1.7.0
github.com/otiai10/copy v1.14.1
github.com/radovskyb/watcher v1.0.7
github.com/relvacode/iso8601 v1.3.0
github.com/rs/cors v1.8.2
github.com/samber/lo v1.28.0
github.com/relvacode/iso8601 v1.6.0
github.com/rs/cors v1.11.1
github.com/samber/lo v1.47.0
github.com/sanity-io/litter v1.5.5
github.com/segmentio/ksuid v1.0.4
github.com/sergi/go-diff v1.2.0
github.com/spf13/cobra v1.5.0
github.com/spf13/viper v1.15.0
github.com/stretchr/testify v1.8.4
github.com/spf13/cobra v1.8.1
github.com/spf13/viper v1.19.0
github.com/stretchr/testify v1.10.0
github.com/teamkeel/graphql v0.8.2-0.20230531102419-995b8ab035b6
github.com/twitchtv/twirp v8.1.3+incompatible
github.com/vincent-petithory/dataurl v1.0.0
github.com/xeipuuv/gojsonschema v1.2.0
go.opentelemetry.io/otel v1.21.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0
go.opentelemetry.io/otel/sdk v1.21.0
go.opentelemetry.io/otel/trace v1.21.0
go.opentelemetry.io/proto/otlp v1.0.0
golang.org/x/exp v0.0.0-20220907003533-145caa8ea1d0
golang.org/x/oauth2 v0.13.0
google.golang.org/protobuf v1.33.0
go.opentelemetry.io/otel v1.33.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.33.0
go.opentelemetry.io/otel/sdk v1.33.0
go.opentelemetry.io/otel/trace v1.33.0
go.opentelemetry.io/proto/otlp v1.5.0
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8
golang.org/x/oauth2 v0.25.0
google.golang.org/protobuf v1.36.2
gopkg.in/yaml.v3 v3.0.1
gorm.io/driver/postgres v1.5.0
gorm.io/gorm v1.25.1
gorm.io/driver/postgres v1.5.11
gorm.io/gorm v1.25.12
)

require (
github.com/PaesslerAG/gval v1.0.0 // indirect
github.com/PaesslerAG/gval v1.2.4 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/charmbracelet/x/ansi v0.6.0 // indirect
github.com/charmbracelet/x/term v0.2.1 // indirect
github.com/chzyer/readline v1.5.1 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
github.com/fatih/color v1.18.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/jackc/puddle/v2 v2.2.1 // indirect
github.com/jackc/puddle/v2 v2.2.2 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/magiconair/properties v1.8.9 // indirect
github.com/mattn/go-localereader v0.0.1 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/mattn/go-runewidth v0.0.16 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
github.com/muesli/cancelreader v0.2.2 // indirect
github.com/muesli/reflow v0.3.0 // indirect
github.com/muesli/termenv v0.15.1 // indirect
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
github.com/muesli/termenv v0.15.2 // indirect
github.com/otiai10/mint v1.6.3 // indirect
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
github.com/pquerna/cachecontrol v0.2.0 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/spf13/afero v1.9.3 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
github.com/tkuchiki/go-timezone v0.2.0 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/sagikazarmark/locafero v0.7.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.12.0 // indirect
github.com/spf13/cast v1.7.1 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/tkuchiki/go-timezone v0.2.3 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
go.opentelemetry.io/otel/metric v1.21.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/grpc v1.59.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
go.opentelemetry.io/otel/metric v1.33.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/text v0.21.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect
google.golang.org/grpc v1.69.4 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
)

require (
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-colorable v0.1.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.2 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/pkg/errors v0.9.1
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/sirupsen/logrus v1.9.0
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/sirupsen/logrus v1.9.3
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/crypto v0.17.0
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/crypto v0.32.0
golang.org/x/net v0.34.0 // indirect
golang.org/x/sys v0.29.0 // indirect
gotest.tools/v3 v3.3.0 // indirect
)
Loading
Loading