mirror of
https://github.com/featurebasedb/featurebase.git
synced 2026-08-28 10:54:59 +00:00
remove unused vendor stuff
This commit is contained in:
Matt Jaffee
parent
77372fe3cc
commit
33d2ecf6b7
3 changed files with 3 additions and 272 deletions
48
glide.lock
generated
48
glide.lock
generated
|
|
@ -1,34 +1,6 @@
|
|||
hash: d11cedeb5b4d17ad5bc6d13441cfbb8769c74fbb5fe33839dd0988ee4e73cd4b
|
||||
updated: 2017-01-12T14:02:12.015478278-06:00
|
||||
hash: 469de49a1736f34a11e9b0e490f7c1da1d8cb0219fed4bf3ad9e71344ca7f58a
|
||||
updated: 2017-02-09T17:03:01.816613507-06:00
|
||||
imports:
|
||||
- name: github.com/aws/aws-sdk-go
|
||||
version: 63ce630574a5ec05ecd8e8de5cea16332a5a684d
|
||||
subpackages:
|
||||
- aws
|
||||
- aws/awserr
|
||||
- aws/awsutil
|
||||
- aws/client
|
||||
- aws/client/metadata
|
||||
- aws/corehandlers
|
||||
- aws/credentials
|
||||
- aws/credentials/ec2rolecreds
|
||||
- aws/credentials/endpointcreds
|
||||
- aws/credentials/stscreds
|
||||
- aws/defaults
|
||||
- aws/ec2metadata
|
||||
- aws/endpoints
|
||||
- aws/request
|
||||
- aws/session
|
||||
- aws/signer/v4
|
||||
- private/protocol
|
||||
- private/protocol/query
|
||||
- private/protocol/query/queryutil
|
||||
- private/protocol/rest
|
||||
- private/protocol/restxml
|
||||
- private/protocol/xml/xmlutil
|
||||
- private/waiter
|
||||
- service/s3
|
||||
- service/sts
|
||||
- name: github.com/boltdb/bolt
|
||||
version: 4b1ebc1869ad66568b313d0dc410e2be72670dda
|
||||
- name: github.com/BurntSushi/toml
|
||||
|
|
@ -41,8 +13,6 @@ imports:
|
|||
version: 346938d642f2ec3594ed81d874461961cd0faa76
|
||||
subpackages:
|
||||
- spew
|
||||
- name: github.com/go-ini/ini
|
||||
version: 6f66b0e091edb3c7b380f7c4f0f884274d550b67
|
||||
- name: github.com/gogo/protobuf
|
||||
version: a9cd0c35b97daf74d0ebf3514c5254814b2703b4
|
||||
subpackages:
|
||||
|
|
@ -52,21 +22,9 @@ imports:
|
|||
subpackages:
|
||||
- lru
|
||||
- name: github.com/golang/protobuf
|
||||
version: 8ee79997227bf9b34611aee7946ae64735e6fd93
|
||||
subpackages:
|
||||
- proto
|
||||
- name: github.com/jmespath/go-jmespath
|
||||
version: bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d
|
||||
version: 888eb0692c857ec880338addf316bd662d5e630e
|
||||
- name: github.com/satori/go.uuid
|
||||
version: 879c5887cd475cd7864858769793b2ceb0d44feb
|
||||
- name: golang.org/x/crypto
|
||||
version: c3b1d0d6d8690eaebe3064711b026770cc37efa3
|
||||
subpackages:
|
||||
- curve25519
|
||||
- ed25519
|
||||
- ed25519/internal/edwards25519
|
||||
- ssh
|
||||
- ssh/agent
|
||||
- name: golang.org/x/sys
|
||||
version: c200b10b5d5e122be351b67af224adc6128af5bf
|
||||
subpackages:
|
||||
|
|
|
|||
|
|
@ -27,5 +27,3 @@ import:
|
|||
- package: github.com/golang/protobuf
|
||||
- package: github.com/satori/go.uuid
|
||||
version: ^1.1.0
|
||||
- package: github.com/aws/aws-sdk-go
|
||||
version: ^1.6.10
|
||||
|
|
|
|||
225
ssh/ssh.go
225
ssh/ssh.go
|
|
@ -1,225 +0,0 @@
|
|||
package ssh
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"net"
|
||||
"os"
|
||||
"os/user"
|
||||
"strings"
|
||||
"syscall"
|
||||
|
||||
"golang.org/x/crypto/ssh"
|
||||
"golang.org/x/crypto/ssh/agent"
|
||||
"golang.org/x/crypto/ssh/terminal"
|
||||
)
|
||||
|
||||
type Client struct {
|
||||
client *ssh.Client
|
||||
Stderr io.Writer
|
||||
password string
|
||||
}
|
||||
|
||||
// NewClient wraps up some of the complexity of using the crypto/ssh pacakge
|
||||
// directly assuming you want to connect using public key auth and you can pass
|
||||
// a keyfile or your key is accessible through ssh agent.
|
||||
func NewClient(host, username, keyfile string, stderr io.Writer) (*Client, error) {
|
||||
if username == "" {
|
||||
user, err := user.Current()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
username = user.Username
|
||||
}
|
||||
|
||||
var authkey ssh.AuthMethod
|
||||
if keyfile == "" {
|
||||
sshAgent, err := net.Dial("unix", os.Getenv("SSH_AUTH_SOCK"))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
authkey = ssh.PublicKeysCallback(agent.NewClient(sshAgent).Signers)
|
||||
} else {
|
||||
return nil, fmt.Errorf("using a keyfile is unimplemented")
|
||||
}
|
||||
|
||||
authpw := ssh.PasswordCallback(func() (secret string, err error) {
|
||||
fmt.Fprintf(stderr, "password for %v@%v: ", username, host)
|
||||
pwbytes, err := terminal.ReadPassword(syscall.Stdin)
|
||||
fmt.Fprintln(stderr)
|
||||
return string(pwbytes), err
|
||||
})
|
||||
|
||||
config := &ssh.ClientConfig{
|
||||
User: username,
|
||||
Auth: []ssh.AuthMethod{authkey, authpw},
|
||||
}
|
||||
|
||||
if strings.Index(host, ":") == -1 {
|
||||
host = host + ":22"
|
||||
}
|
||||
|
||||
client, err := ssh.Dial("tcp", host, config)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("NewSSH failed Dial - host: %v, config: %v, err: %v ", host, config, err)
|
||||
}
|
||||
|
||||
return &Client{client: client, Stderr: stderr}, nil
|
||||
}
|
||||
|
||||
type Fleet map[string]*Client
|
||||
|
||||
func NewFleet(hosts []string, username, keyfile string, stderr io.Writer) (Fleet, error) {
|
||||
hosts = DedupHosts(hosts)
|
||||
clients := make(map[string]*Client, len(hosts))
|
||||
for _, host := range hosts {
|
||||
client, err := NewClient(host, username, keyfile, stderr)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
clients[host] = client
|
||||
}
|
||||
return clients, nil
|
||||
}
|
||||
|
||||
// DedupHosts takes a slice of hosts, strips off any specified ports, and
|
||||
// returns a de-duplicated slice of hosts.
|
||||
func DedupHosts(hosts []string) []string {
|
||||
seenHosts := make(map[string]bool)
|
||||
ret := []string{}
|
||||
for _, h := range hosts {
|
||||
colonIdx := strings.Index(h, ":")
|
||||
if colonIdx != -1 {
|
||||
h = h[:colonIdx]
|
||||
}
|
||||
if !seenHosts[h] {
|
||||
ret = append(ret, h)
|
||||
}
|
||||
seenHosts[h] = true
|
||||
}
|
||||
return ret
|
||||
}
|
||||
|
||||
func (s *Client) NewSession() (*ssh.Session, error) {
|
||||
return s.client.NewSession()
|
||||
}
|
||||
|
||||
type remoteFile struct {
|
||||
w io.WriteCloser
|
||||
sess *ssh.Session
|
||||
}
|
||||
|
||||
func (r *remoteFile) Write(p []byte) (n int, err error) {
|
||||
return r.w.Write(p)
|
||||
}
|
||||
|
||||
func (r *remoteFile) Close() error {
|
||||
errc := r.w.Close()
|
||||
errw := r.sess.Wait()
|
||||
if errc != nil || errw != nil {
|
||||
return fmt.Errorf("error closing remote file - close: '%v', wait: '%v'", errc, errw)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// OpenFile creates or truncates an existing file of the given name on the
|
||||
// remote host, and returns a WriteCloser which will write to that file. perm
|
||||
// will be passed directly to chmod to set the file permissions. rm, touch,
|
||||
// chmod, cat and support for semicolons, double ampersand, and output
|
||||
// redirection (>>) must be available in the remote shell.
|
||||
func (s *Client) OpenFile(name, perm string) (io.WriteCloser, error) {
|
||||
sess, err := s.NewSession()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
w, err := sess.StdinPipe()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if perm == "" {
|
||||
perm = "0664"
|
||||
}
|
||||
err = sess.Start(fmt.Sprintf("rm %v; touch %v && chmod %v %v && cat >> %v", name, name, perm, name, name))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &remoteFile{w: w, sess: sess}, nil
|
||||
}
|
||||
|
||||
type multiWriteCloser struct {
|
||||
wcs []io.WriteCloser
|
||||
ws []io.Writer
|
||||
}
|
||||
|
||||
func newMultiWriteCloser() *multiWriteCloser {
|
||||
return &multiWriteCloser{
|
||||
wcs: make([]io.WriteCloser, 0),
|
||||
ws: make([]io.Writer, 0),
|
||||
}
|
||||
}
|
||||
|
||||
func (mwc *multiWriteCloser) add(wc io.WriteCloser) {
|
||||
mwc.wcs = append(mwc.wcs, wc)
|
||||
mwc.ws = append(mwc.ws, wc)
|
||||
}
|
||||
|
||||
func (mwc *multiWriteCloser) Write(p []byte) (n int, err error) {
|
||||
mw := io.MultiWriter(mwc.ws...)
|
||||
return mw.Write(p)
|
||||
}
|
||||
|
||||
func (mwc *multiWriteCloser) Close() error {
|
||||
errStr := ""
|
||||
for _, wc := range mwc.wcs {
|
||||
err := wc.Close()
|
||||
if err != nil {
|
||||
errStr = errStr + "; " + err.Error()
|
||||
}
|
||||
}
|
||||
if errStr != "" {
|
||||
return errors.New(errStr)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (sf Fleet) OpenFile(name, perm string) (io.WriteCloser, error) {
|
||||
writers := newMultiWriteCloser()
|
||||
for _, cli := range sf {
|
||||
wc, err := cli.OpenFile(name, "+x")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
writers.add(wc)
|
||||
}
|
||||
return writers, nil
|
||||
}
|
||||
|
||||
// WriteFile writes all of data (until EOF) into a file with the given name on
|
||||
// each of the hosts in the fleet. It sets the permissions on the file to <perm>
|
||||
// which is any valid input to chmod. If <perm> is the empty string, it defaults
|
||||
// to 0664
|
||||
func (sf Fleet) WriteFile(name, perm string, data io.Reader) error {
|
||||
wc, err := sf.OpenFile(name, perm)
|
||||
if err != nil {
|
||||
return fmt.Errorf("opening: %v", err)
|
||||
}
|
||||
|
||||
_, err = io.Copy(wc, data)
|
||||
if err != nil {
|
||||
return fmt.Errorf("copying: %v", err)
|
||||
}
|
||||
return wc.Close()
|
||||
}
|
||||
|
||||
func (sf Fleet) Get(host string) (*Client, error) {
|
||||
colonIdx := strings.Index(host, ":")
|
||||
if colonIdx != -1 {
|
||||
host = host[:colonIdx]
|
||||
}
|
||||
if client, ok := sf[host]; ok {
|
||||
return client, nil
|
||||
}
|
||||
return nil, fmt.Errorf("No client found in fleet: %v for host: %v", sf, host)
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue