Remove s3ql

s3ql does not work very well in a dynamic environment like k8s.
Also as it needs a ton of dependencies just to get it built makes
it hard to maintain.

pkg/s3/mounter.go

@@ -20,7 +20,6 @@ type Mounter interface {
 const (
 	s3fsMounterType     = "s3fs"
 	goofysMounterType   = "goofys"
-	s3qlMounterType     = "s3ql"
 	s3backerMounterType = "s3backer"
 	rcloneMounterType   = "rclone"
 	mounterTypeKey      = "mounter"
@@ -40,9 +39,6 @@ func newMounter(bucket *bucket, cfg *Config) (Mounter, error) {
 	case goofysMounterType:
 		return newGoofysMounter(bucket, cfg)
 
-	case s3qlMounterType:
-		return newS3qlMounter(bucket, cfg)
-
 	case s3backerMounterType:
 		return newS3backerMounter(bucket, cfg)
 

pkg/s3/mounter_s3ql.go

@@ -1,114 +0,0 @@
-package s3
-
-import (
-	"bytes"
-	"fmt"
-	"net/url"
-	"os"
-	"os/exec"
-	"path"
-	"strings"
-
-	"gopkg.in/ini.v1"
-)
-
-// Implements Mounter
-type s3qlMounter struct {
-	bucket     *bucket
-	url        string
-	bucketURL  string
-	login      string
-	password   string
-	passphrase string
-	options    []string
-	ssl        bool
-	targetPath string
-}
-
-const (
-	s3qlCmdMkfs    = "mkfs.s3ql"
-	s3qlCmdMount   = "mount.s3ql"
-	s3qlCmdUnmount = "umount.s3ql"
-)
-
-func newS3qlMounter(b *bucket, cfg *Config) (Mounter, error) {
-	url, err := url.Parse(cfg.Endpoint)
-	if err != nil {
-		return nil, err
-	}
-	ssl := url.Scheme != "http"
-	if strings.Contains(url.Scheme, "http") {
-		url.Scheme = "s3c"
-	}
-	s3ql := &s3qlMounter{
-		bucket:     b,
-		url:        url.String(),
-		login:      cfg.AccessKeyID,
-		password:   cfg.SecretAccessKey,
-		passphrase: cfg.EncryptionKey,
-		ssl:        ssl,
-	}
-
-	// s3ql requires a trailing slash or it will just
-	// prepend the fspath to the s3ql files
-	url.Path = path.Join(url.Path, b.Name, b.FSPath) + "/"
-	s3ql.bucketURL = url.String()
-
-	if !ssl {
-		s3ql.options = []string{"--backend-options", "no-ssl"}
-	}
-
-	return s3ql, s3ql.writeConfig()
-}
-
-func (s3ql *s3qlMounter) Stage(stagePath string) error {
-	// force creation to ignore existing data
-	args := []string{
-		s3ql.bucketURL,
-		"--force",
-	}
-
-	p := fmt.Sprintf("%s\n%s\n", s3ql.passphrase, s3ql.passphrase)
-	reader := bytes.NewReader([]byte(p))
-	cmd := exec.Command(s3qlCmdMkfs, append(args, s3ql.options...)...)
-	cmd.Stdin = reader
-
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		return fmt.Errorf("Error running s3ql command: %s", out)
-	}
-	return nil
-}
-
-func (s3ql *s3qlMounter) Unstage(stagePath string) error {
-	return nil
-}
-
-func (s3ql *s3qlMounter) Mount(source string, target string) error {
-	args := []string{
-		s3ql.bucketURL,
-		target,
-		"--allow-other",
-	}
-	return fuseMount(target, s3qlCmdMount, append(args, s3ql.options...))
-}
-
-func (s3ql *s3qlMounter) writeConfig() error {
-	s3qlIni := ini.Empty()
-	section, err := s3qlIni.NewSection("s3ql")
-	if err != nil {
-		return err
-	}
-
-	section.NewKey("storage-url", s3ql.url)
-	section.NewKey("backend-login", s3ql.login)
-	section.NewKey("backend-password", s3ql.password)
-	section.NewKey("fs-passphrase", s3ql.passphrase)
-
-	authDir := os.Getenv("HOME") + "/.s3ql"
-	authFile := authDir + "/authinfo2"
-	os.Mkdir(authDir, 0700)
-	s3qlIni.SaveTo(authFile)
-	os.Chmod(authFile, 0600)
-	return nil
-}

pkg/s3/s3-driver_suite_test.go

@@ -65,33 +65,6 @@ var _ = Describe("S3Driver", func() {
 		})
 	})
 
-	Context("s3ql", func() {
-		socket := "/tmp/csi-s3ql.sock"
-		csiEndpoint := "unix://" + socket
-
-		if err := os.Remove(socket); err != nil && !os.IsNotExist(err) {
-			Expect(err).NotTo(HaveOccurred())
-		}
-		driver, err := s3.NewS3("test-node", csiEndpoint)
-		if err != nil {
-			log.Fatal(err)
-		}
-		go driver.Run()
-
-		Describe("CSI sanity", func() {
-			sanityCfg := &sanity.Config{
-				TargetPath:  os.TempDir() + "/s3ql-target",
-				StagingPath: os.TempDir() + "/s3ql-staging",
-				Address:     csiEndpoint,
-				SecretsFile: "../../test/secret.yaml",
-				TestVolumeParameters: map[string]string{
-					"mounter": "s3ql",
-				},
-			}
-			sanity.GinkgoTest(sanityCfg)
-		})
-	})
-
 	Context("s3backer", func() {
 		socket := "/tmp/csi-s3backer.sock"
 		csiEndpoint := "unix://" + socket