Merge 1cfb743 into d8734fe

Gopkg.toml

@@ -38,3 +38,7 @@
 [[constraint]]
   name = "github.com/gorilla/websocket"
   version = "1.2.0"
+
+[[constraint]]
+  name = "github.com/aws/aws-sdk-go"
+  version = "1.14.10"

Makefile

@@ -30,12 +30,12 @@ dev-deps:
 
 # Install Inertia with release version
 .PHONY: cli
-inertia:
+cli:
 	go install -ldflags "-X main.Version=$(RELEASE)"
 
 # Install Inertia with git tag as release version
 .PHONY: cli-tagged
-inertia-tagged:
+cli-tagged:
 	go install -ldflags "-X main.Version=$(TAG)"
 
 # Remove Inertia binaries

client/scripts/docker.sh

@@ -7,8 +7,21 @@ set -e
 DOCKER_SOURCE=get.docker.com
 DOCKER_DEST='/tmp/get-docker.sh'
 
+startDockerd() {
+    # Start dockerd if it is not online
+    if ! sudo docker stats --no-stream ; then
+        sudo service docker start
+        # Poll until dockerd is running
+        while ! sudo docker stats --no-stream ; do
+            echo "Waiting for dockerd to launch..."
+            sleep 1
+        done
+    fi
+}
+
 # Skip installation if Docker is already installed.
 if hash docker 2>/dev/null; then
+    startDockerd
     exit 0
 fi;
 
@@ -40,4 +53,4 @@ else
     fi
 fi
 
-sudo service docker start
+startDockerd

common/util.go

@@ -6,6 +6,8 @@ import (
 	"io"
 	"os"
 	"path/filepath"
+	"strconv"
+	"time"
 )
 
 // GetFullPath returns the absolute path of the config file.
@@ -70,3 +72,19 @@ func RemoveContents(directory string) error {
 	}
 	return nil
 }
+
+// ParseDate parses a date in format "2006-01-02T15:04:05.000Z"
+func ParseDate(dateString string) *time.Time {
+	layout := "2006-01-02T15:04:05.000Z"
+	t, _ := time.Parse(layout, dateString)
+	return &t
+}
+
+// ParseInt64 parses a string into an int64 value
+func ParseInt64(value string) (int64, error) {
+	i, err := strconv.ParseInt(value, 10, 64)
+	if err != nil {
+		return 0, err
+	}
+	return i, nil
+}

common/util_test.go

@@ -86,3 +86,16 @@ func TestExtract(t *testing.T) {
 	repoNameWithMixed := ExtractRepository("git@github.com:ubclaunchpad/inertia-deploy.test.git")
 	assert.Equal(t, "ubclaunchpad/inertia-deploy.test", repoNameWithMixed)
 }
+
+func TestParseDate(t *testing.T) {
+	assert.NotNil(t, ParseDate("2006-01-02T15:04:05.000Z"))
+}
+
+func TestParseInt64(t *testing.T) {
+	parsed, err := ParseInt64("10")
+	assert.Nil(t, err)
+	assert.Equal(t, int64(10), parsed)
+
+	_, err = ParseInt64("")
+	assert.NotNil(t, err)
+}

input.go

@@ -12,6 +12,8 @@ import (
 )
 
 var (
+	errInvalidInput = errors.New("invalid input")
+
 	errInvalidUser          = errors.New("invalid user")
 	errInvalidAddress       = errors.New("invalid IP address")
 	errInvalidBuildType     = errors.New("invalid build type")
@@ -114,3 +116,49 @@ func addProjectWalkthrough(in io.Reader) (buildType string, buildFilePath string
 	}
 	return
 }
+
+func enterEC2CredentialsWalkthrough(in io.Reader) (id, key string, err error) {
+	print(`To get your credentials:
+	1. Open the IAM console (https://console.aws.amazon.com/iam/home?#home).
+	2. In the navigation pane of the console, choose Users. You may have to create a user.
+	3. Choose your IAM user name (not the check box).
+	4. Choose the Security credentials tab and then choose Create access key.
+	5. To see the new access key, choose Show. Your credentials will look something like this:
+
+		Access key ID: AKIAIOSFODNN7EXAMPLE
+		Secret access key: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
+	`)
+
+	var response string
+
+	print("\nKey ID:       ")
+	_, err = fmt.Fscanln(in, &response)
+	if err != nil {
+		return
+	}
+	id = response
+
+	print("\nAccess Key:   ")
+	_, err = fmt.Fscanln(in, &response)
+	if err != nil {
+		return
+	}
+	key = response
+	return
+}
+
+func chooseFromListWalkthrough(in io.Reader, optionName string, options []string) (string, error) {
+	fmt.Printf("Available %ss:\n", optionName)
+	for _, o := range options {
+		println("  > " + o)
+	}
+	fmt.Printf("Please enter your desired %s: ", optionName)
+
+	var response string
+	_, err := fmt.Fscanln(in, &response)
+	if err != nil {
+		return "", errInvalidInput
+	}
+
+	return response, nil
+}

local/storage.go

@@ -109,3 +109,8 @@ func GetClient(name, relPath string, cmd ...*cobra.Command) (*client.Client, err
 
 	return client, nil
 }
