2 files changed, 0 insertions, 270 deletions
diff --git a/pkg/hooks/0.1.0/hook.go b/pkg/hooks/0.1.0/hook.go
deleted file mode 100644
index c3df5fa1d..000000000
--- a/pkg/hooks/0.1.0/hook.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Package hook is the 0.1.0 hook configuration structure.
-package hook
-
-import (
-	"encoding/json"
-	"errors"
-	"strings"
-
-	current "github.com/containers/podman/v4/pkg/hooks/1.0.0"
-	rspec "github.com/opencontainers/runtime-spec/specs-go"
-)
-
-// Version is the hook configuration version defined in this package.
-const Version = "0.1.0"
-
-// Hook is the hook configuration structure.
-type Hook struct {
-	Hook      *string  `json:"hook"`
-	Arguments []string `json:"arguments,omitempty"`
-
-	// https://github.com/cri-o/cri-o/pull/1235
-	Stages []string `json:"stages"`
-	Stage  []string `json:"stage"`
-
-	Cmds []string `json:"cmds,omitempty"`
-	Cmd  []string `json:"cmd,omitempty"`
-
-	Annotations []string `json:"annotations,omitempty"`
-	Annotation  []string `json:"annotation,omitempty"`
-
-	HasBindMounts *bool `json:"hasbindmounts,omitempty"`
-}
-
-func Read(content []byte) (hook *current.Hook, err error) {
-	var raw Hook
-
-	if err = json.Unmarshal(content, &raw); err != nil {
-		return nil, err
-	}
-
-	if raw.Hook == nil {
-		return nil, errors.New("missing required property: hook")
-	}
-
-	if raw.Stages == nil {
-		raw.Stages = raw.Stage
-	} else if raw.Stage != nil {
-		return nil, errors.New("cannot set both 'stage' and 'stages'")
-	}
-	if raw.Stages == nil {
-		return nil, errors.New("missing required property: stages")
-	}
-
-	if raw.Cmds == nil {
-		raw.Cmds = raw.Cmd
-	} else if raw.Cmd != nil {
-		return nil, errors.New("cannot set both 'cmd' and 'cmds'")
-	}
-
-	if raw.Annotations == nil {
-		raw.Annotations = raw.Annotation
-	} else if raw.Annotation != nil {
-		return nil, errors.New("cannot set both 'annotation' and 'annotations'")
-	}
-
-	hook = &current.Hook{
-		Version: current.Version,
-		Hook: rspec.Hook{
-			Path: *raw.Hook,
-		},
-		When: current.When{
-			Commands:      raw.Cmds,
-			HasBindMounts: raw.HasBindMounts,
-			Or:            true,
-		},
-		Stages: raw.Stages,
-	}
-	if raw.Arguments != nil {
-		hook.Hook.Args = append([]string{*raw.Hook}, raw.Arguments...)
-	}
-	if raw.Annotations != nil {
-		hook.When.Annotations = map[string]string{
-			".*": strings.Join(raw.Annotations, "|"),
-		}
-	}
-
-	return hook, nil
-}
diff --git a/pkg/hooks/0.1.0/hook_test.go b/pkg/hooks/0.1.0/hook_test.go
deleted file mode 100644
index 5beadbaaf..000000000
--- a/pkg/hooks/0.1.0/hook_test.go
+++ /dev/null
@@ -1,182 +0,0 @@
-package hook
-
-import (
-	"testing"
-
-	current "github.com/containers/podman/v4/pkg/hooks/1.0.0"
-	rspec "github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestGood(t *testing.T) {
-	hook, err := Read([]byte("{\"hook\": \"/a/b/c\", \"stages\": [\"prestart\"], \"cmds\": [\"sh\"]}"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	assert.Equal(t, &current.Hook{
-		Version: current.Version,
-		Hook: rspec.Hook{
-			Path: "/a/b/c",
-		},
-		When: current.When{
-			Commands: []string{"sh"},
-			Or:       true,
-		},
-		Stages: []string{"prestart"},
-	}, hook)
-}
-
-func TestInvalidJSON(t *testing.T) {
-	_, err := Read([]byte("{"))
-	if err == nil {
-		t.Fatal("unexpected success")
-	}
-	assert.Regexp(t, "^unexpected end of JSON input$", err.Error())
-}
-
-func TestArguments(t *testing.T) {
-	hook, err := Read([]byte("{\"hook\": \"/a/b/c\", \"arguments\": [\"d\", \"e\"], \"stages\": [\"prestart\"], \"cmds\": [\"sh\"]}"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	assert.Equal(t, &current.Hook{
-		Version: current.Version,
-		Hook: rspec.Hook{
-			Path: "/a/b/c",
-			Args: []string{"/a/b/c", "d", "e"},
-		},
-		When: current.When{
-			Commands: []string{"sh"},
-			Or:       true,
-		},
-		Stages: []string{"prestart"},
-	}, hook)
-}
-
-func TestEmptyObject(t *testing.T) {
-	_, err := Read([]byte("{}"))
-	if err == nil {
-		t.Fatal("unexpected success")
-	}
-	assert.Regexp(t, "^missing required property: hook$", err.Error())
-}
-
-func TestNoStages(t *testing.T) {
-	_, err := Read([]byte("{\"hook\": \"/a/b/c\"}"))
-	if err == nil {
-		t.Fatal("unexpected success")
-	}
-	assert.Regexp(t, "^missing required property: stages$", err.Error())
-}
-
-func TestStage(t *testing.T) {
-	hook, err := Read([]byte("{\"hook\": \"/a/b/c\", \"stage\": [\"prestart\"]}"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	assert.Equal(t, &current.Hook{
-		Version: current.Version,
-		Hook: rspec.Hook{
-			Path: "/a/b/c",
-		},
-		When:   current.When{Or: true},
-		Stages: []string{"prestart"},
-	}, hook)
-}
-
-func TestStagesAndStage(t *testing.T) {
-	_, err := Read([]byte("{\"hook\": \"/a/b/c\", \"stages\": [\"prestart\"], \"stage\": [\"prestart\"]}"))
-	if err == nil {
-		t.Fatal("unexpected success")
-	}
-	assert.Regexp(t, "^cannot set both 'stage' and 'stages'$", err.Error())
-}
-
-func TestCmd(t *testing.T) {
-	hook, err := Read([]byte("{\"hook\": \"/a/b/c\", \"stage\": [\"prestart\"], \"cmd\": [\"sh\"]}"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	assert.Equal(t, &current.Hook{
-		Version: current.Version,
-		Hook: rspec.Hook{
-			Path: "/a/b/c",
-		},
-		When: current.When{
-			Commands: []string{"sh"},
-			Or:       true,
-		},
-		Stages: []string{"prestart"},
-	}, hook)
-}
-
-func TestCmdsAndCmd(t *testing.T) {
-	_, err := Read([]byte("{\"hook\": \"/a/b/c\", \"stages\": [\"prestart\"], \"cmds\": [\"sh\"], \"cmd\": [\"true\"]}"))
-	if err == nil {
-		t.Fatal("unexpected success")
-	}
-	assert.Regexp(t, "^cannot set both 'cmd' and 'cmds'$", err.Error())
-}
-
-func TestAnnotations(t *testing.T) {
-	hook, err := Read([]byte("{\"hook\": \"/a/b/c\", \"stage\": [\"prestart\"], \"annotations\": [\"a\", \"b\"]}"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	assert.Equal(t, &current.Hook{
-		Version: current.Version,
-		Hook: rspec.Hook{
-			Path: "/a/b/c",
-		},
-		When: current.When{
-			Annotations: map[string]string{".*": "a|b"},
-			Or:          true,
-		},
-		Stages: []string{"prestart"},
-	}, hook)
-}
-
-func TestAnnotation(t *testing.T) {
-	hook, err := Read([]byte("{\"hook\": \"/a/b/c\", \"stage\": [\"prestart\"], \"annotation\": [\"a\", \"b\"]}"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	assert.Equal(t, &current.Hook{
-		Version: current.Version,
-		Hook: rspec.Hook{
-			Path: "/a/b/c",
-		},
-		When: current.When{
-			Annotations: map[string]string{".*": "a|b"},
-			Or:          true,
-		},
-		Stages: []string{"prestart"},
-	}, hook)
-}
-
-func TestAnnotationsAndAnnotation(t *testing.T) {
-	_, err := Read([]byte("{\"hook\": \"/a/b/c\", \"stages\": [\"prestart\"], \"annotations\": [\"a\"], \"annotation\": [\"b\"]}"))
-	if err == nil {
-		t.Fatal("unexpected success")
-	}
-	assert.Regexp(t, "^cannot set both 'annotation' and 'annotations'$", err.Error())
-}
-
-func TestHasBindMounts(t *testing.T) {
-	hook, err := Read([]byte("{\"hook\": \"/a/b/c\", \"stage\": [\"prestart\"], \"hasbindmounts\": true}"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	hasBindMounts := true
-	assert.Equal(t, &current.Hook{
-		Version: current.Version,
-		Hook: rspec.Hook{
-			Path: "/a/b/c",
-		},
-		When: current.When{
-			HasBindMounts: &hasBindMounts,
-			Or:            true,
-		},
-		Stages: []string{"prestart"},
-	}, hook)
-}