From 73ecc5a4bdd620124650dbdb621df667beb8438f Mon Sep 17 00:00:00 2001
From: Aditya R <arajan@redhat.com>
Date: Tue, 12 Jul 2022 18:34:44 +0530
Subject: pkg,libpod: remove pkg/hooks and use hooks from c/common

PR https://github.com/containers/common/pull/1071 moved `pkg/hooks` to
`c/common` hence remove that from podman and use `pkg/hooks` from
`c/common`

[NO NEW TESTS NEEDED]
[NO TESTS NEEDED]

Signed-off-by: Aditya R <arajan@redhat.com>
---
 pkg/hooks/exec/exec.go | 69 --------------------------------------------------
 1 file changed, 69 deletions(-)
 delete mode 100644 pkg/hooks/exec/exec.go

(limited to 'pkg/hooks/exec/exec.go')

diff --git a/pkg/hooks/exec/exec.go b/pkg/hooks/exec/exec.go
deleted file mode 100644
index bc639245f..000000000
--- a/pkg/hooks/exec/exec.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Package exec provides utilities for executing Open Container Initiative runtime hooks.
-package exec
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"io"
-	osexec "os/exec"
-	"time"
-
-	rspec "github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/sirupsen/logrus"
-)
-
-// DefaultPostKillTimeout is the recommended default post-kill timeout.
-const DefaultPostKillTimeout = time.Duration(10) * time.Second
-
-// Run executes the hook and waits for it to complete or for the
-// context or hook-specified timeout to expire.
-func Run(ctx context.Context, hook *rspec.Hook, state []byte, stdout io.Writer, stderr io.Writer, postKillTimeout time.Duration) (hookErr, err error) {
-	cmd := osexec.Cmd{
-		Path:   hook.Path,
-		Args:   hook.Args,
-		Env:    hook.Env,
-		Stdin:  bytes.NewReader(state),
-		Stdout: stdout,
-		Stderr: stderr,
-	}
-	if cmd.Env == nil {
-		cmd.Env = []string{}
-	}
-
-	if hook.Timeout != nil {
-		var cancel context.CancelFunc
-		ctx, cancel = context.WithTimeout(ctx, time.Duration(*hook.Timeout)*time.Second)
-		defer cancel()
-	}
-
-	err = cmd.Start()
-	if err != nil {
-		return err, err
-	}
-	exit := make(chan error, 1)
-	go func() {
-		err := cmd.Wait()
-		if err != nil {
-			err = fmt.Errorf("executing %v: %w", cmd.Args, err)
-		}
-		exit <- err
-	}()
-
-	select {
-	case err = <-exit:
-		return err, err
-	case <-ctx.Done():
-		if err := cmd.Process.Kill(); err != nil {
-			logrus.Errorf("Failed to kill pid %v", cmd.Process)
-		}
-		timer := time.NewTimer(postKillTimeout)
-		defer timer.Stop()
-		select {
-		case <-timer.C:
-			err = fmt.Errorf("failed to reap process within %s of the kill signal", postKillTimeout)
-		case err = <-exit:
-		}
-		return err, ctx.Err()
-	}
-}
-- 
cgit v1.2.3-54-g00ecf