From 79814b9cbb512822edc9ffca1e32dc2f20547135 Mon Sep 17 00:00:00 2001 From: Andrew Kroh Date: Wed, 24 Jan 2024 16:09:36 -0500 Subject: [PATCH] Replace slices.Contains usage with helper func The 8.12 branch is not yet on Go 1.21 so the slices package isn't available. --- dev-tools/packaging/package_test.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dev-tools/packaging/package_test.go b/dev-tools/packaging/package_test.go index e01b6c566e5a..8c51d5cf4055 100644 --- a/dev-tools/packaging/package_test.go +++ b/dev-tools/packaging/package_test.go @@ -33,7 +33,6 @@ import ( "os" "path/filepath" "regexp" - "slices" "strings" "testing" @@ -752,7 +751,7 @@ func readDocker(dockerFile string) (*packageFile, *dockerInfo, error) { if err != nil { return nil, nil, err } - case slices.Contains(manifest.Layers, header.Name): + case sliceContains(manifest.Layers, header.Name): layer, err := readTarContents(header.Name, tarReader) if err != nil { return nil, nil, err @@ -885,3 +884,12 @@ func readDockerInfo(r io.Reader) (*dockerInfo, error) { return &info, nil } + +func sliceContains(s []string, e string) bool { + for _, v := range s { + if e == v { + return true + } + } + return false +}