Bump github.com/moby/buildkit from 0.8.3 to 0.12.5 (#69)

Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: misraved <[email protected]>
turbot · Jul 15, 2024 · 7795eff · 7795eff
1 parent 8cd19b0
commit 7795eff
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 1,018 deletions.
diff --git a/docker/table_docker_volume.go b/docker/table_docker_volume.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/docker/docker/api/types/filters"
+	"github.com/docker/docker/api/types/volume"
 
 	"github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto"
 	"github.com/turbot/steampipe-plugin-sdk/v5/plugin"
@@ -39,14 +40,22 @@ func listVolume(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateData)
 		plugin.Logger(ctx).Error("docker_volume.listVolume", "connection_error", err)
 		return nil, err
 	}
+
 	params := filters.Args{}
-	result, err := conn.VolumeList(ctx, params)
+	options := volume.ListOptions{
+		Filters: params,
+	}
+
+	result, err := conn.VolumeList(ctx, options)
 	if err != nil {
 		plugin.Logger(ctx).Error("docker_volume.listVolume", "query_error", err, "params", params)
 		return nil, err
 	}
+
 	for _, i := range result.Volumes {
 		d.StreamListItem(ctx, i)
 	}
+
 	return nil, nil
 }
+
diff --git a/docker/table_dockerfile_instruction.go b/docker/table_dockerfile_instruction.go
@@ -145,13 +145,11 @@ func dockerfileList(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateD
 		dPath = append(dPath, dockerConfig.DockerfilePaths...)
 	}
 	for _, i := range dPath {
-
 		// List the files in the given source directory
 		files, err := d.GetSourceFiles(i)
 		if err != nil {
-			plugin.Logger(ctx).Error("dockerfile_instruction.dockerfileList", "get_source_files_error", err)
-
 			// If the specified path is unavailable, then an empty row should populate
+			plugin.Logger(ctx).Error("dockerfile_instruction.dockerfileList", "get_source_files_error", err)
 			if strings.Contains(err.Error(), "failed to get directory specified by the source") {
 				return nil, nil
 			}
@@ -175,7 +173,6 @@ func dockerfileList(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateD
 }
 
 func listDockerfileInstruction(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) {
-
 	// The path comes from a parent hydrate, defaulting to the config paths or
 	// available by the optional key column
 	path := h.Item.(filePath)
@@ -189,7 +186,7 @@ func listDockerfileInstruction(ctx context.Context, d *plugin.QueryData, h *plug
 
 	parsed, err := parser.Parse(reader)
 	if err != nil {
-		// Could not open the file, so log and ignore
+		// Could not parse the file, so log and ignore
 		plugin.Logger(ctx).Error("listDockerfileInstruction", "parse_error", err, "path", path.Path)
 		return nil, nil
 	}
@@ -198,7 +195,6 @@ func listDockerfileInstruction(ctx context.Context, d *plugin.QueryData, h *plug
 	stageNumber := -1
 
 	for _, i := range parsed.AST.Children {
-
 		cmd := Command{
 			Path:        path.Path,
 			Instruction: i.Value,
@@ -244,8 +240,8 @@ func listDockerfileInstruction(ctx context.Context, d *plugin.QueryData, h *plug
 			data := copyInstructionData{
 				Chmod:   ic.Chmod,
 				Chown:   ic.Chown,
-				Dest:    ic.SourcesAndDest[len(ic.SourcesAndDest)-1],
-				Sources: ic.SourcesAndDest[0 : len(ic.SourcesAndDest)-1],
+				Dest:    ic.SourcesAndDest.DestPath,
+				Sources: ic.SourcesAndDest.SourcePaths,
 			}
 			cmd.Data = data
 		case *instructions.ArgCommand:
@@ -267,8 +263,8 @@ func listDockerfileInstruction(ctx context.Context, d *plugin.QueryData, h *plug
 			data := copyInstructionData{
 				Chmod:   ic.Chmod,
 				Chown:   ic.Chown,
-				Dest:    ic.SourcesAndDest[len(ic.SourcesAndDest)-1],
-				Sources: ic.SourcesAndDest[0 : len(ic.SourcesAndDest)-1],
+				Dest:    ic.SourcesAndDest.DestPath,
+				Sources: ic.SourcesAndDest.SourcePaths,
 			}
 			cmd.Data = data
 		case *instructions.EntrypointCommand:
@@ -288,7 +284,6 @@ func listDockerfileInstruction(ctx context.Context, d *plugin.QueryData, h *plug
 				parts := strings.Split(p, "/")
 				iPort, err := strconv.Atoi(parts[0])
 				if err != nil {
-					// Log and ignore errors
 					plugin.Logger(ctx).Error("listDockerfileInstruction", "expose_data_parsing_error", err, "cmd", cmd)
 					continue
 				}

diff --git a/go.mod b/go.mod
@@ -6,8 +6,8 @@ toolchain go1.21.4
 
 require (
 	github.com/compose-spec/compose-go v1.17.0
-	github.com/docker/docker v20.10.7+incompatible
-	github.com/moby/buildkit v0.8.3
+	github.com/docker/docker v24.0.0-rc.2.0.20230718135204-8e51b8b59cb8+incompatible
+	github.com/moby/buildkit v0.12.5
 	github.com/pkg/errors v0.9.1
 	github.com/turbot/go-kit v0.10.0-rc.0
 	github.com/turbot/steampipe-plugin-sdk/v5 v5.10.1
@@ -19,9 +19,9 @@ require (
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	cloud.google.com/go/iam v1.1.6 // indirect
 	cloud.google.com/go/storage v1.36.0 // indirect
-	github.com/Microsoft/go-winio v0.4.15 // indirect
+	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
-	github.com/agext/levenshtein v1.2.2 // indirect
+	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/allegro/bigcache/v3 v3.1.0 // indirect
 	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
 	github.com/aws/aws-sdk-go v1.44.122 // indirect
@@ -30,12 +30,11 @@ require (
 	github.com/btubbs/datetime v0.1.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/containerd/containerd v1.4.1-0.20201117152358-0edc412565dc // indirect
-	github.com/containerd/typeurl v1.0.1 // indirect
+	github.com/containerd/typeurl/v2 v2.1.1 // indirect
 	github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect
 	github.com/dgraph-io/ristretto v0.1.1 // indirect
 	github.com/distribution/distribution/v3 v3.0.0-20230214150026-36d8c594d7aa // indirect
-	github.com/docker/distribution v2.7.1+incompatible // indirect
+	github.com/docker/distribution v2.8.2+incompatible // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/dustin/go-humanize v1.0.0 // indirect
@@ -71,7 +70,7 @@ require (
 	github.com/iancoleman/strcase v0.3.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/klauspost/compress v1.15.11 // indirect
+	github.com/klauspost/compress v1.17.2 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
@@ -81,14 +80,15 @@ require (
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/moby/term v0.5.0 // indirect
 	github.com/oklog/run v1.0.0 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // 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-rc3 // indirect
 	github.com/prometheus/client_golang v1.14.0 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.37.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
+	github.com/prometheus/procfs v0.9.0 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/sethvargo/go-retry v0.2.4 // indirect
 	github.com/sirupsen/logrus v1.9.0 // indirect
@@ -120,7 +120,7 @@ require (
 	golang.org/x/sys v0.19.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.6.0 // indirect
+	golang.org/x/tools v0.7.0 // indirect
 	google.golang.org/api v0.162.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect