Added key-pair feature

Author: joeyism

README.md

@@ -42,11 +42,14 @@ Launching spot states sir-123abcde
 If you don't want to enter the CLI prompt every time, you can run the CLI with the options
 
 ```bash
-spotme --InstanceType=t2.micro --SpotPrice=0.006 --InstanceCount=1 --AvailabilityZone=ca-central-1a --LaunchImageId=ami-d29e25b6 --SecurityGroup=sg-123abcd
+spotme --InstanceType=t2.micro --SpotPrice=0.006 --InstanceCount=1 --AvailabilityZone=ca-central-1a --LaunchImageId=ami-d29e25b6 --SecurityGroup=sg-123abcd --KeyName=yourkeypair
 
 ```
 
 ## Version
+* **1.2.0**
+    * Added Key-pair name
+
 * **1.1.0**
     * Added customization security group
 

README.rst

@@ -63,11 +63,15 @@ CLI with the options
 
 .. code:: bash
 
-    spotme --InstanceType=t2.micro --SpotPrice=0.006 --InstanceCount=1 --AvailabilityZone=ca-central-1a --LaunchImageId=ami-d29e25b6 --SecurityGroup=sg-123abcd
+    spotme --InstanceType=t2.micro --SpotPrice=0.006 --InstanceCount=1 --AvailabilityZone=ca-central-1a --LaunchImageId=ami-d29e25b6 --SecurityGroup=sg-123abcd --KeyName=yourkeypair
 
 Version
 -------
 
+-  **1.2.0**
+
+   -  Added Key-pair name
+
 -  **1.1.0**
 
    -  Added customization security group

setup.py

@@ -7,7 +7,7 @@
 from setuptools import setup
 
 
-version = "1.1.1"
+version = "1.2.0"
 
 with open("README.rst", "rb") as f:
     long_descr = f.read().decode("utf-8")

spotme/spotme.py

@@ -20,6 +20,8 @@
 g["availabilityzone"] = client.describe_availability_zones()["AvailabilityZones"][0]["ZoneName"]
 security_groups = client.describe_security_groups()["SecurityGroups"]
 security_groups = [(group["GroupId"], group["GroupName"]) for group in security_groups]
+keynames = client.describe_key_pairs()["KeyPairs"]
+keynames = [kp["KeyName"] for kp in keynames]
 
 def get_spot_instance_id(response):
     ids = []
@@ -71,7 +73,13 @@ def print_urls(urls):
         default=d.get("securitygroup", security_groups[0][0]),
         help="Security Group to put the spot instance"
         )
-def main(instancetype, spotprice, instancecount, availabilityzone, launchimageid, securitygroup):
+@click.option(
+        "--KeyName", 
+        prompt="Key-Pair Name, pick from:\n\t" + "\n\t".join([kp for kp in keynames]) +"\nDefault is",
+        default=d.get("keyname", keynames[0]),
+        help="Key-Pair Name for the spot instance"
+        )
+def main(instancetype, spotprice, instancecount, availabilityzone, launchimageid, securitygroup, keyname):
     interval = 3
     client = boto3.client("ec2")
     response = client.request_spot_instances(
@@ -83,7 +91,8 @@ def main(instancetype, spotprice, instancecount, availabilityzone, launchimageid
                         "AvailabilityZone": availabilityzone
                         },
                     "InstanceType": instancetype,
-                    "SecurityGroupIds": [securitygroup]
+                    "SecurityGroupIds": [securitygroup],
+                    "KeyName": keyname
                 }
             )
     pending_spot_ids = get_spot_instance_id(response)