pkg/api: remove deadcode

One might think Close() should be called but we are already using
Shutdown() which is the graceful way to stop the server so we don't
actually need Close().

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2025-06-18 13:24:01 +02:00
parent 75bad52af5
commit 9d328d8782
5 changed files with 0 additions and 67 deletions

View File

@ -19,8 +19,6 @@ import (
// NewAPIDecoder returns a configured schema.Decoder
func NewAPIDecoder() *schema.Decoder {
_ = ParseDateTime
d := schema.NewDecoder()
d.IgnoreUnknownKeys(true)
d.RegisterConverter(map[string][]string{}, convertURLValuesString)
@ -145,12 +143,6 @@ func convertTimeString(query string) reflect.Value {
return reflect.ValueOf(time.Time{})
}
// ParseDateTime is a helper function to aid in parsing different Time/Date formats
// isZero() can be used to determine if parsing failed.
func ParseDateTime(query string) time.Time {
return convertTimeString(query).Interface().(time.Time)
}
func convertSignal(query string) reflect.Value {
signal, err := util.ParseSignal(query)
if err != nil {

View File

@ -95,10 +95,6 @@ func SecretNotFound(w http.ResponseWriter, nameOrID string, err error) {
Error(w, http.StatusNotFound, err)
}
func ContainerNotRunning(w http.ResponseWriter, containerID string, err error) {
Error(w, http.StatusConflict, err)
}
func InternalServerError(w http.ResponseWriter, err error) {
Error(w, http.StatusInternalServerError, err)
}

View File

@ -126,14 +126,6 @@ func WriteJSON(w http.ResponseWriter, code int, value interface{}) {
}
}
func FilterMapToString(filters map[string][]string) (string, error) {
f, err := json.Marshal(filters)
if err != nil {
return "", err
}
return string(f), nil
}
func GetVar(r *http.Request, k string) string {
val := mux.Vars(r)[k]
safeVal, err := url.PathUnescape(val)

View File

@ -1,34 +0,0 @@
//go:build !remote
package server
import (
"fmt"
"net"
"os"
"path/filepath"
)
// ListenUnix follows stdlib net.Listen() API, providing a unix listener for given path
//
// ListenUnix will delete and create files/directories as needed
func ListenUnix(network string, path string) (net.Listener, error) {
// set up custom listener for API server
err := os.MkdirAll(filepath.Dir(path), 0770)
if err != nil {
return nil, fmt.Errorf("api.ListenUnix() failed to create %s: %w", filepath.Dir(path), err)
}
os.Remove(path)
listener, err := net.Listen(network, path)
if err != nil {
return nil, fmt.Errorf("api.ListenUnix() failed to create net.Listen(%s, %s): %w", network, path, err)
}
_, err = os.Stat(path)
if err != nil {
return nil, fmt.Errorf("net.Listen(%s, %s) failed to report the failure to create socket: %w", network, path, err)
}
return listener, nil
}

View File

@ -50,14 +50,6 @@ const (
// shutdownOnce ensures Shutdown() may safely be called from several go routines
var shutdownOnce sync.Once
// NewServer will create and configure a new API server with all defaults
func NewServer(runtime *libpod.Runtime) (*APIServer, error) {
return newServer(runtime, nil, entities.ServiceOptions{
CorsHeaders: DefaultCorsHeaders,
Timeout: DefaultServiceDuration,
})
}
// NewServerWithSettings will create and configure a new API server using provided settings
func NewServerWithSettings(runtime *libpod.Runtime, listener net.Listener, opts entities.ServiceOptions) (*APIServer, error) {
return newServer(runtime, listener, opts)
@ -298,8 +290,3 @@ func (s *APIServer) Shutdown(halt bool) error {
})
return nil
}
// Close immediately stops responding to clients and exits
func (s *APIServer) Close() error {
return s.Server.Close()
}