mirror of
https://github.com/containers/podman.git
synced 2025-08-23 17:22:30 +08:00
fix deprecated docker v28 types
A lot of types are moved and now deprecated which causes lint issues. IDResponse is copied into podman because that has no new 1 to 1 replacement. For some fields that we set as part of the docker API I added the nolint directive as these fields might be used by API consumers. For the other types it is mostly a 1 to 1 move. ParseUintList is deprecated but we can use the same function from github.com/containers/storage/pkg/parsers instead. Note that it containers breaking changes to pkg/bindings which we should not do generally but given the prevoius commit already has a unavoidable breaking change we might as well fix the IDResponse issue once now. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
106
vendor/github.com/docker/docker/pkg/parsers/parsers.go
generated
vendored
106
vendor/github.com/docker/docker/pkg/parsers/parsers.go
generated
vendored
@ -1,106 +0,0 @@
|
||||
// Package parsers provides helper functions to parse and validate different type
|
||||
// of string. It can be hosts, unix addresses, tcp addresses, filters, kernel
|
||||
// operating system versions.
|
||||
package parsers // import "github.com/docker/docker/pkg/parsers"
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strconv"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// ParseKeyValueOpt parses and validates the specified string as a key/value
|
||||
// pair (key=value).
|
||||
//
|
||||
// Deprecated: use [strings.Cut] instead. This utility was only used internally, and will be removed in the next release.
|
||||
func ParseKeyValueOpt(opt string) (key string, value string, err error) {
|
||||
k, v, ok := strings.Cut(opt, "=")
|
||||
if !ok {
|
||||
return "", "", fmt.Errorf("unable to parse key/value option: %s", opt)
|
||||
}
|
||||
return strings.TrimSpace(k), strings.TrimSpace(v), nil
|
||||
}
|
||||
|
||||
// ParseUintListMaximum parses and validates the specified string as the value
|
||||
// found in some cgroup file (e.g. `cpuset.cpus`, `cpuset.mems`), which could be
|
||||
// one of the formats below. Note that duplicates are actually allowed in the
|
||||
// input string. It returns a `map[int]bool` with available elements from `val`
|
||||
// set to `true`. Values larger than `maximum` cause an error if max is non zero,
|
||||
// in order to stop the map becoming excessively large.
|
||||
// Supported formats:
|
||||
//
|
||||
// 7
|
||||
// 1-6
|
||||
// 0,3-4,7,8-10
|
||||
// 0-0,0,1-7
|
||||
// 03,1-3 <- this is gonna get parsed as [1,2,3]
|
||||
// 3,2,1
|
||||
// 0-2,3,1
|
||||
//
|
||||
// Deprecated: ParseUintListMaximum was only used internally and will be removed in the next release.
|
||||
func ParseUintListMaximum(val string, maximum int) (map[int]bool, error) {
|
||||
return parseUintList(val, maximum)
|
||||
}
|
||||
|
||||
// ParseUintList parses and validates the specified string as the value
|
||||
// found in some cgroup file (e.g. `cpuset.cpus`, `cpuset.mems`), which could be
|
||||
// one of the formats below. Note that duplicates are actually allowed in the
|
||||
// input string. It returns a `map[int]bool` with available elements from `val`
|
||||
// set to `true`.
|
||||
// Supported formats:
|
||||
//
|
||||
// 7
|
||||
// 1-6
|
||||
// 0,3-4,7,8-10
|
||||
// 0-0,0,1-7
|
||||
// 03,1-3 <- this is gonna get parsed as [1,2,3]
|
||||
// 3,2,1
|
||||
// 0-2,3,1
|
||||
//
|
||||
// Deprecated: ParseUintList was only used internally and will be removed in the next release.
|
||||
func ParseUintList(val string) (map[int]bool, error) {
|
||||
return parseUintList(val, 0)
|
||||
}
|
||||
|
||||
func parseUintList(val string, maximum int) (map[int]bool, error) {
|
||||
if val == "" {
|
||||
return map[int]bool{}, nil
|
||||
}
|
||||
|
||||
availableInts := make(map[int]bool)
|
||||
split := strings.Split(val, ",")
|
||||
errInvalidFormat := fmt.Errorf("invalid format: %s", val)
|
||||
|
||||
for _, r := range split {
|
||||
if !strings.Contains(r, "-") {
|
||||
v, err := strconv.Atoi(r)
|
||||
if err != nil {
|
||||
return nil, errInvalidFormat
|
||||
}
|
||||
if maximum != 0 && v > maximum {
|
||||
return nil, fmt.Errorf("value of out range, maximum is %d", maximum)
|
||||
}
|
||||
availableInts[v] = true
|
||||
} else {
|
||||
minS, maxS, _ := strings.Cut(r, "-")
|
||||
minAvailable, err := strconv.Atoi(minS)
|
||||
if err != nil {
|
||||
return nil, errInvalidFormat
|
||||
}
|
||||
maxAvailable, err := strconv.Atoi(maxS)
|
||||
if err != nil {
|
||||
return nil, errInvalidFormat
|
||||
}
|
||||
if maxAvailable < minAvailable {
|
||||
return nil, errInvalidFormat
|
||||
}
|
||||
if maximum != 0 && maxAvailable > maximum {
|
||||
return nil, fmt.Errorf("value of out range, maximum is %d", maximum)
|
||||
}
|
||||
for i := minAvailable; i <= maxAvailable; i++ {
|
||||
availableInts[i] = true
|
||||
}
|
||||
}
|
||||
}
|
||||
return availableInts, nil
|
||||
}
|
Reference in New Issue
Block a user