Merge pull request #2489 from Luap99/deprecated

remove two deprecated unused functions

Author: openshift-merge-bot[bot]

pkg/config/config.go

@@ -847,8 +847,7 @@ func (c *EngineConfig) Validate() error {
 	}
 	// Check if the pullPolicy from containers.conf is valid
 	// if it is invalid returns the error
-	pullPolicy := strings.ToLower(c.PullPolicy)
-	if _, err := ValidatePullPolicy(pullPolicy); err != nil {
+	if _, err := ParsePullPolicy(c.PullPolicy); err != nil {
 		return fmt.Errorf("invalid pull type from containers.conf %q: %w", c.PullPolicy, err)
 	}
 

pkg/config/pull_policy.go

@@ -87,8 +87,3 @@ func ParsePullPolicy(s string) (PullPolicy, error) {
 		return PullPolicyUnsupported, fmt.Errorf("unsupported pull policy %q", s)
 	}
 }
-
-// Deprecated: please use `ParsePullPolicy` instead.
-func ValidatePullPolicy(s string) (PullPolicy, error) {
-	return ParsePullPolicy(s)
-}

pkg/util/util.go

@@ -5,21 +5,13 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
-	"slices"
 	"time"
 
 	"github.com/containers/storage/pkg/fileutils"
 	"github.com/fsnotify/fsnotify"
 	"github.com/sirupsen/logrus"
 )
 
-// StringInSlice determines if a string is in a string slice, returns bool.
-//
-// Deprecated: Use [slices.Contains] instead.
-func StringInSlice(s string, sl []string) bool {
-	return slices.Contains(sl, s)
-}
-
 // StringMatchRegexSlice determines if a given string matches one of the given regexes, returns bool
 func StringMatchRegexSlice(s string, re []string) bool {
 	for _, r := range re {