From fb3781aba206db2c467fb09720f27d5de1cf49e4 Mon Sep 17 00:00:00 2001 From: Shishir Mahajan Date: Mon, 29 Jun 2020 14:36:03 -0700 Subject: [PATCH] Add validations. Signed-off-by: Shishir Mahajan --- containerd/containerd.go | 4 ++++ containerd/driver.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/containerd/containerd.go b/containerd/containerd.go index 851140a..dc077b3 100644 --- a/containerd/containerd.go +++ b/containerd/containerd.go @@ -74,6 +74,10 @@ func (d *Driver) createContainer(image containerd.Image, containerName, containe // https://github.com/containerd/containerd/blob/master/mount/mount_linux.go#L187-L211 mounts := make([]specs.Mount, 0) for _, mount := range config.Mounts { + if (mount.Type == "bind" || mount.Type == "volume") && len(mount.Options) <= 0 { + return nil, fmt.Errorf("Options cannot be empty for mount type: %s. You need to atleast pass rbind and ro.", mount.Type) + } + m := specs.Mount{} m.Type = mount.Type m.Destination = mount.Target diff --git a/containerd/driver.go b/containerd/driver.go index 7fc3c9f..18550ae 100644 --- a/containerd/driver.go +++ b/containerd/driver.go @@ -82,7 +82,7 @@ var ( hclspec.NewAttr("type", "string", false), hclspec.NewLiteral("\"volume\""), ), - "target": hclspec.NewAttr("target", "string", false), + "target": hclspec.NewAttr("target", "string", true), "source": hclspec.NewAttr("source", "string", false), "options": hclspec.NewAttr("options", "list(string)", false), })),