Skip to content

Commit 6d541aa

Browse files
author
Gabriel Monroy
committed
feat(config): first pass at config subcommand
1 parent c182966 commit 6d541aa

5 files changed

Lines changed: 201 additions & 0 deletions

File tree

cmd/cmd.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"strconv"
77

88
"github.com/deis/deisctl/client"
9+
"github.com/deis/deisctl/config"
910
"github.com/deis/deisctl/constant"
1011
"github.com/deis/deisctl/update"
1112
"github.com/deis/deisctl/utils"
@@ -227,6 +228,13 @@ func splitScaleTarget(target string) (c string, num int, err error) {
227228
return
228229
}
229230

231+
func Config() error {
232+
if err := config.Config(); err != nil {
233+
return err
234+
}
235+
return nil
236+
}
237+
230238
func Update() error {
231239
if err := utils.Execute(constant.HooksDir + "pre-update"); err != nil {
232240
fmt.Println("pre-updatehook failed")

config/api.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package config
2+
3+
// Client interface used for configuration
4+
type Client interface {
5+
Get(string) (string, error)
6+
Set(string) (string, error)
7+
}

config/config.go

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
package config
2+
3+
import (
4+
"fmt"
5+
"strings"
6+
7+
docopt "github.com/docopt/docopt-go"
8+
)
9+
10+
// Config runs the config subcommand
11+
func Config() error {
12+
usage := `Deis Cluster Configuration
13+
14+
Usage:
15+
deisctl config <target> get [<key>...] [options]
16+
deisctl config <target> set <key=val>... [options]
17+
18+
Options:
19+
--verbose print out the request bodies [default: false]
20+
`
21+
// parse command-line arguments
22+
args, err := docopt.Parse(usage, nil, true, "", true)
23+
if err != nil {
24+
return err
25+
}
26+
err = setConfigFlags(args)
27+
if err != nil {
28+
return err
29+
}
30+
return doConfig(args)
31+
}
32+
33+
// Flags for config package
34+
var Flags struct {
35+
}
36+
37+
func setConfigFlags(args map[string]interface{}) error {
38+
return nil
39+
}
40+
41+
func doConfig(args map[string]interface{}) error {
42+
client, err := getEtcdClient()
43+
if err != nil {
44+
return err
45+
}
46+
47+
rootPath := "/deis/" + args["<target>"].(string) + "/"
48+
49+
var vals []string
50+
if args["set"] == true {
51+
vals, err = doConfigSet(client, rootPath, args["<key=val>"].([]string))
52+
} else {
53+
vals, err = doConfigGet(client, rootPath, args["<key>"].([]string))
54+
}
55+
if err != nil {
56+
return err
57+
}
58+
59+
// print results
60+
for _, v := range vals {
61+
fmt.Printf("%v\n", v)
62+
}
63+
return nil
64+
}
65+
66+
func doConfigSet(client *etcdClient, root string, kvs []string) ([]string, error) {
67+
var result []string
68+
for _, kv := range kvs {
69+
split := strings.Split(kv, "=")
70+
if len(split) != 2 {
71+
return result, fmt.Errorf("invalid argument: %v", kv)
72+
}
73+
val, err := client.Set(root+split[0], split[1])
74+
if err != nil {
75+
return result, err
76+
}
77+
result = append(result, val)
78+
}
79+
return result, nil
80+
}
81+
82+
func doConfigGet(client *etcdClient, root string, keys []string) ([]string, error) {
83+
var result []string
84+
for _, k := range keys {
85+
val, err := client.Get(root + k)
86+
if err != nil {
87+
return result, err
88+
}
89+
result = append(result, val)
90+
}
91+
return result, nil
92+
}

config/etcd.go

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
package config
2+
3+
import (
4+
"fmt"
5+
"net"
6+
"net/http"
7+
"strings"
8+
"time"
9+
10+
fleetEtcd "github.com/coreos/fleet/etcd"
11+
"github.com/coreos/fleet/ssh"
12+
"github.com/coreos/go-etcd/etcd"
13+
"github.com/deis/deisctl/client"
14+
)
15+
16+
func getTunnelFlag() string {
17+
tun := client.Flags.Tunnel
18+
if tun != "" && !strings.Contains(tun, ":") {
19+
tun += ":22"
20+
}
21+
return tun
22+
}
23+
24+
func getChecker() *ssh.HostKeyChecker {
25+
if !client.Flags.StrictHostKeyChecking {
26+
return nil
27+
}
28+
keyFile := ssh.NewHostKeyFile(client.Flags.KnownHostsFile)
29+
return ssh.NewHostKeyChecker(keyFile)
30+
}
31+
32+
type etcdClient struct {
33+
etcd *etcd.Client
34+
}
35+
36+
func (c *etcdClient) Get(key string) (string, error) {
37+
sort, recursive := true, false
38+
resp, err := c.etcd.Get(key, sort, recursive)
39+
if err != nil {
40+
return "", err
41+
}
42+
return resp.Node.Value, nil
43+
}
44+
45+
func (c *etcdClient) Set(key string, value string) (string, error) {
46+
resp, err := c.etcd.Set(key, value, 0) // don't use TTLs
47+
if err != nil {
48+
return "", err
49+
}
50+
return resp.Node.Value, nil
51+
}
52+
53+
func getEtcdClient() (*etcdClient, error) {
54+
var dial func(string, string) (net.Conn, error)
55+
tun := getTunnelFlag()
56+
if tun != "" {
57+
sshClient, err := ssh.NewSSHClient("core", tun, getChecker(), false)
58+
if err != nil {
59+
return nil, fmt.Errorf("failed initializing SSH client: %v", err)
60+
}
61+
62+
dial = func(network, addr string) (net.Conn, error) {
63+
tcpaddr, err := net.ResolveTCPAddr(network, addr)
64+
if err != nil {
65+
return nil, err
66+
}
67+
return sshClient.DialTCP(network, nil, tcpaddr)
68+
}
69+
}
70+
71+
tlsConfig, err := fleetEtcd.ReadTLSConfigFiles(client.Flags.EtcdCAFile,
72+
client.Flags.EtcdCertFile, client.Flags.EtcdKeyFile)
73+
if err != nil {
74+
return nil, err
75+
}
76+
77+
trans := http.Transport{
78+
Dial: dial,
79+
TLSClientConfig: tlsConfig,
80+
}
81+
82+
timeout := time.Duration(client.Flags.RequestTimeout*1000) * time.Millisecond
83+
machines := []string{client.Flags.Endpoint}
84+
85+
c := etcd.NewClient(machines)
86+
c.SetDialTimeout(timeout)
87+
88+
// use custom transport with SSH tunnel capability
89+
c.SetTransport(&trans)
90+
91+
return &etcdClient{etcd: c}, nil
92+
}

deisctl.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ Options:
104104
err = cmd.Install(c, targets)
105105
case "uninstall":
106106
err = cmd.Uninstall(c, targets)
107+
case "config":
108+
err = cmd.Config()
107109
case "update":
108110
err = cmd.Update()
109111
default:

0 commit comments

Comments
 (0)