From 4db6d54490dd0d70858ea5e22b81e044796102b0 Mon Sep 17 00:00:00 2001 From: Josef Norgan Date: Mon, 11 Apr 2016 12:47:19 -0700 Subject: [PATCH 1/2] Added convenience script for updating default_userdata.sh --- command/create.go | 2 ++ scripts/userdata-update | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100755 scripts/userdata-update diff --git a/command/create.go b/command/create.go index 5a10200..2f9bc03 100644 --- a/command/create.go +++ b/command/create.go @@ -31,6 +31,8 @@ type suripuApp struct { } //This hash should be updated anytime default_userdata.sh is updated on S3 +// Update using the provided script `sanders/scripts/userdata-update` or manually use `openssl sha1 ` + var expectedUserDataHash = "78c2b582d19f302b956ddae0c30086a00abf2f1f" var suripuApps []suripuApp = []suripuApp{ diff --git a/scripts/userdata-update b/scripts/userdata-update new file mode 100755 index 0000000..845b86a --- /dev/null +++ b/scripts/userdata-update @@ -0,0 +1,20 @@ +#!/bin/bash + +echo $GOPATH +src_path="${GOPATH}src/github.com/hello/sanders/" +userdata="${src_path}resources/default_userdata.sh" +create_cmd="${src_path}command/create.go" +sha=$(openssl sha1 $userdata | awk '{print $2}') +echo $sha +search='^var\\ expectedUser.*' +replace="var\\ expectedUserDataHash\\ =\\ \\\"$sha\\\"" +sub=$(sed -e "s/^var\ expectedUser.*/var\ expectedUserDataHash\ =\ \"$sha\"/" $create_cmd > temp) +mv temp $create_cmd + +#Upload default_userdata.sh to S3 +aws s3 cp $userdata s3://hello-deploy/userdata/ + +if [[ "$?" -ne 0 ]]; then + err "Failed to upload userdata" + exit 1 +fi From 227b734db3f89f4601fb54c14dfa2bdf5221254d Mon Sep 17 00:00:00 2001 From: Josef Norgan Date: Mon, 11 Apr 2016 13:51:20 -0700 Subject: [PATCH 2/2] Removing unused variable --- scripts/userdata-update | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/userdata-update b/scripts/userdata-update index 845b86a..daaf043 100755 --- a/scripts/userdata-update +++ b/scripts/userdata-update @@ -5,9 +5,6 @@ src_path="${GOPATH}src/github.com/hello/sanders/" userdata="${src_path}resources/default_userdata.sh" create_cmd="${src_path}command/create.go" sha=$(openssl sha1 $userdata | awk '{print $2}') -echo $sha -search='^var\\ expectedUser.*' -replace="var\\ expectedUserDataHash\\ =\\ \\\"$sha\\\"" sub=$(sed -e "s/^var\ expectedUser.*/var\ expectedUserDataHash\ =\ \"$sha\"/" $create_cmd > temp) mv temp $create_cmd