From 964253f13967a5e9879c527c46fdd182ccf13ff1 Mon Sep 17 00:00:00 2001 From: James Bardin Date: Wed, 25 Jan 2017 14:07:39 -0500 Subject: [PATCH] Manually fix scaleway api package The scaleway api package depends transitively on the gotty-client package which is broken on solaris. Since it's only imported through the helpers.go file, and we don't call an functionality in that file, we can compile without it for now. --- .../scaleway/scaleway-cli/pkg/api/helpers.go | 670 ------------------ .../scaleway/scaleway-cli/pkg/utils/quiet.go | 30 - .../scaleway/scaleway-cli/pkg/utils/utils.go | 253 ------- vendor/vendor.json | 7 - 4 files changed, 960 deletions(-) delete mode 100644 vendor/github.com/scaleway/scaleway-cli/pkg/api/helpers.go delete mode 100644 vendor/github.com/scaleway/scaleway-cli/pkg/utils/quiet.go delete mode 100644 vendor/github.com/scaleway/scaleway-cli/pkg/utils/utils.go diff --git a/vendor/github.com/scaleway/scaleway-cli/pkg/api/helpers.go b/vendor/github.com/scaleway/scaleway-cli/pkg/api/helpers.go deleted file mode 100644 index d3fd5c5b4..000000000 --- a/vendor/github.com/scaleway/scaleway-cli/pkg/api/helpers.go +++ /dev/null @@ -1,670 +0,0 @@ -// Copyright (C) 2015 Scaleway. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE.md file. - -package api - -import ( - "errors" - "fmt" - "os" - "sort" - "strings" - "sync" - "time" - - "github.com/Sirupsen/logrus" - log "github.com/Sirupsen/logrus" - "github.com/docker/docker/pkg/namesgenerator" - "github.com/dustin/go-humanize" - "github.com/moul/anonuuid" - "github.com/scaleway/scaleway-cli/pkg/utils" -) - -// ScalewayResolvedIdentifier represents a list of matching identifier for a specifier pattern -type ScalewayResolvedIdentifier struct { - // Identifiers holds matching identifiers - Identifiers ScalewayResolverResults - - // Needle is the criteria used to lookup identifiers - Needle string -} - -// ScalewayImageInterface is an interface to multiple Scaleway items -type ScalewayImageInterface struct { - CreationDate time.Time - Identifier string - Name string - Tag string - VirtualSize uint64 - Public bool - Type string - Organization string - Archs []string - Region []string -} - -// ResolveGateway tries to resolve a server public ip address, else returns the input string, i.e. IPv4, hostname -func ResolveGateway(api *ScalewayAPI, gateway string) (string, error) { - if gateway == "" { - return "", nil - } - - // Parses optional type prefix, i.e: "server:name" -> "name" - _, gateway = parseNeedle(gateway) - - servers, err := api.ResolveServer(gateway) - if err != nil { - return "", err - } - - if len(servers) == 0 { - return gateway, nil - } - - if len(servers) > 1 { - return "", showResolverResults(gateway, servers) - } - - // if len(servers) == 1 { - server, err := api.GetServer(servers[0].Identifier) - if err != nil { - return "", err - } - return server.PublicAddress.IP, nil -} - -// CreateVolumeFromHumanSize creates a volume on the API with a human readable size -func CreateVolumeFromHumanSize(api *ScalewayAPI, size string) (*string, error) { - bytes, err := humanize.ParseBytes(size) - if err != nil { - return nil, err - } - - var newVolume ScalewayVolumeDefinition - newVolume.Name = size - newVolume.Size = bytes - newVolume.Type = "l_ssd" - - volumeID, err := api.PostVolume(newVolume) - if err != nil { - return nil, err - } - - return &volumeID, nil -} - -// fillIdentifierCache fills the cache by fetching from the API -func fillIdentifierCache(api *ScalewayAPI, identifierType int) { - log.Debugf("Filling the cache") - var wg sync.WaitGroup - wg.Add(5) - go func() { - if identifierType&(IdentifierUnknown|IdentifierServer) > 0 { - api.GetServers(true, 0) - } - wg.Done() - }() - go func() { - if identifierType&(IdentifierUnknown|IdentifierImage) > 0 { - api.GetImages() - } - wg.Done() - }() - go func() { - if identifierType&(IdentifierUnknown|IdentifierSnapshot) > 0 { - api.GetSnapshots() - } - wg.Done() - }() - go func() { - if identifierType&(IdentifierUnknown|IdentifierVolume) > 0 { - api.GetVolumes() - } - wg.Done() - }() - go func() { - if identifierType&(IdentifierUnknown|IdentifierBootscript) > 0 { - api.GetBootscripts() - } - wg.Done() - }() - wg.Wait() -} - -// GetIdentifier returns a an identifier if the resolved needles only match one element, else, it exists the program -func GetIdentifier(api *ScalewayAPI, needle string) (*ScalewayResolverResult, error) { - idents, err := ResolveIdentifier(api, needle) - if err != nil { - return nil, err - } - - if len(idents) == 1 { - return &idents[0], nil - } - if len(idents) == 0 { - return nil, fmt.Errorf("No such identifier: %s", needle) - } - - sort.Sort(idents) - for _, identifier := range idents { - // FIXME: also print the name - fmt.Fprintf(os.Stderr, "- %s\n", identifier.Identifier) - } - return nil, fmt.Errorf("Too many candidates for %s (%d)", needle, len(idents)) -} - -// ResolveIdentifier resolves needle provided by the user -func ResolveIdentifier(api *ScalewayAPI, needle string) (ScalewayResolverResults, error) { - idents, err := api.Cache.LookUpIdentifiers(needle) - if err != nil { - return idents, err - } - if len(idents) > 0 { - return idents, nil - } - - identifierType, _ := parseNeedle(needle) - fillIdentifierCache(api, identifierType) - - return api.Cache.LookUpIdentifiers(needle) -} - -// ResolveIdentifiers resolves needles provided by the user -func ResolveIdentifiers(api *ScalewayAPI, needles []string, out chan ScalewayResolvedIdentifier) { - // first attempt, only lookup from the cache - var unresolved []string - for _, needle := range needles { - idents, err := api.Cache.LookUpIdentifiers(needle) - if err != nil { - api.Logger.Fatalf("%s", err) - } - if len(idents) == 0 { - unresolved = append(unresolved, needle) - } else { - out <- ScalewayResolvedIdentifier{ - Identifiers: idents, - Needle: needle, - } - } - } - // fill the cache by fetching from the API and resolve missing identifiers - if len(unresolved) > 0 { - // compute identifierType: - // if identifierType is the same for every unresolved needle, - // we use it directly, else, we choose IdentifierUnknown to - // fulfill every types of cache - identifierType, _ := parseNeedle(unresolved[0]) - for _, needle := range unresolved { - newIdentifierType, _ := parseNeedle(needle) - if identifierType != newIdentifierType { - identifierType = IdentifierUnknown - break - } - } - - // fill all the cache - fillIdentifierCache(api, identifierType) - - // lookup again in the cache - for _, needle := range unresolved { - idents, err := api.Cache.LookUpIdentifiers(needle) - if err != nil { - api.Logger.Fatalf("%s", err) - } - out <- ScalewayResolvedIdentifier{ - Identifiers: idents, - Needle: needle, - } - } - } - - close(out) -} - -// InspectIdentifierResult is returned by `InspectIdentifiers` and contains the inspected `Object` with its `Type` -type InspectIdentifierResult struct { - Type int - Object interface{} -} - -// InspectIdentifiers inspects identifiers concurrently -func InspectIdentifiers(api *ScalewayAPI, ci chan ScalewayResolvedIdentifier, cj chan InspectIdentifierResult, arch string) { - var wg sync.WaitGroup - for { - idents, ok := <-ci - if !ok { - break - } - idents.Identifiers = FilterImagesByArch(idents.Identifiers, arch) - idents.Identifiers = FilterImagesByRegion(idents.Identifiers, api.Region) - if len(idents.Identifiers) != 1 { - if len(idents.Identifiers) == 0 { - log.Errorf("Unable to resolve identifier %s", idents.Needle) - } else { - logrus.Fatal(showResolverResults(idents.Needle, idents.Identifiers)) - } - } else { - ident := idents.Identifiers[0] - wg.Add(1) - go func() { - var obj interface{} - var err error - - switch ident.Type { - case IdentifierServer: - obj, err = api.GetServer(ident.Identifier) - case IdentifierImage: - obj, err = api.GetImage(ident.Identifier) - case IdentifierSnapshot: - obj, err = api.GetSnapshot(ident.Identifier) - case IdentifierVolume: - obj, err = api.GetVolume(ident.Identifier) - case IdentifierBootscript: - obj, err = api.GetBootscript(ident.Identifier) - } - if err == nil && obj != nil { - cj <- InspectIdentifierResult{ - Type: ident.Type, - Object: obj, - } - } - wg.Done() - }() - } - } - wg.Wait() - close(cj) -} - -// ConfigCreateServer represents the options sent to CreateServer and defining a server -type ConfigCreateServer struct { - ImageName string - Name string - Bootscript string - Env string - AdditionalVolumes string - IP string - CommercialType string - DynamicIPRequired bool - EnableIPV6 bool -} - -// CreateServer creates a server using API based on typical server fields -func CreateServer(api *ScalewayAPI, c *ConfigCreateServer) (string, error) { - commercialType := os.Getenv("SCW_COMMERCIAL_TYPE") - if commercialType == "" { - commercialType = c.CommercialType - } - if len(commercialType) < 2 { - return "", errors.New("Invalid commercial type") - } - - if c.Name == "" { - c.Name = strings.Replace(namesgenerator.GetRandomName(0), "_", "-", -1) - } - - var server ScalewayServerDefinition - - server.CommercialType = commercialType - server.Volumes = make(map[string]string) - server.DynamicIPRequired = &c.DynamicIPRequired - server.EnableIPV6 = c.EnableIPV6 - if commercialType == "" { - return "", errors.New("You need to specify a commercial-type") - } - if c.IP != "" { - if anonuuid.IsUUID(c.IP) == nil { - server.PublicIP = c.IP - } else { - ips, err := api.GetIPS() - if err != nil { - return "", err - } - for _, ip := range ips.IPS { - if ip.Address == c.IP { - server.PublicIP = ip.ID - break - } - } - if server.PublicIP == "" { - return "", fmt.Errorf("IP address %v not found", c.IP) - } - } - } - server.Tags = []string{} - if c.Env != "" { - server.Tags = strings.Split(c.Env, " ") - } - switch c.CommercialType { - case "VC1M": - if c.AdditionalVolumes == "" { - c.AdditionalVolumes = "50G" - log.Debugf("This server needs a least 50G") - } - case "VC1L": - if c.AdditionalVolumes == "" { - c.AdditionalVolumes = "150G" - log.Debugf("This server needs a least 150G") - } - } - if c.AdditionalVolumes != "" { - volumes := strings.Split(c.AdditionalVolumes, " ") - for i := range volumes { - volumeID, err := CreateVolumeFromHumanSize(api, volumes[i]) - if err != nil { - return "", err - } - - volumeIDx := fmt.Sprintf("%d", i+1) - server.Volumes[volumeIDx] = *volumeID - } - } - arch := os.Getenv("SCW_TARGET_ARCH") - if arch == "" { - server.CommercialType = strings.ToUpper(server.CommercialType) - switch server.CommercialType[:2] { - case "C1": - arch = "arm" - case "C2", "VC": - arch = "x86_64" - default: - return "", fmt.Errorf("%s wrong commercial type", server.CommercialType) - } - } - imageIdentifier := &ScalewayImageIdentifier{ - Arch: arch, - } - server.Name = c.Name - inheritingVolume := false - _, err := humanize.ParseBytes(c.ImageName) - if err == nil { - // Create a new root volume - volumeID, errCreateVol := CreateVolumeFromHumanSize(api, c.ImageName) - if errCreateVol != nil { - return "", errCreateVol - } - server.Volumes["0"] = *volumeID - } else { - // Use an existing image - inheritingVolume = true - if anonuuid.IsUUID(c.ImageName) == nil { - server.Image = &c.ImageName - } else { - imageIdentifier, err = api.GetImageID(c.ImageName, arch) - if err != nil { - return "", err - } - if imageIdentifier.Identifier != "" { - server.Image = &imageIdentifier.Identifier - } else { - snapshotID, errGetSnapID := api.GetSnapshotID(c.ImageName) - if errGetSnapID != nil { - return "", errGetSnapID - } - snapshot, errGetSnap := api.GetSnapshot(snapshotID) - if errGetSnap != nil { - return "", errGetSnap - } - if snapshot.BaseVolume.Identifier == "" { - return "", fmt.Errorf("snapshot %v does not have base volume", snapshot.Name) - } - server.Volumes["0"] = snapshot.BaseVolume.Identifier - } - } - } - - if c.Bootscript != "" { - bootscript := "" - - if anonuuid.IsUUID(c.Bootscript) == nil { - bootscript = c.Bootscript - } else { - var errGetBootScript error - - bootscript, errGetBootScript = api.GetBootscriptID(c.Bootscript, imageIdentifier.Arch) - if errGetBootScript != nil { - return "", errGetBootScript - } - } - server.Bootscript = &bootscript - } - serverID, err := api.PostServer(server) - if err != nil { - return "", err - } - - // For inherited volumes, we prefix the name with server hostname - if inheritingVolume { - createdServer, err := api.GetServer(serverID) - if err != nil { - return "", err - } - currentVolume := createdServer.Volumes["0"] - - var volumePayload ScalewayVolumePutDefinition - newName := fmt.Sprintf("%s-%s", createdServer.Hostname, currentVolume.Name) - volumePayload.Name = &newName - volumePayload.CreationDate = ¤tVolume.CreationDate - volumePayload.Organization = ¤tVolume.Organization - volumePayload.Server.Identifier = ¤tVolume.Server.Identifier - volumePayload.Server.Name = ¤tVolume.Server.Name - volumePayload.Identifier = ¤tVolume.Identifier - volumePayload.Size = ¤tVolume.Size - volumePayload.ModificationDate = ¤tVolume.ModificationDate - volumePayload.ExportURI = ¤tVolume.ExportURI - volumePayload.VolumeType = ¤tVolume.VolumeType - - err = api.PutVolume(currentVolume.Identifier, volumePayload) - if err != nil { - return "", err - } - } - - return serverID, nil -} - -// WaitForServerState asks API in a loop until a server matches a wanted state -func WaitForServerState(api *ScalewayAPI, serverID string, targetState string) (*ScalewayServer, error) { - var server *ScalewayServer - var err error - - var currentState string - - for { - server, err = api.GetServer(serverID) - if err != nil { - return nil, err - } - if currentState != server.State { - log.Infof("Server changed state to '%s'", server.State) - currentState = server.State - } - if server.State == targetState { - break - } - time.Sleep(1 * time.Second) - } - - return server, nil -} - -// WaitForServerReady wait for a server state to be running, then wait for the SSH port to be available -func WaitForServerReady(api *ScalewayAPI, serverID, gateway string) (*ScalewayServer, error) { - promise := make(chan bool) - var server *ScalewayServer - var err error - var currentState string - - go func() { - defer close(promise) - - for { - server, err = api.GetServer(serverID) - if err != nil { - promise <- false - return - } - if currentState != server.State { - log.Infof("Server changed state to '%s'", server.State) - currentState = server.State - } - if server.State == "running" { - break - } - if server.State == "stopped" { - err = fmt.Errorf("The server has been stopped") - promise <- false - return - } - time.Sleep(1 * time.Second) - } - - if gateway == "" { - dest := fmt.Sprintf("%s:22", server.PublicAddress.IP) - log.Debugf("Waiting for server SSH port %s", dest) - err = utils.WaitForTCPPortOpen(dest) - if err != nil { - promise <- false - return - } - } else { - dest := fmt.Sprintf("%s:22", gateway) - log.Debugf("Waiting for server SSH port %s", dest) - err = utils.WaitForTCPPortOpen(dest) - if err != nil { - promise <- false - return - } - log.Debugf("Check for SSH port through the gateway: %s", server.PrivateIP) - timeout := time.Tick(120 * time.Second) - for { - select { - case <-timeout: - err = fmt.Errorf("Timeout: unable to ping %s", server.PrivateIP) - goto OUT - default: - if utils.SSHExec("", server.PrivateIP, "root", 22, []string{ - "nc", - "-z", - "-w", - "1", - server.PrivateIP, - "22", - }, false, gateway, false) == nil { - goto OUT - } - time.Sleep(2 * time.Second) - } - } - OUT: - if err != nil { - logrus.Info(err) - err = nil - } - } - promise <- true - }() - - loop := 0 - for { - select { - case done := <-promise: - utils.LogQuiet("\r \r") - if !done { - return nil, err - } - return server, nil - case <-time.After(time.Millisecond * 100): - utils.LogQuiet(fmt.Sprintf("\r%c\r", "-\\|/"[loop%4])) - loop = loop + 1 - if loop == 5 { - loop = 0 - } - } - } -} - -// WaitForServerStopped wait for a server state to be stopped -func WaitForServerStopped(api *ScalewayAPI, serverID string) (*ScalewayServer, error) { - server, err := WaitForServerState(api, serverID, "stopped") - if err != nil { - return nil, err - } - return server, nil -} - -// ByCreationDate sorts images by CreationDate field -type ByCreationDate []ScalewayImageInterface - -func (a ByCreationDate) Len() int { return len(a) } -func (a ByCreationDate) Swap(i, j int) { a[i], a[j] = a[j], a[i] } -func (a ByCreationDate) Less(i, j int) bool { return a[j].CreationDate.Before(a[i].CreationDate) } - -// StartServer start a server based on its needle, can optionaly block while server is booting -func StartServer(api *ScalewayAPI, needle string, wait bool) error { - server, err := api.GetServerID(needle) - if err != nil { - return err - } - - if err = api.PostServerAction(server, "poweron"); err != nil { - return err - } - - if wait { - _, err = WaitForServerReady(api, server, "") - if err != nil { - return fmt.Errorf("failed to wait for server %s to be ready, %v", needle, err) - } - } - return nil -} - -// StartServerOnce wraps StartServer for golang channel -func StartServerOnce(api *ScalewayAPI, needle string, wait bool, successChan chan string, errChan chan error) { - err := StartServer(api, needle, wait) - - if err != nil { - errChan <- err - return - } - successChan <- needle -} - -// DeleteServerForce tries to delete a server using multiple ways -func (a *ScalewayAPI) DeleteServerForce(serverID string) error { - // FIXME: also delete attached volumes and ip address - // FIXME: call delete and stop -t in parallel to speed up process - err := a.DeleteServer(serverID) - if err == nil { - logrus.Infof("Server '%s' successfully deleted", serverID) - return nil - } - - err = a.PostServerAction(serverID, "terminate") - if err == nil { - logrus.Infof("Server '%s' successfully terminated", serverID) - return nil - } - - // FIXME: retry in a loop until timeout or Control+C - logrus.Errorf("Failed to delete server %s", serverID) - logrus.Errorf("Try to run 'scw rm -f %s' later", serverID) - return err -} - -// GetSSHFingerprintFromServer returns an array which containts ssh-host-fingerprints -func (a *ScalewayAPI) GetSSHFingerprintFromServer(serverID string) []string { - ret := []string{} - - if value, err := a.GetUserdata(serverID, "ssh-host-fingerprints", false); err == nil { - PublicKeys := strings.Split(string(*value), "\n") - for i := range PublicKeys { - if fingerprint, err := utils.SSHGetFingerprint([]byte(PublicKeys[i])); err == nil { - ret = append(ret, fingerprint) - } - } - } - return ret -} diff --git a/vendor/github.com/scaleway/scaleway-cli/pkg/utils/quiet.go b/vendor/github.com/scaleway/scaleway-cli/pkg/utils/quiet.go deleted file mode 100644 index 775918d8d..000000000 --- a/vendor/github.com/scaleway/scaleway-cli/pkg/utils/quiet.go +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (C) 2015 Scaleway. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE.md file. - -// Package utils contains logquiet -package utils - -import ( - "fmt" - "os" -) - -// LogQuietStruct is a struct to store information about quiet state -type LogQuietStruct struct { - quiet bool -} - -var instanceQuiet LogQuietStruct - -// Quiet enable or disable quiet -func Quiet(option bool) { - instanceQuiet.quiet = option -} - -// LogQuiet Displays info if quiet is activated -func LogQuiet(str string) { - if !instanceQuiet.quiet { - fmt.Fprintf(os.Stderr, "%s", str) - } -} diff --git a/vendor/github.com/scaleway/scaleway-cli/pkg/utils/utils.go b/vendor/github.com/scaleway/scaleway-cli/pkg/utils/utils.go deleted file mode 100644 index 6f11f4869..000000000 --- a/vendor/github.com/scaleway/scaleway-cli/pkg/utils/utils.go +++ /dev/null @@ -1,253 +0,0 @@ -// Copyright (C) 2015 Scaleway. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE.md file. - -// scw helpers - -// Package utils contains helpers -package utils - -import ( - "crypto/md5" - "errors" - "fmt" - "io" - "net" - "os" - "os/exec" - "path" - "path/filepath" - "reflect" - "regexp" - "strings" - "time" - - "golang.org/x/crypto/ssh" - - "github.com/Sirupsen/logrus" - log "github.com/Sirupsen/logrus" - "github.com/mattn/go-isatty" - "github.com/moul/gotty-client" - "github.com/scaleway/scaleway-cli/pkg/sshcommand" -) - -// SpawnRedirection is used to redirects the fluxes -type SpawnRedirection struct { - Stdin io.Reader - Stdout io.Writer - Stderr io.Writer -} - -// SSHExec executes a command over SSH and redirects file-descriptors -func SSHExec(publicIPAddress, privateIPAddress, user string, port int, command []string, checkConnection bool, gateway string, enableSSHKeyForwarding bool) error { - gatewayUser := "root" - gatewayIPAddress := gateway - if strings.Contains(gateway, "@") { - parts := strings.Split(gatewayIPAddress, "@") - if len(parts) != 2 { - return fmt.Errorf("gateway: must be like root@IP") - } - gatewayUser = parts[0] - gatewayIPAddress = parts[1] - gateway = gatewayUser + "@" + gatewayIPAddress - } - - if publicIPAddress == "" && gatewayIPAddress == "" { - return errors.New("server does not have public IP") - } - if privateIPAddress == "" && gatewayIPAddress != "" { - return errors.New("server does not have private IP") - } - - if checkConnection { - useGateway := gatewayIPAddress != "" - if useGateway && !IsTCPPortOpen(fmt.Sprintf("%s:22", gatewayIPAddress)) { - return errors.New("gateway is not available, try again later") - } - if !useGateway && !IsTCPPortOpen(fmt.Sprintf("%s:%d", publicIPAddress, port)) { - return errors.New("server is not ready, try again later") - } - } - - sshCommand := NewSSHExecCmd(publicIPAddress, privateIPAddress, user, port, isatty.IsTerminal(os.Stdin.Fd()), command, gateway, enableSSHKeyForwarding) - - log.Debugf("Executing: %s", sshCommand) - - spawn := exec.Command("ssh", sshCommand.Slice()[1:]...) - spawn.Stdout = os.Stdout - spawn.Stdin = os.Stdin - spawn.Stderr = os.Stderr - return spawn.Run() -} - -// NewSSHExecCmd computes execve compatible arguments to run a command via ssh -func NewSSHExecCmd(publicIPAddress, privateIPAddress, user string, port int, allocateTTY bool, command []string, gatewayIPAddress string, enableSSHKeyForwarding bool) *sshcommand.Command { - quiet := os.Getenv("DEBUG") != "1" - secureExec := os.Getenv("SCW_SECURE_EXEC") == "1" - sshCommand := &sshcommand.Command{ - AllocateTTY: allocateTTY, - Command: command, - Host: publicIPAddress, - Quiet: quiet, - SkipHostKeyChecking: !secureExec, - User: user, - NoEscapeCommand: true, - Port: port, - EnableSSHKeyForwarding: enableSSHKeyForwarding, - } - if gatewayIPAddress != "" { - sshCommand.Host = privateIPAddress - sshCommand.Gateway = &sshcommand.Command{ - Host: gatewayIPAddress, - SkipHostKeyChecking: !secureExec, - AllocateTTY: allocateTTY, - Quiet: quiet, - User: user, - Port: port, - } - } - - return sshCommand -} - -// GeneratingAnSSHKey generates an SSH key -func GeneratingAnSSHKey(cfg SpawnRedirection, path string, name string) (string, error) { - args := []string{ - "-t", - "rsa", - "-b", - "4096", - "-f", - filepath.Join(path, name), - "-N", - "", - "-C", - "", - } - log.Infof("Executing commands %v", args) - spawn := exec.Command("ssh-keygen", args...) - spawn.Stdout = cfg.Stdout - spawn.Stdin = cfg.Stdin - spawn.Stderr = cfg.Stderr - return args[5], spawn.Run() -} - -// WaitForTCPPortOpen calls IsTCPPortOpen in a loop -func WaitForTCPPortOpen(dest string) error { - for { - if IsTCPPortOpen(dest) { - break - } - time.Sleep(1 * time.Second) - } - return nil -} - -// IsTCPPortOpen returns true if a TCP communication with "host:port" can be initialized -func IsTCPPortOpen(dest string) bool { - conn, err := net.DialTimeout("tcp", dest, time.Duration(2000)*time.Millisecond) - if err == nil { - defer conn.Close() - } - return err == nil -} - -// TruncIf ensures the input string does not exceed max size if cond is met -func TruncIf(str string, max int, cond bool) string { - if cond && len(str) > max { - return str[:max] - } - return str -} - -// Wordify convert complex name to a single word without special shell characters -func Wordify(str string) string { - str = regexp.MustCompile(`[^a-zA-Z0-9-]`).ReplaceAllString(str, "_") - str = regexp.MustCompile(`__+`).ReplaceAllString(str, "_") - str = strings.Trim(str, "_") - return str -} - -// PathToTARPathparts returns the two parts of a unix path -func PathToTARPathparts(fullPath string) (string, string) { - fullPath = strings.TrimRight(fullPath, "/") - return path.Dir(fullPath), path.Base(fullPath) -} - -// RemoveDuplicates transforms an array into a unique array -func RemoveDuplicates(elements []string) []string { - encountered := map[string]bool{} - - // Create a map of all unique elements. - for v := range elements { - encountered[elements[v]] = true - } - - // Place all keys from the map into a slice. - result := []string{} - for key := range encountered { - result = append(result, key) - } - return result -} - -// AttachToSerial tries to connect to server serial using 'gotty-client' and fallback with a help message -func AttachToSerial(serverID, apiToken, url string) (*gottyclient.Client, chan bool, error) { - gottyURL := os.Getenv("SCW_GOTTY_URL") - if gottyURL == "" { - gottyURL = url - } - URL := fmt.Sprintf("%s?arg=%s&arg=%s", gottyURL, apiToken, serverID) - - logrus.Debug("Connection to ", URL) - gottycli, err := gottyclient.NewClient(URL) - if err != nil { - return nil, nil, err - } - - if os.Getenv("SCW_TLSVERIFY") == "0" { - gottycli.SkipTLSVerify = true - } - - gottycli.UseProxyFromEnv = true - - if err = gottycli.Connect(); err != nil { - return nil, nil, err - } - done := make(chan bool) - - fmt.Println("You are connected, type 'Ctrl+q' to quit.") - go func() { - gottycli.Loop() - gottycli.Close() - done <- true - }() - return gottycli, done, nil -} - -func rfc4716hex(data []byte) string { - fingerprint := "" - - for i := 0; i < len(data); i++ { - fingerprint = fmt.Sprintf("%s%0.2x", fingerprint, data[i]) - if i != len(data)-1 { - fingerprint = fingerprint + ":" - } - } - return fingerprint -} - -// SSHGetFingerprint returns the fingerprint of an SSH key -func SSHGetFingerprint(key []byte) (string, error) { - publicKey, comment, _, _, err := ssh.ParseAuthorizedKey(key) - if err != nil { - return "", err - } - switch reflect.TypeOf(publicKey).String() { - case "*ssh.rsaPublicKey", "*ssh.dsaPublicKey", "*ssh.ecdsaPublicKey": - md5sum := md5.Sum(publicKey.Marshal()) - return publicKey.Type() + " " + rfc4716hex(md5sum[:]) + " " + comment, nil - default: - return "", errors.New("Can't handle this key") - } -} diff --git a/vendor/vendor.json b/vendor/vendor.json index 2edaea9b9..1f21fdae4 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -2401,7 +2401,6 @@ "revisionTime": "2016-09-27T10:08:44Z" }, { - "checksumSHA1": "TuN6ZYgqa+zoK+W4tT6VdOqr8ws=", "path": "github.com/scaleway/scaleway-cli/pkg/api", "revision": "15e90c8d6bd96a674cfe6539f0dc0fa122a7412b", "revisionTime": "2016-12-07T13:39:28Z" @@ -2418,12 +2417,6 @@ "revision": "15e90c8d6bd96a674cfe6539f0dc0fa122a7412b", "revisionTime": "2016-12-07T13:39:28Z" }, - { - "checksumSHA1": "xM3G5ct9YYYnVIL3XMRrcf41xVw=", - "path": "github.com/scaleway/scaleway-cli/pkg/utils", - "revision": "15e90c8d6bd96a674cfe6539f0dc0fa122a7412b", - "revisionTime": "2016-12-07T13:39:28Z" - }, { "checksumSHA1": "tEKRyau4iRjmq2iwJbduD9RhN5s=", "path": "github.com/sean-/postgresql-acl",