Use State from the spec

Signed-off-by: Mrunal Patel <[email protected]>

Author: mrunalp

libcontainer/configs/config.go

@@ -4,6 +4,8 @@ import (
 	"bytes"
 	"encoding/json"
 	"os/exec"
+
+	"github.com/opencontainers/specs"
 )
 
 type Rlimit struct {
@@ -180,30 +182,23 @@ type Hooks struct {
 	Poststop []Hook
 }
 
-// HookState is the payload provided to a hook on execution.
-type HookState struct {
-	ID   string `json:"id"`
-	Pid  int    `json:"pid"`
-	Root string `json:"root"`
-}
-
 type Hook interface {
 	// Run executes the hook with the provided state.
-	Run(HookState) error
+	Run(specs.State) error
 }
 
 // NewFunctionHooks will call the provided function when the hook is run.
-func NewFunctionHook(f func(HookState) error) FuncHook {
+func NewFunctionHook(f func(specs.State) error) FuncHook {
 	return FuncHook{
 		run: f,
 	}
 }
 
 type FuncHook struct {
-	run func(HookState) error
+	run func(specs.State) error
 }
 
-func (f FuncHook) Run(s HookState) error {
+func (f FuncHook) Run(s specs.State) error {
 	return f.run(s)
 }
 
@@ -225,7 +220,7 @@ type CommandHook struct {
 	Command
 }
 
-func (c Command) Run(s HookState) error {
+func (c Command) Run(s specs.State) error {
 	b, err := json.Marshal(s)
 	if err != nil {
 		return err

libcontainer/container_linux.go

@@ -18,6 +18,7 @@ import (
 	"github.com/opencontainers/runc/libcontainer/cgroups"
 	"github.com/opencontainers/runc/libcontainer/configs"
 	"github.com/opencontainers/runc/libcontainer/criurpc"
+	"github.com/opencontainers/specs"
 )
 
 const stdioFdCount = 3
@@ -249,9 +250,10 @@ func (c *linuxContainer) Destroy() error {
 	}
 	c.initProcess = nil
 	if c.config.Hooks != nil {
-		s := configs.HookState{
-			ID:   c.id,
-			Root: c.config.Rootfs,
+		s := specs.State{
+			Version: specs.Version,
+			ID:      c.id,
+			Root:    c.config.Rootfs,
 		}
 		for _, hook := range c.config.Hooks.Poststop {
 			if err := hook.Run(s); err != nil {

libcontainer/integration/exec_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/opencontainers/runc/libcontainer"
 	"github.com/opencontainers/runc/libcontainer/cgroups/systemd"
 	"github.com/opencontainers/runc/libcontainer/configs"
+	"github.com/opencontainers/specs"
 )
 
 func TestExecPS(t *testing.T) {
@@ -948,7 +949,7 @@ func TestHook(t *testing.T) {
 	config := newTemplateConfig(rootfs)
 	config.Hooks = &configs.Hooks{
 		Prestart: []configs.Hook{
-			configs.NewFunctionHook(func(s configs.HookState) error {
+			configs.NewFunctionHook(func(s specs.State) error {
 				f, err := os.Create(filepath.Join(s.Root, "test"))
 				if err != nil {
 					return err
@@ -957,7 +958,7 @@ func TestHook(t *testing.T) {
 			}),
 		},
 		Poststop: []configs.Hook{
-			configs.NewFunctionHook(func(s configs.HookState) error {
+			configs.NewFunctionHook(func(s specs.State) error {
 				return os.RemoveAll(filepath.Join(s.Root, "test"))
 			}),
 		},

libcontainer/process_linux.go

@@ -13,8 +13,8 @@ import (
 	"syscall"
 
 	"github.com/opencontainers/runc/libcontainer/cgroups"
-	"github.com/opencontainers/runc/libcontainer/configs"
 	"github.com/opencontainers/runc/libcontainer/system"
+	"github.com/opencontainers/specs"
 )
 
 type parentProcess interface {
@@ -202,10 +202,11 @@ func (p *initProcess) start() (err error) {
 		}
 	}()
 	if p.config.Config.Hooks != nil {
-		s := configs.HookState{
-			ID:   p.container.id,
-			Pid:  p.pid(),
-			Root: p.config.Config.Rootfs,
+		s := specs.State{
+			Version: specs.Version,
+			ID:      p.container.id,
+			Pid:     p.pid(),
+			Root:    p.config.Config.Rootfs,
 		}
 		for _, hook := range p.config.Config.Hooks.Prestart {
 			if err := hook.Run(s); err != nil {