14291: Report errors from ImportKeyPair

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/lib/cloud/ec2/ec2.go b/lib/cloud/ec2/ec2.go
index 1dd398db9f3a263c5008b7ddba76f3a953a3ce98..35153b3ff8fd015f43ee45d29a97bd9b38cd1473 100644 (file)
--- a/lib/cloud/ec2/ec2.go
+++ b/lib/cloud/ec2/ec2.go
@@ -87,10 +87,13 @@ func (instanceSet *ec2InstanceSet) Create(
        var ok bool
        if keyname, ok = instanceSet.keys[keyFingerprint]; !ok {
                keyname = "arvados-dispatch-keypair-" + keyFingerprint
-               instanceSet.client.ImportKeyPair(&ec2.ImportKeyPairInput{
+               _, err := instanceSet.client.ImportKeyPair(&ec2.ImportKeyPairInput{
                        KeyName:           &keyname,
                        PublicKeyMaterial: ssh.MarshalAuthorizedKey(publicKey),
                })
+               if err != nil {
+                       return nil, fmt.Errorf("Could not import keypair: %v", err)
+               }
                instanceSet.keys[keyFingerprint] = keyname
        }
        instanceSet.keysMtx.Unlock()