Skip to content

Commit a49adf1

Browse files
stgraberstgraber
authored
Merge pull request #829 from gibmat/fix-ValueInSlice-removal
Replace util.ValueInSlice with slices.Contains
2 parents 93fff48 + eba1eb2 commit a49adf1

File tree

10 files changed

+33
-30
lines changed

10 files changed

+33
-30
lines changed

‎distrobuilder/main_incus.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"os"
88
"os/exec"
99
"path/filepath"
10+
"slices"
1011

1112
client "github.com/lxc/incus/client"
1213
"github.com/lxc/incus/shared/api"
13-
incus "github.com/lxc/incus/shared/util"
1414
"github.com/sirupsen/logrus"
1515
"github.com/spf13/cobra"
1616
"golang.org/x/sys/unix"
@@ -45,7 +45,7 @@ func (c *cmdIncus) commandBuild() *cobra.Command {
4545
`, typeDescription, compressionDescription),
4646
Args: cobra.RangeArgs(1, 2),
4747
PreRunE: func(cmd *cobra.Command, args []string) error {
48-
if !incus.ValueInSlice(c.flagType, []string{"split", "unified"}) {
48+
if !slices.Contains([]string{"split", "unified"}, c.flagType) {
4949
return errors.New("--type needs to be one of ['split', 'unified']")
5050
}
5151

@@ -114,7 +114,7 @@ func (c *cmdIncus) commandPack() *cobra.Command {
114114
`, typeDescription, compressionDescription),
115115
Args: cobra.RangeArgs(2, 3),
116116
PreRunE: func(cmd *cobra.Command, args []string) error {
117-
if !incus.ValueInSlice(c.flagType, []string{"split", "unified"}) {
117+
if !slices.Contains([]string{"split", "unified"}, c.flagType) {
118118
return errors.New("--type needs to be one of ['split', 'unified']")
119119
}
120120

‎distrobuilder/main_repack-windows.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"os/exec"
1212
"path/filepath"
1313
"regexp"
14+
"slices"
1415
"strconv"
1516
"strings"
1617

@@ -110,7 +111,7 @@ func (c *cmdRepackWindows) preRun(cmd *cobra.Command, args []string) error {
110111
} else {
111112
supportedVersions := []string{"w11", "w10", "2k19", "2k12", "2k16", "2k22"}
112113

113-
if !incus.ValueInSlice(c.flagWindowsVersion, supportedVersions) {
114+
if !slices.Contains(supportedVersions, c.flagWindowsVersion) {
114115
return fmt.Errorf("Version must be one of %v", supportedVersions)
115116
}
116117
}
@@ -126,7 +127,7 @@ func (c *cmdRepackWindows) preRun(cmd *cobra.Command, args []string) error {
126127
} else {
127128
supportedArchitectures := []string{"amd64", "ARM64"}
128129

129-
if !incus.ValueInSlice(c.flagWindowsArchitecture, supportedArchitectures) {
130+
if !slices.Contains(supportedArchitectures, c.flagWindowsArchitecture) {
130131
return fmt.Errorf("Architecture must be one of %v", supportedArchitectures)
131132
}
132133
}
@@ -554,7 +555,7 @@ func (c *cmdRepackWindows) injectDrivers(dirs map[string]string) error {
554555
targetPath := filepath.Join(targetBasePath, filepath.Base(path))
555556

556557
// Copy driver files
557-
if incus.ValueInSlice(ext, []string{".cat", ".dll", ".inf", ".sys"}) {
558+
if slices.Contains([]string{".cat", ".dll", ".inf", ".sys"}, ext) {
558559
logger.WithFields(logrus.Fields{"src": path, "dest": targetPath}).Debug("Copying file")
559560

560561
err := shared.Copy(path, targetPath)

‎distrobuilder/vm.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"fmt"
77
"os"
88
"path/filepath"
9+
"slices"
910
"strconv"
1011
"strings"
1112

@@ -29,7 +30,7 @@ func newVM(ctx context.Context, imageFile, rootfsDir, fs string, size uint64) (*
2930
fs = "ext4"
3031
}
3132

32-
if !incus.ValueInSlice(fs, []string{"btrfs", "ext4"}) {
33+
if !slices.Contains([]string{"btrfs", "ext4"}, fs) {
3334
return nil, fmt.Errorf("Unsupported fs: %s", fs)
3435
}
3536

‎generators/cloud-init.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"fmt"
55
"os"
66
"path/filepath"
7+
"slices"
78
"strings"
89

910
"github.com/lxc/incus/shared/api"
@@ -29,7 +30,7 @@ func (g *cloudInit) RunLXC(img *image.LXCImage, target shared.DefinitionTargetLX
2930
return nil
3031
}
3132

32-
if incus.ValueInSlice(info.Name(), []string{"cloud-init-local", "cloud-config", "cloud-init", "cloud-final"}) {
33+
if slices.Contains([]string{"cloud-init-local", "cloud-config", "cloud-init", "cloud-final"}, info.Name()) {
3334
err := os.Remove(path)
3435
if err != nil {
3536
return fmt.Errorf("Failed to remove file %q: %w", path, err)

‎managers/pacman.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ import (
55
"os"
66
"path/filepath"
77
"runtime"
8-
9-
incus "github.com/lxc/incus/shared/util"
8+
"slices"
109

1110
"github.com/lxc/distrobuilder/shared"
1211
)
@@ -100,7 +99,7 @@ func (m *pacman) setupTrustedKeys() error {
10099

101100
var keyring string
102101

103-
if incus.ValueInSlice(runtime.GOARCH, []string{"arm", "arm64"}) {
102+
if slices.Contains([]string{"arm", "arm64"}, runtime.GOARCH) {
104103
keyring = "archlinuxarm"
105104
} else {
106105
keyring = "archlinux"
@@ -124,7 +123,7 @@ func (m *pacman) setMirrorlist() error {
124123

125124
var mirror string
126125

127-
if incus.ValueInSlice(runtime.GOARCH, []string{"arm", "arm64"}) {
126+
if slices.Contains([]string{"arm", "arm64"}, runtime.GOARCH) {
128127
mirror = "Server = http://mirror.archlinuxarm.org/$arch/$repo"
129128
} else {
130129
mirror = "Server = http://mirrors.kernel.org/archlinux/$repo/os/$arch"

‎shared/definition.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import (
44
"errors"
55
"fmt"
66
"reflect"
7+
"slices"
78
"strconv"
89
"strings"
910
"time"
1011

1112
"github.com/lxc/incus/shared/osarch"
1213
incusArch "github.com/lxc/incus/shared/osarch"
13-
"github.com/lxc/incus/shared/util"
1414
)
1515

1616
// ImageTarget represents the image target.
@@ -386,7 +386,7 @@ func (d *Definition) Validate() error {
386386
"nixos-http",
387387
}
388388

389-
if !util.ValueInSlice(strings.TrimSpace(d.Source.Downloader), validDownloaders) {
389+
if !slices.Contains(validDownloaders, strings.TrimSpace(d.Source.Downloader)) {
390390
return fmt.Errorf("source.downloader must be one of %v", validDownloaders)
391391
}
392392

@@ -407,7 +407,7 @@ func (d *Definition) Validate() error {
407407
"slackpkg",
408408
}
409409

410-
if !util.ValueInSlice(strings.TrimSpace(d.Packages.Manager), validManagers) {
410+
if !slices.Contains(validManagers, strings.TrimSpace(d.Packages.Manager)) {
411411
return fmt.Errorf("packages.manager must be one of %v", validManagers)
412412
}
413413

@@ -453,7 +453,7 @@ func (d *Definition) Validate() error {
453453
}
454454

455455
for _, file := range d.Files {
456-
if !util.ValueInSlice(strings.TrimSpace(file.Generator), validGenerators) {
456+
if !slices.Contains(validGenerators, strings.TrimSpace(file.Generator)) {
457457
return fmt.Errorf("files.*.generator must be one of %v", validGenerators)
458458
}
459459
}
@@ -474,7 +474,7 @@ func (d *Definition) Validate() error {
474474

475475
architectureMap := strings.TrimSpace(d.Mappings.ArchitectureMap)
476476
if architectureMap != "" {
477-
if !util.ValueInSlice(architectureMap, validMappings) {
477+
if !slices.Contains(validMappings, architectureMap) {
478478
return fmt.Errorf("mappings.architecture_map must be one of %v", validMappings)
479479
}
480480
}
@@ -487,7 +487,7 @@ func (d *Definition) Validate() error {
487487
}
488488

489489
for _, action := range d.Actions {
490-
if !util.ValueInSlice(action.Trigger, validTriggers) {
490+
if !slices.Contains(validTriggers, action.Trigger) {
491491
return fmt.Errorf("actions.*.trigger must be one of %v", validTriggers)
492492
}
493493
}
@@ -498,7 +498,7 @@ func (d *Definition) Validate() error {
498498
}
499499

500500
for _, set := range d.Packages.Sets {
501-
if !util.ValueInSlice(set.Action, validPackageActions) {
501+
if !slices.Contains(validPackageActions, set.Action) {
502502
return fmt.Errorf("packages.*.set.*.action must be one of %v", validPackageActions)
503503
}
504504
}
@@ -643,15 +643,15 @@ func getFieldByTag(v reflect.Value, t reflect.Type, tag string) (reflect.Value,
643643

644644
// ApplyFilter returns true if the filter matches.
645645
func ApplyFilter(filter Filter, release string, architecture string, variant string, targetType DefinitionFilterType, acceptedImageTargets ImageTarget) bool {
646-
if len(filter.GetReleases()) > 0 && !util.ValueInSlice(release, filter.GetReleases()) {
646+
if len(filter.GetReleases()) > 0 && !slices.Contains(filter.GetReleases(), release) {
647647
return false
648648
}
649649

650-
if len(filter.GetArchitectures()) > 0 && !util.ValueInSlice(architecture, filter.GetArchitectures()) {
650+
if len(filter.GetArchitectures()) > 0 && !slices.Contains(filter.GetArchitectures(), architecture) {
651651
return false
652652
}
653653

654-
if len(filter.GetVariants()) > 0 && !util.ValueInSlice(variant, filter.GetVariants()) {
654+
if len(filter.GetVariants()) > 0 && !slices.Contains(filter.GetVariants(), variant) {
655655
return false
656656
}
657657

‎shared/util.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import (
88
"os"
99
"os/exec"
1010
"regexp"
11+
"slices"
1112
"strconv"
1213
"strings"
1314
"time"
1415

1516
"github.com/flosch/pongo2/v4"
16-
"github.com/lxc/incus/shared/util"
1717
"golang.org/x/sys/unix"
1818
yaml "gopkg.in/yaml.v2"
1919
)
@@ -135,7 +135,7 @@ func compressTarball(ctx context.Context, filename, compression string) (string,
135135
}
136136

137137
// If supported, use as many threads as possible.
138-
if util.ValueInSlice(compression, []string{"zstd", "xz", "lzma"}) {
138+
if slices.Contains([]string{"zstd", "xz", "lzma"}, compression) {
139139
args = append(args, "--threads=0")
140140
}
141141

@@ -385,7 +385,7 @@ func ParseSquashfsCompression(compression string) (string, *int, error) {
385385
compression = "lzo"
386386
}
387387

388-
if util.ValueInSlice(compression, []string{"gzip", "lzo", "lz4", "xz", "zstd", "lzma"}) {
388+
if slices.Contains([]string{"gzip", "lzo", "lz4", "xz", "zstd", "lzma"}, compression) {
389389
return compression, nil, nil
390390
}
391391

‎sources/debootstrap.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"os"
66
"path"
77
"path/filepath"
8+
"slices"
89
"strings"
910

1011
incus "github.com/lxc/incus/shared/util"
@@ -24,7 +25,7 @@ func (s *debootstrap) Run() error {
2425
release := strings.ToLower(s.definition.Image.Release)
2526

2627
// Enable merged /usr by default, and disable it for certain distros/releases
27-
if distro == "ubuntu" && incus.ValueInSlice(release, []string{"xenial", "bionic", "noble"}) || distro == "debian" && incus.ValueInSlice(release, []string{"sid"}) || distro == "mint" && incus.ValueInSlice(release, []string{"tara", "tessa", "tina", "tricia", "ulyana"}) || distro == "devuan" {
28+
if distro == "ubuntu" && slices.Contains([]string{"xenial", "bionic", "noble"}, release) || distro == "debian" && slices.Contains([]string{"sid"}, release) || distro == "mint" && slices.Contains([]string{"tara", "tessa", "tina", "tricia", "ulyana"}, release) || distro == "devuan" {
2829
args = append(args, "--no-merged-usr")
2930
} else {
3031
args = append(args, "--merged-usr")

‎sources/plamolinux-http.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import (
66
"net/url"
77
"path"
88
"path/filepath"
9+
"slices"
910
"strconv"
1011
"strings"
1112

12-
incus "github.com/lxc/incus/shared/util"
1313
"gopkg.in/antchfx/htmlquery.v1"
1414

1515
"github.com/lxc/distrobuilder/shared"
@@ -152,7 +152,7 @@ func (s *plamolinux) downloadFiles(def shared.DefinitionImage, URL string, ignor
152152

153153
if strings.HasSuffix(target, ".txz") || strings.HasSuffix(target, ".tzst") {
154154
pkgName := strings.Split(target, "-")[0]
155-
if incus.ValueInSlice(pkgName, ignoredPkgs) {
155+
if slices.Contains(ignoredPkgs, pkgName) {
156156
continue
157157
}
158158

‎sources/slackware-http.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"net/url"
77
"path"
88
"path/filepath"
9+
"slices"
910
"strings"
1011

11-
incus "github.com/lxc/incus/shared/util"
1212
"gopkg.in/antchfx/htmlquery.v1"
1313

1414
"github.com/lxc/distrobuilder/shared"
@@ -150,7 +150,7 @@ func (s *slackware) downloadFiles(def shared.DefinitionImage, URL string, requir
150150
pkgName := strings.Split(target, "-")[0]
151151
twoPkgName := strings.Split(target, "-")[0] + "-" + strings.Split(target, "-")[1]
152152

153-
if !((incus.ValueInSlice(pkgName, requiredPkgs)) || (incus.ValueInSlice(twoPkgName, requiredPkgs))) {
153+
if !((slices.Contains(requiredPkgs, pkgName)) || (slices.Contains(requiredPkgs, twoPkgName))) {
154154
continue
155155
}
156156

0 commit comments

Comments
 (0)