erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-10-23 14:27:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #27192 from kolyshkin/modernize-2

Browse source 
Misc nits
This commit is contained in:
openshift-merge-bot[bot] 2025-09-30 09:43:39 +00:00 • committed by GitHub
commit 4f776c0585
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkg/api/handlers/compat/images_build.go
View file

@ -923,10 +923,8 @@ func handleBuildContexts(r *http.Request, query url.Values, anchorDir string, mu
logrus.Debugf("name: %q, context: %q", name, value)
switch {
case strings.HasPrefix(value, "url:"):
value = strings.TrimPrefix(value, "url:")
tempDir, subdir, err := buildahDefine.TempDirForURL(anchorDir, "buildah", value)
if urlValue, ok := strings.CutPrefix(value, "url:"); ok {
tempDir, subdir, err := buildahDefine.TempDirForURL(anchorDir, "buildah", urlValue)
if err != nil {
return nil, fmt.Errorf("downloading URL %q: %w", name, err)
}
@ -940,15 +938,14 @@ func handleBuildContexts(r *http.Request, query url.Values, anchorDir string, mu
}
logrus.Debugf("Downloaded URL context %q to %q", name, contextPath)
case strings.HasPrefix(value, "image:"):
value = strings.TrimPrefix(value, "image:")
} else if imageValue, ok := strings.CutPrefix(value, "image:"); ok {
out.AdditionalBuildContexts[name] = &buildahDefine.AdditionalBuildContext{
IsURL: false,
IsImage: true,
Value: value,
Value: imageValue,
}
logrus.Debugf("Using image context %q: %q", name, value)
logrus.Debugf("Using image context %q: %q", name, imageValue)
}
}
@ -979,8 +976,7 @@ func handleBuildContexts(r *http.Request, query url.Values, anchorDir string, mu
fieldName := part.FormName()
switch {
case fieldName == "MainContext":
if fieldName == "MainContext" {
mainDir, err := extractTarFile(anchorDir, part)
if err != nil {
return nil, fmt.Errorf("extracting main context in multipart: %w", err)
@ -989,10 +985,7 @@ func handleBuildContexts(r *http.Request, query url.Values, anchorDir string, mu
return nil, fmt.Errorf("main context directory is empty")
}
out.ContextDirectory = mainDir
case strings.HasPrefix(fieldName, "build-context-"):
contextName := strings.TrimPrefix(fieldName, "build-context-")
} else if contextName, ok := strings.CutPrefix(fieldName, "build-context-"); ok {
// Create temp directory directly under anchorDir
additionalAnchor, err := os.MkdirTemp(anchorDir, contextName+"-*")
if err != nil {
@ -1039,7 +1032,7 @@ func handleBuildContexts(r *http.Request, query url.Values, anchorDir string, mu
IsImage: false,
Value: additionalAnchor,
}
default:
} else {
logrus.Debugf("Ignoring unknown multipart field: %s", fieldName)
}
}

2
pkg/machine/e2e/basic_test.go
View file

@ -25,8 +25,6 @@ const TESTIMAGE = "quay.io/libpod/testimage:20241011"
var _ = Describe("run basic podman commands", func() {
It("Basic ops", func() {
// golangci-lint has trouble with actually skipping tests marked Skip
// so skip it on cirrus envs and where CIRRUS_CI isn't set.
name := randomString()
i := new(initMachine)
session, err := mb.setName(name).setCmd(i.withImage(mb.imagePath).withNow()).run()

2
pkg/machine/wsl/util_windows.go
View file

@ -175,7 +175,7 @@ func wrapMaybe(err error, message string) error {
return errors.New(message)
}
func wrapMaybef(err error, format string, args ...interface{}) error {
func wrapMaybef(err error, format string, args ...any) error {
if err != nil {
return fmt.Errorf(format+": %w", append(args, err)...)
}