Merge pull request #23699 from TomSweeneyRedHat/dev/tsweeney/buildah_v1.37.2

[v5.2] Bump Buildah to v1.37.2, c/common v0.60.2, c/image v5.32.2

Makefile

@@ -62,7 +62,7 @@ BUILDTAGS += ${EXTRA_BUILDTAGS}
 # N/B: This value is managed by Renovate, manual changes are
 # possible, as long as they don't disturb the formatting
 # (i.e. DO NOT ADD A 'v' prefix!)
-GOLANGCI_LINT_VERSION := 1.59.1
+GOLANGCI_LINT_VERSION := 1.60.1
 PYTHON ?= $(shell command -v python3 python|head -n1)
 PKG_MANAGER ?= $(shell command -v dnf yum|head -n1)
 # ~/.local/bin is not in PATH on all systems

cmd/podman-testing/create.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package main
 
 import (

cmd/podman-testing/data.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package main
 
 import (

cmd/podman-testing/layer.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package main
 
 import (

cmd/podman-testing/main.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package main
 
 import (

cmd/podman-testing/remove.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package main
 
 import (

cmd/podman-testing/store_supported.go

@@ -1,5 +1,4 @@
 //go:build linux && !remote
-// +build linux,!remote
 
 package main
 

cmd/podman-testing/store_unsupported.go

@@ -1,16 +0,0 @@
-//go:build !linux || remote
-// +build !linux remote
-
-package main
-
-import "github.com/containers/podman/v5/pkg/domain/entities"
-
-const engineMode = entities.TunnelMode
-
-func storeBefore() error {
-	return nil
-}
-
-func storeAfter() error {
-	return nil
-}

cmd/podman/containers/commit.go

@@ -9,7 +9,6 @@ import (
 	"github.com/containers/common/pkg/completion"
 	"github.com/containers/podman/v5/cmd/podman/common"
 	"github.com/containers/podman/v5/cmd/podman/registry"
-	"github.com/containers/podman/v5/pkg/api/handlers"
 	"github.com/containers/podman/v5/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
@@ -105,9 +104,6 @@ func commit(cmd *cobra.Command, args []string) error {
 	if !commitOptions.Quiet {
 		commitOptions.Writer = os.Stderr
 	}
-	if len(commitOptions.Changes) > 0 {
-		commitOptions.Changes = handlers.DecodeChanges(commitOptions.Changes)
-	}
 	if len(configFile) > 0 {
 		cfg, err := os.ReadFile(configFile)
 		if err != nil {

cmd/podman/containers/create.go

@@ -314,7 +314,7 @@ func CreateInit(c *cobra.Command, vals entities.ContainerCreateOptions, isInfra
 		vals.ShmSizeSystemd = c.Flag("shm-size-systemd").Value.String()
 	}
 	if (c.Flag("dns").Changed || c.Flag("dns-option").Changed || c.Flag("dns-search").Changed) && vals.Net != nil && (vals.Net.Network.NSMode == specgen.NoNetwork || vals.Net.Network.IsContainer()) {
-		return vals, fmt.Errorf("conflicting options: dns and the network mode: " + string(vals.Net.Network.NSMode))
+		return vals, errors.New("conflicting options: dns and the network mode: " + string(vals.Net.Network.NSMode))
 	}
 	noHosts, err := c.Flags().GetBool("no-hosts")
 	if err != nil {

go.mod

@@ -12,11 +12,11 @@ require (
 	github.com/checkpoint-restore/checkpointctl v1.2.1
 	github.com/checkpoint-restore/go-criu/v7 v7.1.0
 	github.com/containernetworking/plugins v1.5.1
-	github.com/containers/buildah v1.37.1
-	github.com/containers/common v0.60.1
+	github.com/containers/buildah v1.37.2
+	github.com/containers/common v0.60.2
 	github.com/containers/conmon v2.0.20+incompatible
 	github.com/containers/gvisor-tap-vsock v0.7.4
-	github.com/containers/image/v5 v5.32.1
+	github.com/containers/image/v5 v5.32.2
 	github.com/containers/libhvee v0.7.1
 	github.com/containers/ocicrypt v1.2.0
 	github.com/containers/psgo v1.9.0

go.sum

@@ -77,16 +77,16 @@ github.com/containernetworking/cni v1.2.3 h1:hhOcjNVUQTnzdRJ6alC5XF+wd9mfGIUaj8F
 github.com/containernetworking/cni v1.2.3/go.mod h1:DuLgF+aPd3DzcTQTtp/Nvl1Kim23oFKdm2okJzBQA5M=
 github.com/containernetworking/plugins v1.5.1 h1:T5ji+LPYjjgW0QM+KyrigZbLsZ8jaX+E5J/EcKOE4gQ=
 github.com/containernetworking/plugins v1.5.1/go.mod h1:MIQfgMayGuHYs0XdNudf31cLLAC+i242hNm6KuDGqCM=
-github.com/containers/buildah v1.37.1 h1:BZ3vESqzmqGuj9kGqyjitdn9o0hD7owdZM699qtfMTc=
-github.com/containers/buildah v1.37.1/go.mod h1:p/qfxznBMSn9YGYNBh0Sf2k4modfjD3us4rVqvmyeZM=
-github.com/containers/common v0.60.1 h1:hMJNKfDxfXY91zD7mr4t/Ybe8JbAsTq5nkrUaCqTKsA=
-github.com/containers/common v0.60.1/go.mod h1:tB0DRxznmHviECVHnqgWbl+8AVCSMZLA8qe7+U7KD6k=
+github.com/containers/buildah v1.37.2 h1:KiJ3jVNUvdtGORxDz8fjjLkR81ZHQZIfnGWJWavks40=
+github.com/containers/buildah v1.37.2/go.mod h1:alFCM3X0xfhE6ZjsFQkUlOMyKzOnbv9FL9fe1Ho48PA=
+github.com/containers/common v0.60.2 h1:utcwp2YkO8c0mNlwRxsxfOiqfj157FRrBjxgjR6f+7o=
+github.com/containers/common v0.60.2/go.mod h1:I0upBi1qJX3QmzGbUOBN1LVP6RvkKhd3qQpZbQT+Q54=
 github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg=
 github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I=
 github.com/containers/gvisor-tap-vsock v0.7.4 h1:iOtr/KEi+r599OOx1+9Qbss91jD5yxh1HO35MKTdths=
 github.com/containers/gvisor-tap-vsock v0.7.4/go.mod h1:orUOSdxU/IGEOxhecu2i7EzV7k7e2TgQlyCBfUngS0A=
-github.com/containers/image/v5 v5.32.1 h1:fVa7GxRC4BCPGsfSRs4JY12WyeY26SUYQ0NuANaCFrI=
-github.com/containers/image/v5 v5.32.1/go.mod h1:v1l73VeMugfj/QtKI+jhYbwnwFCFnNGckvbST3rQ5Hk=
+github.com/containers/image/v5 v5.32.2 h1:SzNE2Y6sf9b1GJoC8qjCuMBXwQrACFp4p0RK15+4gmQ=
+github.com/containers/image/v5 v5.32.2/go.mod h1:v1l73VeMugfj/QtKI+jhYbwnwFCFnNGckvbST3rQ5Hk=
 github.com/containers/libhvee v0.7.1 h1:dWGF5GLq9DZvXo3P8aDp3cNieL5eCaSell4UmeA/jY4=
 github.com/containers/libhvee v0.7.1/go.mod h1:fRKB3AyIqHMvq6xaeYhTpckM2cdoq0oecolyoiuLP7M=
 github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA=

hack/golangci-lint.sh

@@ -18,11 +18,11 @@ BUILD_TAGS_TUNNEL="$BUILD_TAGS_DEFAULT,remote"
 BUILD_TAGS_REMOTE="remote,containers_image_openpgp"
 
 SKIP_DIRS_ABI=""
-SKIP_DIRS_TUNNEL="pkg/api,pkg/domain/infra/abi,internal/domain/infra/abi"
-SKIP_DIRS_REMOTE="libpod/events,pkg/api,pkg/domain/infra/abi,internal/domain/infra/abi,pkg/machine/qemu,pkg/trust,test"
+SKIP_DIRS_TUNNEL=""
+SKIP_DIRS_REMOTE="libpod/events,pkg/machine/qemu,pkg/machine/wsl,test"
 
 declare -a to_lint
-to_lint=(ABI TUNNEL REMOTE)
+to_lint=(ABI TUNNEL)
 
 # Special-case, for Darwin and Windows only "remote" linting is possible and required.
 if [[ "$GOOS" == "windows" ]] || [[ "$GOOS" == "darwin" ]]; then

internal/domain/entities/engine_testing.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package entities
 
 import (

internal/domain/entities/testing.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package entities
 
 type CreateStorageLayerOptions struct {

internal/domain/infra/abi/testing.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import (

internal/domain/infra/abi/testing_test.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package abi
 
 import "github.com/containers/podman/v5/internal/domain/entities"

internal/domain/infra/runtime_tunnel.go

@@ -1,25 +0,0 @@
-//go:build remote
-
-package infra
-
-import (
-	"context"
-	"fmt"
-
-	ientities "github.com/containers/podman/v5/internal/domain/entities"
-	"github.com/containers/podman/v5/internal/domain/infra/tunnel"
-	"github.com/containers/podman/v5/pkg/bindings"
-	"github.com/containers/podman/v5/pkg/domain/entities"
-)
-
-// NewTestingEngine factory provides a libpod runtime for testing-specific operations
-func NewTestingEngine(facts *entities.PodmanConfig) (ientities.TestingEngine, error) {
-	switch facts.EngineMode {
-	case entities.ABIMode:
-		return nil, fmt.Errorf("direct image runtime not supported")
-	case entities.TunnelMode:
-		ctx, err := bindings.NewConnectionWithIdentity(context.Background(), facts.URI, facts.Identity, facts.MachineMode)
-		return &tunnel.TestingEngine{ClientCtx: ctx}, err
-	}
-	return nil, fmt.Errorf("runtime mode '%v' is not supported", facts.EngineMode)
-}

internal/domain/infra/tunnel/testing.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package tunnel
 
 import (

internal/domain/infra/tunnel/testing_test.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package tunnel
 
 import "github.com/containers/podman/v5/internal/domain/entities"

libpod/container_top_linux.go

@@ -411,7 +411,7 @@ func (c *Container) execPSinContainer(args []string) ([]string, error) {
 	if logrus.GetLevel() >= logrus.DebugLevel {
 		// If we're running in debug mode or higher, we might want to have a
 		// look at stderr which includes debug logs from conmon.
-		logrus.Debugf(errBuf.String())
+		logrus.Debug(errBuf.String())
 	}
 
 	if err := <-outErrChan; err != nil {

libpod/events/logfile_test.go

@@ -1,3 +1,5 @@
+//go:build linux || freebsd
+
 package events
 
 import (

pkg/annotations/validate.go

@@ -1,6 +1,7 @@
 package annotations
 
 import (
+	"errors"
 	"fmt"
 	"regexp"
 	"strings"
@@ -41,7 +42,7 @@ func isDNS1123Subdomain(value string) error {
 	}
 
 	if !dns1123SubdomainRegexp.MatchString(value) {
-		return fmt.Errorf(regexErrorMsg(dns1123SubdomainErrorMsg, dns1123SubdomainFmt, "example.com"))
+		return errors.New(regexErrorMsg(dns1123SubdomainErrorMsg, dns1123SubdomainFmt, "example.com"))
 	}
 
 	return nil

pkg/api/handlers/compat/auth.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/changes.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/containers.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/containers_archive.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/containers_attach.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/containers_create.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/containers_export.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/containers_logs.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/containers_pause.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/containers_prune.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/containers_restart.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/containers_start.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/containers_stats_freebsd.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/containers_stats_linux.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/containers_stop.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/containers_top.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/containers_unpause.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/events.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/exec.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/images.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (
@@ -137,7 +139,7 @@ func CommitContainer(w http.ResponseWriter, r *http.Request) {
 	options.Author = query.Author
 	options.Pause = query.Pause
 	options.Squash = query.Squash
-	options.Changes = handlers.DecodeChanges(query.Changes)
+	options.Changes = util.DecodeChanges(query.Changes)
 	if r.Body != nil {
 		defer r.Body.Close()
 		if options.CommitOptions.OverrideConfig, err = abi.DecodeOverrideConfig(r.Body); err != nil {

pkg/api/handlers/compat/images_build.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/images_history.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/images_prune.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/images_push.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/images_remove.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/images_save.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/images_search.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/images_tag.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/info.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/networks.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/ping.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/resize.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/secrets.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/system.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/types.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/unsupported.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/version.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/compat/volumes.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package compat
 
 import (

pkg/api/handlers/decoder.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package handlers
 
 import (

pkg/api/handlers/libpod/containers.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (

pkg/api/handlers/libpod/containers_create.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (

pkg/api/handlers/libpod/containers_stats.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (

pkg/api/handlers/libpod/generate.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (

pkg/api/handlers/libpod/healthcheck.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (

pkg/api/handlers/libpod/images.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (
@@ -499,7 +501,7 @@ func CommitContainer(w http.ResponseWriter, r *http.Request) {
 	options.Author = query.Author
 	options.Pause = query.Pause
 	options.Squash = query.Squash
-	options.Changes = handlers.DecodeChanges(query.Changes)
+	options.Changes = util.DecodeChanges(query.Changes)
 	ctr, err := runtime.LookupContainer(query.Container)
 	if err != nil {
 		utils.Error(w, http.StatusNotFound, err)

pkg/api/handlers/libpod/images_pull.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (

pkg/api/handlers/libpod/images_push.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (

pkg/api/handlers/libpod/info.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (

pkg/api/handlers/libpod/kube.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (

pkg/api/handlers/libpod/manifests.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (

pkg/api/handlers/libpod/networks.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (

pkg/api/handlers/libpod/play.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (

pkg/api/handlers/libpod/pods.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (

pkg/api/handlers/libpod/secrets.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (

pkg/api/handlers/libpod/swagger_spec.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (

pkg/api/handlers/libpod/system.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (

pkg/api/handlers/libpod/volumes.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package libpod
 
 import (

pkg/api/handlers/swagger/doc.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 // Package swagger defines the payloads used by the Podman API
 //
 //   - errors.go: declares the errors used in the API. By embedding errors.ErrorModel, more meaningful

pkg/api/handlers/swagger/errors.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 //nolint:unused // these types are used to wire generated swagger to API code
 package swagger
 

pkg/api/handlers/swagger/models.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 //nolint:unused // these types are used to wire generated swagger to API code
 package swagger
 

pkg/api/handlers/swagger/responses.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 //nolint:unused // these types are used to wire generated swagger to API code
 package swagger
 

pkg/api/handlers/utils/apiutil/apiutil.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package apiutil
 
 import (

pkg/api/handlers/utils/apiutil/apiutil_test.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package apiutil
 
 import (

pkg/api/handlers/utils/containers.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package utils
 
 import (

pkg/api/handlers/utils/errors.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package utils
 
 import (

pkg/api/handlers/utils/handler.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package utils
 
 import (

pkg/api/handlers/utils/handler_test.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package utils
 
 import (

pkg/api/handlers/utils/images.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package utils
 
 import (

pkg/api/server/doc.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 // Package server supports a RESTful API for the Libpod library
 //
 // This documentation describes the Podman v2.x+ RESTful API. It consists of a Docker-compatible

pkg/api/server/handler_api.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (

pkg/api/server/handler_logging.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (

pkg/api/server/handler_panic.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (

pkg/api/server/handler_rid.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (

pkg/api/server/idle/tracker.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package idle
 
 import (

pkg/api/server/listener_api.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (

pkg/api/server/register_archive.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (

pkg/api/server/register_auth.go

@@ -1,3 +1,5 @@
+//go:build !remote
+
 package server
 
 import (