[ARVADOS] updated: 1.2.0-48-g2e609dce2

[Git user]

Summary of changes:
 lib/dispatchcloud/azure.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

       via  2e609dce27fc6b9f39857cf7b0a9904719d2d526 (commit)
      from  095e617ddb49c9e42637d037b2378aa4e1d52fb6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 2e609dce27fc6b9f39857cf7b0a9904719d2d526
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Aug 31 16:41:07 2018 -0400

    13964: Fail on missing node-token tag
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/lib/dispatchcloud/azure.go b/lib/dispatchcloud/azure.go
index 32b81321a..92970d1de 100644
--- a/lib/dispatchcloud/azure.go
+++ b/lib/dispatchcloud/azure.go
@@ -605,6 +605,11 @@ func (ai *AzureInstance) VerifyPublicKey(ctx context.Context, receivedKey ssh.Pu
 		}
 	}
 
+	nodetokenTag := tags["node-token"]
+	if nodetokenTag == "" {
+		return fmt.Errorf("Missing node token tag")
+	}
+
 	sess, err := client.NewSession()
 	if err != nil {
 		return err
@@ -617,7 +622,7 @@ func (ai *AzureInstance) VerifyPublicKey(ctx context.Context, receivedKey ssh.Pu
 
 	nodetoken := strings.TrimSpace(string(nodetokenbytes))
 
-	expectedToken := fmt.Sprintf("%s-%s", *ai.vm.Name, tags["node-token"])
+	expectedToken := fmt.Sprintf("%s-%s", *ai.vm.Name, nodetokenTag)
 	log.Printf("%q %q", nodetoken, expectedToken)
 
 	if strings.TrimSpace(nodetoken) != expectedToken {

-----------------------------------------------------------------------


hooks/post-receive
--