grim/convey

Add podman/pull with a docker/pull wrapper and unit test all of it
redux
2021-10-11, Gary Kramlich
62c5ff7d150e
Parents 4ded284354e3
Children cab94a2aa737
Add podman/pull with a docker/pull wrapper and unit test all of it
12 files changed, 230 insertions(+), 7 deletions(-)
  • +27 -0
    docker/export_test.go
  • +27 -0
    docker/import_test.go
  • +44 -0
    docker/pull.go
  • +37 -0
    docker/pull_test.go
  • +1 -0
    docker/tasks.go
  • +1 -1
    podman/errors.go
  • +51 -0
    podman/pull.go
  • +37 -0
    podman/pull_test.go
  • +2 -3
    podman/tasks.go
  • +1 -1
    tasks/errors.go
  • +1 -1
    tasks/export.go
  • +1 -1
    tasks/import.go
    • --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/docker/export_test.go Mon Oct 11 00:45:39 2021 -0500
    @@ -0,0 +1,27 @@
    +package docker
    +
    +import (
    + "testing"
    +
    + . "github.com/onsi/gomega"
    +
    + "keep.imfreedom.org/grim/convey/tasks"
    +)
    +
    +func TestExport(t *testing.T) {
    + g := NewGomegaWithT(t)
    +
    + e := &Export{
    + Files: []string{".:."},
    + }
    +
    + g.Expect(e.Valid()).To(BeNil())
    +}
    +
    +func TestExportFilesRequired(t *testing.T) {
    + g := NewGomegaWithT(t)
    +
    + e := &Export{}
    +
    + g.Expect(e.Valid()).To(MatchError(tasks.ErrNoFiles))
    +}
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/docker/import_test.go Mon Oct 11 00:45:39 2021 -0500
    @@ -0,0 +1,27 @@
    +package docker
    +
    +import (
    + "testing"
    +
    + . "github.com/onsi/gomega"
    +
    + "keep.imfreedom.org/grim/convey/tasks"
    +)
    +
    +func TestImport(t *testing.T) {
    + g := NewGomegaWithT(t)
    +
    + e := &Import{
    + Files: []string{".:."},
    + }
    +
    + g.Expect(e.Valid()).To(BeNil())
    +}
    +
    +func TestImportFilesRequired(t *testing.T) {
    + g := NewGomegaWithT(t)
    +
    + e := &Import{}
    +
    + g.Expect(e.Valid()).To(MatchError(tasks.ErrNoFiles))
    +}
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/docker/pull.go Mon Oct 11 00:45:39 2021 -0500
    @@ -0,0 +1,44 @@
    +package docker
    +
    +import (
    + "fmt"
    +
    + log "github.com/sirupsen/logrus"
    +
    + "keep.imfreedom.org/grim/convey/environment"
    + "keep.imfreedom.org/grim/convey/podman"
    + "keep.imfreedom.org/grim/convey/runtime"
    + "keep.imfreedom.org/grim/convey/tasks"
    + "keep.imfreedom.org/grim/convey/yaml"
    +)
    +
    +type Pull struct {
    + Image string `yaml:"image"`
    + Images yaml.StringOrSlice `yaml:"images"`
    +
    + realPull *podman.Pull
    +}
    +
    +func (p *Pull) Execute(name string, logger *log.Entry, stageEnv environment.Environment, rt *runtime.Runtime) error {
    + return p.realPull.Execute(name, logger, stageEnv, rt)
    +}
    +
    +func (p *Pull) New() tasks.Task {
    + return &Pull{}
    +}
    +
    +func (p *Pull) Valid() error {
    + if p.Image != "" {
    + p.Images = yaml.StringOrSlice{p.Image}
    + }
    +
    + p.realPull = &podman.Pull{
    + Tags: p.Images,
    + }
    +
    + return p.realPull.Valid()
    +}
    +
    +func (p *Pull) Deprecated() error {
    + return fmt.Errorf("docker/pull has been deprecated in favor of podman/pull since 0.15.0")
    +}
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/docker/pull_test.go Mon Oct 11 00:45:39 2021 -0500
    @@ -0,0 +1,37 @@
    +package docker
    +
    +import (
    + "testing"
    +
    + . "github.com/onsi/gomega"
    +
    + "keep.imfreedom.org/grim/convey/podman"
    +)
    +
    +func TestPullImage(t *testing.T) {
    + g := NewGomegaWithT(t)
    +
    + p := &Pull{
    + Image: "foo",
    + }
    +
    + g.Expect(p.Valid()).To(BeNil())
    +}
    +
    +func TestPullImages(t *testing.T) {
    + g := NewGomegaWithT(t)
    +
    + p := &Pull{
    + Images: []string{"foo", "bar"},
    + }
    +
    + g.Expect(p.Valid()).To(BeNil())
    +}
    +
    +func TestPullImageRequired(t *testing.T) {
    + g := NewGomegaWithT(t)
    +
    + p := &Push{}
    +
    + g.Expect(p.Valid()).To(MatchError(podman.ErrNoTags))
    +}
    --- a/docker/tasks.go Mon Oct 11 00:26:37 2021 -0500
    +++ b/docker/tasks.go Mon Oct 11 00:45:39 2021 -0500
    @@ -10,6 +10,7 @@
    "docker/export": &Export{},
    "docker/login": &Login{},
    "docker/logout": &Logout{},
    + "docker/pull": &Pull{},
    "docker/push": &Push{},
    // "docker/run": &Run{},
    }
    --- a/podman/errors.go Mon Oct 11 00:26:37 2021 -0500
    +++ b/podman/errors.go Mon Oct 11 00:45:39 2021 -0500
    @@ -13,6 +13,6 @@
    ErrNoUsername = errors.New("no username provided")
    ErrNoPassword = errors.New("no password provided")
    - // push errors
    + // pull/push errors
    ErrNoTags = errors.New("no tags specified")
    )
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/podman/pull.go Mon Oct 11 00:45:39 2021 -0500
    @@ -0,0 +1,51 @@
    +package podman
    +
    +import (
    + log "github.com/sirupsen/logrus"
    +
    + "keep.imfreedom.org/grim/convey/environment"
    + "keep.imfreedom.org/grim/convey/exec"
    + "keep.imfreedom.org/grim/convey/runtime"
    + "keep.imfreedom.org/grim/convey/tasks"
    + "keep.imfreedom.org/grim/convey/yaml"
    +)
    +
    +type Pull struct {
    + Tags yaml.StringOrSlice `yaml:"tags"`
    +}
    +
    +func (p *Pull) Execute(name string, logger *log.Entry, stageEnv environment.Environment, rt *runtime.Runtime) error {
    + env := stageEnv.Copy().Merge(rt.Environment)
    +
    + tags := env.Expandv(p.Tags)
    + for _, tag := range tags {
    + generator := exec.NewGenerator(
    + "podman",
    + "pull",
    + tag,
    + )
    +
    + err := exec.Run(name, generator.Command(), rt.Timeout)
    + if err != nil {
    + return err
    + }
    + }
    +
    + return nil
    +}
    +
    +func (p *Pull) New() tasks.Task {
    + return &Pull{}
    +}
    +
    +func (p *Pull) Valid() error {
    + if len(p.Tags) == 0 {
    + return ErrNoTags
    + }
    +
    + return nil
    +}
    +
    +func (p *Pull) Deprecated() error {
    + return nil
    +}
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/podman/pull_test.go Mon Oct 11 00:45:39 2021 -0500
    @@ -0,0 +1,37 @@
    +package podman
    +
    +import (
    + "testing"
    +
    + . "github.com/onsi/gomega"
    +
    + "keep.imfreedom.org/grim/convey/yaml"
    +)
    +
    +func TestPullString(t *testing.T) {
    + g := NewGomegaWithT(t)
    +
    + p := &Pull{
    + Tags: yaml.StringOrSlice{"foo"},
    + }
    +
    + g.Expect(p.Valid()).To(BeNil())
    +}
    +
    +func TestPullSlice(t *testing.T) {
    + g := NewGomegaWithT(t)
    +
    + p := &Pull{
    + Tags: []string{"foo", "bar"},
    + }
    +
    + g.Expect(p.Valid()).To(BeNil())
    +}
    +
    +func TestPullTagsRequired(t *testing.T) {
    + g := NewGomegaWithT(t)
    +
    + p := &Push{}
    +
    + g.Expect(p.Valid()).To(MatchError(ErrNoTags))
    +}
    --- a/podman/tasks.go Mon Oct 11 00:26:37 2021 -0500
    +++ b/podman/tasks.go Mon Oct 11 00:45:39 2021 -0500
    @@ -8,12 +8,11 @@
    Tasks = map[string]tasks.Task{
    "podman/login": &Login{},
    "podman/logout": &Logout{},
    + "podman/pull": &Pull{},
    "podman/push": &Push{},
    "podman/run": &Run{},
    // make it go!
    - "docker/login": &Login{},
    - "docker/logout": &Logout{},
    - "docker/run": &Run{},
    + "docker/run": &Run{},
    }
    )
    --- a/tasks/errors.go Mon Oct 11 00:26:37 2021 -0500
    +++ b/tasks/errors.go Mon Oct 11 00:45:39 2021 -0500
    @@ -21,5 +21,5 @@
    )
    var (
    - errNoFiles = errors.New("no files specified")
    + ErrNoFiles = errors.New("no files specified")
    )
    --- a/tasks/export.go Mon Oct 11 00:26:37 2021 -0500
    +++ b/tasks/export.go Mon Oct 11 00:45:39 2021 -0500
    @@ -40,7 +40,7 @@
    // Valid validates the export task.
    func (e *Export) Valid() error {
    if len(e.Files) == 0 {
    - return errNoFiles
    + return ErrNoFiles
    }
    return nil
    --- a/tasks/import.go Mon Oct 11 00:26:37 2021 -0500
    +++ b/tasks/import.go Mon Oct 11 00:45:39 2021 -0500
    @@ -41,7 +41,7 @@
    // Valid validates the export task.
    func (i *Import) Valid() error {
    if len(i.Files) == 0 {
    - return errNoFiles
    + return ErrNoFiles
    }
    return nil