tag v0.165.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.165.0 ---------------- * distro: move rhel9 into a generic distro (osbuild/images#1645) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger * Revert "distro: drop `ImageType.BasePartitionTable()`" (osbuild/images#1691) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * Update dependencies 2025-07-20 (osbuild/images#1675) * Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger * defs: add missing `bootstrap_containers` (osbuild/images#1679) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * disk: handle adding `PReP` partition on PPC64/s390x (HMS-8884) (osbuild/images#1681) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger * distro: bring per-distro checkOptions back (osbuild/images#1678) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * distro: cleanups in the pkg/distro/generic area (osbuild/images#1686) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger * distro: move rhel8 into a generic distro (osbuild/images#1643) * Author: Michael Vogt, Reviewers: Nobody * distro: small followups for PR#1682 (osbuild/images#1689) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger, Tomáš Hozza * distro: unify transform/match into a single concept (osbuild/images#1682) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Tomáš Hozza * distros: de-duplicate runner build packages for centos10 (osbuild/images#1680) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * github: disable Go dep updates through dependabot (osbuild/images#1683) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza * repos: include almalinux 9.6 (osbuild/images#1677) * Author: Simon de Vlieger, Reviewers: Lukáš Zapletal, Tomáš Hozza * rhel9: wsl distribution config (osbuild/images#1694) * Author: Simon de Vlieger, Reviewers: Michael Vogt, Sanne Raymaekers * test/manifests/all-customizations: don't embed local file via URI (osbuild/images#1684) * Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Brian C. Lane — Somewhere on the Internet, 2025-07-28 --- tag v0.166.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.166.0 ---------------- * customizations/subscription: conditionally enable semanage call (HMS-8866) (osbuild/images#1673) * Author: Sanne Raymaekers, Reviewers: Achilleas Koutsou, Michael Vogt * distro/rhel-10: versionlock shim-x64 in the azure-cvm image (osbuild/images#1697) * Author: Achilleas Koutsou, Reviewers: Michael Vogt, Simon de Vlieger * manifestmock: move container/pkg/commit mocks into helper (osbuild/images#1700) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger * rhel9: `vagrant-libvirt`, `vagrant-virtualbox` (osbuild/images#1693) * Author: Simon de Vlieger, Reviewers: Michael Vogt, Sanne Raymaekers * rhel{9,10}: centos WSL refinement (HMS-8922) (osbuild/images#1690) * Author: Simon de Vlieger, Reviewers: Ondřej Budai, Sanne Raymaekers, Tomáš Hozza — Somewhere on the Internet, 2025-07-29 --- tag v0.167.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.167.0 ---------------- * RHEL/Azure: drop obsolete WAAgentConfig keys [RHEL-93894] and remove loglevel kernel option [RHEL-102372] (osbuild/images#1611) * Author: Achilleas Koutsou, Reviewers: Michael Vogt, Ondřej Budai, Sanne Raymaekers * Update dependencies 2025-07-27 (osbuild/images#1699) * Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger * distro/rhel9: set default_kernel to kernel-uki-virt (osbuild/images#1704) * Author: Achilleas Koutsou, Reviewers: Ondřej Budai, Simon de Vlieger * distro: drop legacy loaders and update tests (osbuild/images#1687) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Tomáš Hozza * distro: fix issues with yaml distro definitions and enable yaml checks (osbuild/images#1702) * Author: Achilleas Koutsou, Reviewers: Michael Vogt, Ondřej Budai, Simon de Vlieger — Somewhere on the Internet, 2025-07-30 --- tag v0.168.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.168.0 ---------------- * distro: fix bug in variable substitution for static distros (osbuild/images#1710) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger * rhel{9,10}: azure for non-RHEL (HMS-8949) (osbuild/images#1707) * Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Michael Vogt — Somewhere on the Internet, 2025-07-30 ---
147 lines
4.8 KiB
Go
147 lines
4.8 KiB
Go
package pflag
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"net"
|
|
"strings"
|
|
)
|
|
|
|
// -- ipNetSlice Value
|
|
type ipNetSliceValue struct {
|
|
value *[]net.IPNet
|
|
changed bool
|
|
}
|
|
|
|
func newIPNetSliceValue(val []net.IPNet, p *[]net.IPNet) *ipNetSliceValue {
|
|
ipnsv := new(ipNetSliceValue)
|
|
ipnsv.value = p
|
|
*ipnsv.value = val
|
|
return ipnsv
|
|
}
|
|
|
|
// Set converts, and assigns, the comma-separated IPNet argument string representation as the []net.IPNet value of this flag.
|
|
// If Set is called on a flag that already has a []net.IPNet assigned, the newly converted values will be appended.
|
|
func (s *ipNetSliceValue) Set(val string) error {
|
|
|
|
// remove all quote characters
|
|
rmQuote := strings.NewReplacer(`"`, "", `'`, "", "`", "")
|
|
|
|
// read flag arguments with CSV parser
|
|
ipNetStrSlice, err := readAsCSV(rmQuote.Replace(val))
|
|
if err != nil && err != io.EOF {
|
|
return err
|
|
}
|
|
|
|
// parse ip values into slice
|
|
out := make([]net.IPNet, 0, len(ipNetStrSlice))
|
|
for _, ipNetStr := range ipNetStrSlice {
|
|
_, n, err := net.ParseCIDR(strings.TrimSpace(ipNetStr))
|
|
if err != nil {
|
|
return fmt.Errorf("invalid string being converted to CIDR: %s", ipNetStr)
|
|
}
|
|
out = append(out, *n)
|
|
}
|
|
|
|
if !s.changed {
|
|
*s.value = out
|
|
} else {
|
|
*s.value = append(*s.value, out...)
|
|
}
|
|
|
|
s.changed = true
|
|
|
|
return nil
|
|
}
|
|
|
|
// Type returns a string that uniquely represents this flag's type.
|
|
func (s *ipNetSliceValue) Type() string {
|
|
return "ipNetSlice"
|
|
}
|
|
|
|
// String defines a "native" format for this net.IPNet slice flag value.
|
|
func (s *ipNetSliceValue) String() string {
|
|
|
|
ipNetStrSlice := make([]string, len(*s.value))
|
|
for i, n := range *s.value {
|
|
ipNetStrSlice[i] = n.String()
|
|
}
|
|
|
|
out, _ := writeAsCSV(ipNetStrSlice)
|
|
return "[" + out + "]"
|
|
}
|
|
|
|
func ipNetSliceConv(val string) (interface{}, error) {
|
|
val = strings.Trim(val, "[]")
|
|
// Empty string would cause a slice with one (empty) entry
|
|
if len(val) == 0 {
|
|
return []net.IPNet{}, nil
|
|
}
|
|
ss := strings.Split(val, ",")
|
|
out := make([]net.IPNet, len(ss))
|
|
for i, sval := range ss {
|
|
_, n, err := net.ParseCIDR(strings.TrimSpace(sval))
|
|
if err != nil {
|
|
return nil, fmt.Errorf("invalid string being converted to CIDR: %s", sval)
|
|
}
|
|
out[i] = *n
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
// GetIPNetSlice returns the []net.IPNet value of a flag with the given name
|
|
func (f *FlagSet) GetIPNetSlice(name string) ([]net.IPNet, error) {
|
|
val, err := f.getFlagType(name, "ipNetSlice", ipNetSliceConv)
|
|
if err != nil {
|
|
return []net.IPNet{}, err
|
|
}
|
|
return val.([]net.IPNet), nil
|
|
}
|
|
|
|
// IPNetSliceVar defines a ipNetSlice flag with specified name, default value, and usage string.
|
|
// The argument p points to a []net.IPNet variable in which to store the value of the flag.
|
|
func (f *FlagSet) IPNetSliceVar(p *[]net.IPNet, name string, value []net.IPNet, usage string) {
|
|
f.VarP(newIPNetSliceValue(value, p), name, "", usage)
|
|
}
|
|
|
|
// IPNetSliceVarP is like IPNetSliceVar, but accepts a shorthand letter that can be used after a single dash.
|
|
func (f *FlagSet) IPNetSliceVarP(p *[]net.IPNet, name, shorthand string, value []net.IPNet, usage string) {
|
|
f.VarP(newIPNetSliceValue(value, p), name, shorthand, usage)
|
|
}
|
|
|
|
// IPNetSliceVar defines a []net.IPNet flag with specified name, default value, and usage string.
|
|
// The argument p points to a []net.IPNet variable in which to store the value of the flag.
|
|
func IPNetSliceVar(p *[]net.IPNet, name string, value []net.IPNet, usage string) {
|
|
CommandLine.VarP(newIPNetSliceValue(value, p), name, "", usage)
|
|
}
|
|
|
|
// IPNetSliceVarP is like IPNetSliceVar, but accepts a shorthand letter that can be used after a single dash.
|
|
func IPNetSliceVarP(p *[]net.IPNet, name, shorthand string, value []net.IPNet, usage string) {
|
|
CommandLine.VarP(newIPNetSliceValue(value, p), name, shorthand, usage)
|
|
}
|
|
|
|
// IPNetSlice defines a []net.IPNet flag with specified name, default value, and usage string.
|
|
// The return value is the address of a []net.IPNet variable that stores the value of that flag.
|
|
func (f *FlagSet) IPNetSlice(name string, value []net.IPNet, usage string) *[]net.IPNet {
|
|
p := []net.IPNet{}
|
|
f.IPNetSliceVarP(&p, name, "", value, usage)
|
|
return &p
|
|
}
|
|
|
|
// IPNetSliceP is like IPNetSlice, but accepts a shorthand letter that can be used after a single dash.
|
|
func (f *FlagSet) IPNetSliceP(name, shorthand string, value []net.IPNet, usage string) *[]net.IPNet {
|
|
p := []net.IPNet{}
|
|
f.IPNetSliceVarP(&p, name, shorthand, value, usage)
|
|
return &p
|
|
}
|
|
|
|
// IPNetSlice defines a []net.IPNet flag with specified name, default value, and usage string.
|
|
// The return value is the address of a []net.IP variable that stores the value of the flag.
|
|
func IPNetSlice(name string, value []net.IPNet, usage string) *[]net.IPNet {
|
|
return CommandLine.IPNetSliceP(name, "", value, usage)
|
|
}
|
|
|
|
// IPNetSliceP is like IPNetSlice, but accepts a shorthand letter that can be used after a single dash.
|
|
func IPNetSliceP(name, shorthand string, value []net.IPNet, usage string) *[]net.IPNet {
|
|
return CommandLine.IPNetSliceP(name, shorthand, value, usage)
|
|
}
|