Update for new godo library

.gitignore

@@ -1,4 +1,4 @@
 dospin.json
-test_config.json
+test_config.yaml
 dospin
 main

dospin.go

@@ -27,7 +27,7 @@ type cmdOptions struct {
 func parseCmdOptions() cmdOptions {
 	var o cmdOptions
 	flag.StringVar(&o.cmd, "cmd", CMD_SERVE, "Mode to run command in ("+CMD_SERVE+","+CMD_SPINDOWNALL+")")
-	flag.StringVar(&o.config, "config", "dospin.json", "Path to the dospin config file")
+	flag.StringVar(&o.config, "config", "dospin.yaml", "Path to the dospin config file")
 	flag.StringVar(&o.logFile, "logFile", "stdout", "Path to the dospin log file")
 	flag.Parse()
 	return o
@@ -47,7 +47,7 @@ func spindownAll(opts cmdOptions) {
 	}
 }
 
-func runServer(opts cmdOptions) {
+func runServer(opts cmdOptions) int {
 	if opts.logFile != "stdout" {
 		logFile, err := os.OpenFile(opts.logFile, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0664)
 		if err == nil {
@@ -78,8 +78,8 @@ func runServer(opts cmdOptions) {
 		}
 	}
 
-	done := make(chan interface{})
-	<-done
+	done := make(chan int)
+	return <-done
 }
 
 func main() {

dospin.json

@@ -1,20 +0,0 @@
-{
-	"ApiToken": "<your token here>",
-	"Servers": {
-		"minecraft": {
-			"Ports": [25565],
-			"UsePublicIP": false,
-			"InitialSize": "4gb",
-			"Size": "4gb",
-			"Region": "nyc1",
-			"SshKeys": [
-				"Key1",
-				"gtalent2@gmail.com"
-			],
-			"UsePersistentImage": false,
-			"ImageSlug": "ubuntu-16-04-x64",
-			"Volumes": ["volume-nyc1-01"],
-			"UserData": "#!/bin/bash\napt-get update\napt-get install -y docker.io\nmkdir -p /mnt/volume-nyc1-01\nmount -o discard,defaults /dev/disk/by-id/scsi-0DO_Volume_volume-nyc1-01 /mnt/volume-nyc1-01\necho /dev/disk/by-id/scsi-0DO_Volume_volume-nyc1-01 /mnt/volume-nyc1-01 ext4 defaults,nofail,discard 0 0 | tee -a /etc/fstab\ndocker run -d --restart=always -p 25565:25565 -v /mnt/volume-nyc1-01/minecraft-server:/minecraft-server -w /minecraft-server -t java:8-alpine sh start.sh"
-		}
-	}
-}

dospin.yaml

@@ -0,0 +1,26 @@
+---
+api_token: <your token here>
+servers:
+  minecraft:
+    ports:
+    - 25565
+    activity_timeout_min: 20m
+    use_public_ip: false
+    initial_size: 4gb
+    size: 4gb
+    region: nyc1
+    ssh_keys:
+    - Key1
+    - gtalent2@gmail.com
+    use_persistent_image: false
+    image_slug: ubuntu-16-04-x64
+    volumes:
+    - volume-nyc1-01
+    user_data: |-
+      #!/bin/bash
+      apt-get update
+      apt-get install -y docker.io
+      mkdir -p /mnt/volume-nyc1-01
+      mount -o discard,defaults /dev/disk/by-id/scsi-0DO_Volume_volume-nyc1-01 /mnt/volume-nyc1-01
+      echo /dev/disk/by-id/scsi-0DO_Volume_volume-nyc1-01 /mnt/volume-nyc1-01 ext4 defaults,nofail,discard 0 0 | tee -a /etc/fstab
+      docker run -d --restart=always -p 25565:25565 -v /mnt/volume-nyc1-01/minecraft-server:/minecraft-server -w /minecraft-server -t java:8-alpine sh start.sh

droplethandler.go

@@ -8,6 +8,7 @@
 package main
 
 import (
+	"context"
 	"errors"
 	"github.com/digitalocean/godo"
 	"golang.org/x/oauth2"
@@ -30,12 +31,14 @@ func (t *tokenSource) Token() (*oauth2.Token, error) {
 
 type DropletHandler struct {
 	client   *godo.Client
+	ctx      context.Context
 	settings Settings
 }
 
 func NewDropletHandler(settings Settings) *DropletHandler {
 	retval := new(DropletHandler)
 	retval.settings = settings
+	retval.ctx = context.TODO()
 
 	// setup DO client
 	tokenSource := &tokenSource{settings.ApiToken}
@@ -94,7 +97,7 @@ func (me *DropletHandler) Spinup(name string) (string, error) {
 		}
 
 		log.Println("Spinup: Creating " + name)
-		droplet, _, err := me.client.Droplets.Create(createRequest)
+		droplet, _, err := me.client.Droplets.Create(me.ctx, createRequest)
 		if err != nil {
 			log.Println(err)
 			if droplet == nil {
@@ -103,7 +106,7 @@ func (me *DropletHandler) Spinup(name string) (string, error) {
 		}
 		// wait until machine is ready
 		for {
-			d, _, err := me.client.Droplets.Get(droplet.ID)
+			d, _, err := me.client.Droplets.Get(me.ctx, droplet.ID)
 			if err != nil {
 				log.Println(err)
 				return "", err
@@ -121,7 +124,7 @@ func (me *DropletHandler) Spinup(name string) (string, error) {
 
 			// resize
 			log.Println("Spinup: Resizing " + name)
-			action, _, err := me.client.DropletActions.Resize(droplet.ID, vd.Size, false)
+			action, _, err := me.client.DropletActions.Resize(me.ctx, droplet.ID, vd.Size, false)
 			if err != nil || !me.actionWait(action.ID) {
 				return "", err
 			}
@@ -129,7 +132,7 @@ func (me *DropletHandler) Spinup(name string) (string, error) {
 
 			// power back on
 			log.Println("Spinup: Powering on " + name)
-			action, _, err = me.client.DropletActions.PowerOn(droplet.ID)
+			action, _, err = me.client.DropletActions.PowerOn(me.ctx, droplet.ID)
 			if err != nil || !me.actionWait(action.ID) {
 				return "", err
 			}
@@ -139,7 +142,7 @@ func (me *DropletHandler) Spinup(name string) (string, error) {
 		// delete the image
 		if image.ID > 0 {
 			log.Println("Spinup: Deleting image " + name)
-			_, err = me.client.Images.Delete(image.ID)
+			_, err = me.client.Images.Delete(me.ctx, image.ID)
 			if err != nil {
 				log.Println("Spinup: Could not delete image: ", err)
 			} else {
@@ -150,7 +153,7 @@ func (me *DropletHandler) Spinup(name string) (string, error) {
 		// get the private IP and return it
 
 		// get new copy of droplet that has IP
-		droplet, _, err = me.client.Droplets.Get(droplet.ID)
+		droplet, _, err = me.client.Droplets.Get(me.ctx, droplet.ID)
 		if err == nil {
 			if vd.UsePublicIP {
 				return droplet.PublicIPv4()
@@ -179,7 +182,7 @@ func (me *DropletHandler) Spindown(name string) error {
 	// snapshot existing droplet
 	if me.settings.Servers[name].UsePersistentImage {
 		log.Println("Spindown: Creating image " + name)
-		action, _, err := me.client.DropletActions.Snapshot(droplet.ID, DROPLET_NS+name)
+		action, _, err := me.client.DropletActions.Snapshot(me.ctx, droplet.ID, DROPLET_NS+name)
 		if err != nil || !me.actionWait(action.ID) {
 			return err
 		}
@@ -188,7 +191,7 @@ func (me *DropletHandler) Spindown(name string) error {
 
 	// delete droplet
 	log.Println("Spindown: Deleting droplet " + name)
-	_, err = me.client.Droplets.Delete(droplet.ID)
+	_, err = me.client.Droplets.Delete(me.ctx, droplet.ID)
 	if err != nil {
 		return err
 	}
@@ -216,7 +219,7 @@ func (me *DropletHandler) poweroff(name string) error {
 				break
 			}
 			time.Sleep(100 * time.Millisecond)
-			_, _, err = me.client.DropletActions.Shutdown(droplet.ID)
+			_, _, err = me.client.DropletActions.Shutdown(me.ctx, droplet.ID)
 			if err != nil {
 				log.Println("Power down of", name, "failed:", err)
 			}
@@ -238,7 +241,7 @@ func (me *DropletHandler) getDroplet(name string) (godo.Droplet, error) {
 			Page:    page,
 			PerPage: perPage,
 		}
-		images, _, err := me.client.Droplets.List(opt)
+		images, _, err := me.client.Droplets.List(me.ctx, opt)
 		if err != nil {
 			break
 		}
@@ -270,7 +273,7 @@ func (me *DropletHandler) getSnapshot(name string) (godo.Image, error) {
 			Page:    page,
 			PerPage: perPage,
 		}
-		images, _, err := me.client.Images.ListUser(opt)
+		images, _, err := me.client.Images.ListUser(me.ctx, opt)
 		if err != nil {
 			break
 		}
@@ -293,7 +296,7 @@ func (me *DropletHandler) getSnapshot(name string) (godo.Image, error) {
 
 func (me *DropletHandler) actionWait(actionId int) bool {
 	for {
-		a, _, err := me.client.Actions.Get(actionId)
+		a, _, err := me.client.Actions.Get(me.ctx, actionId)
 		if err != nil {
 			log.Println("Action retrieval failed: ", err)
 		} else if a.Status == "completed" {
@@ -317,7 +320,7 @@ func (me *DropletHandler) sshKeys(keyNames []string) []godo.DropletCreateSSHKey
 			Page:    page,
 			PerPage: perPage,
 		}
-		keys, _, err := me.client.Keys.List(opt)
+		keys, _, err := me.client.Keys.List(me.ctx, opt)
 		if err != nil {
 			break
 		}

scripts/list_droplets.sh

@@ -1,2 +0,0 @@
-#! /usr/bin/env sh
-curl -X GET -H "Content-Type: application/json" -H "Authorization: Bearer `cat dospin.json | jq -r .ApiToken`" "https://api.digitalocean.com/v2/droplets?page=1&per_page=100&private=true" | jq .

scripts/list_images.sh

@@ -1,2 +0,0 @@
-#! /usr/bin/env sh
-curl -X GET -H "Content-Type: application/json" -H "Authorization: Bearer `cat dospin.json | jq -r .ApiToken`" "https://api.digitalocean.com/v2/images?page=1&per_page=100&private=true" | jq .

scripts/list_keys.sh

@@ -1,4 +0,0 @@
-#! /usr/bin/env sh
-
-echo Keys
-curl -X GET -H "Content-Type: application/json" -H "Authorization: Bearer `cat dospin.json | jq -r .ApiToken`" "https://api.digitalocean.com/v2/account/keys" | jq .

scripts/list_volumes.sh

@@ -1,4 +0,0 @@
-#! /usr/bin/env sh
-
-echo Volumes
-curl -X GET -H "Content-Type: application/json" -H "Authorization: Bearer `cat dospin.json | jq -r .ApiToken`" "https://api.digitalocean.com/v2/volumes" | jq .

servermanager.go

@@ -39,6 +39,7 @@ type ServerManager struct {
 	connStatus        chan ConnStatus
 	lastKeepAliveTime time.Time
 	server            ServerHandler
+	activityTimeout   time.Duration
 }
 
 func NewServerManager(name string, server ServerHandler, settings Settings) *ServerManager {
@@ -52,6 +53,13 @@ func NewServerManager(name string, server ServerHandler, settings Settings) *Ser
 	sm.server = server
 	sm.lastKeepAliveTime = time.Now()
 
+	activityTimeout, err := time.ParseDuration(settings.Servers[sm.name].ActivityTimeout)
+	if err != nil { // invalid timeout, default to 5 minutes
+		activityTimeout = time.Duration(5 * time.Minute)
+	}
+	sm.activityTimeout = activityTimeout
+	log.Println("ServerManager: ", name, " has activity timeout of ", sm.activityTimeout.String())
+
 	return sm
 }
 
@@ -61,8 +69,7 @@ func NewServerManager(name string, server ServerHandler, settings Settings) *Ser
 func (me *ServerManager) Serve() {
 	// TODO: see if server is currently up, and setup port forwarding if so
 
-	activityTimeout := time.Duration(5 * time.Minute)
-	ticker := time.NewTicker(activityTimeout)
+	ticker := time.NewTicker(1 * time.Minute)
 
 	// event loop
 	for running := true; running; {
@@ -74,7 +81,7 @@ func (me *ServerManager) Serve() {
 		case action := <-me.in:
 			running = me.serveAction(action)
 		case <-ticker.C:
-			if time.Since(me.lastKeepAliveTime) > activityTimeout {
+			if time.Since(me.lastKeepAliveTime) > me.activityTimeout {
 				running = me.serveAction(serverManagerEvent{eventType: SERVERMANAGER_SPINDOWN})
 			}
 		}

settings.go

@@ -8,26 +8,27 @@
 package main
 
 import (
-	"encoding/json"
+	"gopkg.in/yaml.v2"
 	"io/ioutil"
 )
 
 type Settings struct {
-	ApiToken string
-	Servers  map[string]Server
+	ApiToken string            `yaml:"api_token"`
+	Servers  map[string]Server `yaml:"servers"`
 }
 
 type Server struct {
-	Ports              []int
-	UsePublicIP        bool
-	InitialSize        string
-	Size               string
-	Region             string
-	UsePersistentImage bool
-	ImageSlug          string
-	UserData           string
-	SshKeys            []string
-	Volumes            []string
+	Ports              []int    `yaml:"ports"`
+	ActivityTimeout    string   `yaml:"activity_timeout"`
+	UsePublicIP        bool     `yaml:"use_public_ip"`
+	InitialSize        string   `yaml:"initial_size"`
+	Size               string   `yaml:"size"`
+	Region             string   `yaml:"region"`
+	UsePersistentImage bool     `yaml:"use_persistent_image"`
+	ImageSlug          string   `yaml:"image_slug"`
+	UserData           string   `yaml:"user_data"`
+	SshKeys            []string `yaml:"ssh_keys"`
+	Volumes            []string `yaml:"volumes"`
 }
 
 func loadSettings(path string) (Settings, error) {
@@ -37,7 +38,7 @@ func loadSettings(path string) (Settings, error) {
 		return s, err
 	}
 
-	err = json.Unmarshal(data, &s)
+	err = yaml.Unmarshal(data, &s)
 	if err != nil {
 		return s, err
 	}