+
+// SaveKey writes a key to given path
+func SaveKey(keyMaterial string, path string) error {
+	return ioutil.WriteFile(path, []byte(keyMaterial), 0644)
+}

local/storage_test.go

@@ -1,7 +1,9 @@
 package local
 
 import (
+	"io/ioutil"
 	"os"
+	"path"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -72,3 +74,48 @@ func TestConfigCreateAndWriteAndRead(t *testing.T) {
 	err = os.Remove(configPath)
 	assert.Nil(t, err)
 }
+
+func TestSaveKey(t *testing.T) {
+	keyMaterial := `-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAw+14SQTAidfYPDizCYPv0gWq4+wFeInCrZGo4BFbMcP7xhH+
+htmm0qx7ctYbCS0tQmCvCnt4W5jwhqH9v65/b1PWv1qQbXbJq0iyeSspgpaB8xq+
+AkWoBkUOT8iaUzESDgJfEpC9q1s7dAUpmRDD0JMVzdsv1VQqpR22VWtnpcFtAkNk
+3CIXiKFYJ5677dVSrc45dhO4R67LguSPxpXNRcg26/cFKWQO+y2StnYVEEUtvoWN
+z2tGQu2hftJtjzzCFXckH8VTJ8EgX0+3Co5jXEbm1idFGFgcAP1WT3xuGh+wpCXM
+LYVdF18VxGzZe0bxStZ/+bhsaYfFLyU8qL7RnQIDAQABAoIBAFELWLczjQU30I1Q
+ktZ7yebhS0gOaFDtAydS2j0dUNCsFehfpx5Wx8fbaxEceYB5PIB5h85ZNncFM3Et
+bs4sOzBsyKbMqnNtMIx2fMTcUsZexZAu3qwH7jHxvLLJ8vQ4lxRObM88KgjIqzYZ
+sJRNOAJ95QYLBaVDtIQqXzLEQ9JvDnB5++i18eIF31UXbcjvhNn4M2Goku2EZ9T8
+ny0KnRDh9W/Is6ndsBGkDEbXFVMCs6ubIeL7LdJ1W/QNK4HB3ZeRWHMR+lElp+o5
+4BY+5bQN7RrTPQmzU0lD1UAIOuPNQeUiGQs4jsV4Oz21z6AWMgg/qAjn91LaWcCH
+JnDv++ECgYEA/zJbzNhxF7Kk64U1//XWhtZ3EdlbiapLq26Z10emtED9FrPJxGCz
++fDR2BwWUEpZDY3TBMmjeQeO+VN++PYGMjFogZIKNIuOhu2Qs7u92nCLyeB1aeTm
+h90/5II64qCy5KN2fvU6Q2cxNNrCs0Dchh1GYYCH7+IR5NkelTQWRuUCgYEAxItZ
+8JYoxfegJmK3RpzYWrbuK2tP7msA9VNSbzMdgFpLG9I+bSJPuQfdOfnhfZG/YG40
+MBpUH1X9Jn06Ie6YsbQTeEWUY4H5RKdNKSyyJYepw6C/ndRCuInGPaqQ6FSfccld
+mwB3ziaIZVjSaaLGpDFaSgosW4a8hDBbe+4wvFkCgYEAhfGKmWPpSATt5uhORYBl
+DvS2Hlo1X3ZQrTQp7wKejvGlZSsMddRD4qXxnjpvw8iiISkVXufus3GyK08Vz9ph
+uiqQraFXVekB7/P1BUE/Ds4PsO/s8J3CGgGYrXllKtopyzO42D4iTIp3G0TO+ILM
+vF/VNwvdTZ0cwz7qfGmQX7kCgYAJqOOpvGeSm0IGwPFLCihkBPudrK+IA0BPzmGN
+z5BSn51zZ5jj2jza1jUcRVi8yC4EukXcW17pD1vayWrTAhwFF9mhHqJVZazvn91d
++bFjwNAqKjtgsW76DONuYnSuxoHzoLb2CEbbHe+0M3Jb+MEUjsxmOSvG789SG+JT
+K/i/OQKBgQD3rq8dDSVYaLcSFwg9RfRKF+Ahtml86lm4FrfZlLEfwb6TaR/Unsh0
+XF56ZdrKh0nbOW/125RSc8STCv5klDGnBCD56Qzbin9+W6j1TWyJFMdNeaxjWK+U
+lq07qdr3cY+O1F4otlDitNuhLE88dtGJM5lEyumokiH1yXwhbBtZ4w==
+-----END RSA PRIVATE KEY-----`
+	cwd, _ := os.Getwd()
+	testKeyPath := path.Join(cwd, "test_key_save")
+
+	// Write
+	err := SaveKey(keyMaterial, testKeyPath)
+	assert.Nil(t, err)
+
+	// Read
+	bytes, err := ioutil.ReadFile(testKeyPath)
+	assert.Nil(t, err)
+	assert.Equal(t, keyMaterial, string(bytes))
+
+	// Test config remove
+	err = os.Remove(testKeyPath)
+	assert.Nil(t, err)
+}