Properly pass through distro usernames, don't assume ubuntu. (canonical#302)

Currently azure and ec2 assume username "ubuntu", which breaks other
distributions using pycloudlib. Fix it.

Author: holmanb

VERSION

@@ -1 +1 @@
-1!2.1.1
+1!2.1.2

pycloudlib/azure/cloud.py

@@ -71,6 +71,7 @@ def __init__(
         subscription_id: Optional[str] = None,
         tenant_id: Optional[str] = None,
         region: Optional[str] = None,
+        username: Optional[str] = None,
     ):
         """Initialize the connection to Azure.
 
@@ -103,7 +104,7 @@ def __init__(
 
         self._log.debug("logging into Azure")
         self.location = region or self.config.get("region") or "centralus"
-        self.username = "ubuntu"
+        self.username = username or "ubuntu"
 
         self.registered_instances: Dict[str, AzureInstance] = {}
         self.registered_images: Dict[str, dict] = {}
@@ -588,6 +589,7 @@ def launch(
         wait=True,
         name=None,
         inbound_ports=None,
+        username=None,
         **kwargs,
     ):
         """Launch virtual machine on Azure.
@@ -693,6 +695,7 @@ def launch(
             key_pair=self.key_pair,
             client=self.compute_client,
             instance=instance_info,
+            username=username,
         )
 
         if wait:

pycloudlib/azure/instance.py

@@ -12,15 +12,15 @@ class AzureInstance(BaseInstance):
 
     _type = "azure"
 
-    def __init__(self, key_pair, client, instance):
+    def __init__(self, key_pair, client, instance, username=None):
         """Set up instance.
 
         Args:
             key_pair: SSH key object
             client: Azure compute management client
             instance: created azure instance object
         """
-        super().__init__(key_pair)
+        super().__init__(key_pair, username=username)
 
         self._client = client
         self._instance = instance

pycloudlib/ec2/cloud.py

@@ -306,6 +306,7 @@ def launch(
         user_data=None,
         wait=True,
         vpc=None,
+        username=None,
         **kwargs,
     ):
         """Launch instance on EC2.
@@ -362,7 +363,9 @@ def launch(
 
         self._log.debug("launching instance")
         instances = self.resource.create_instances(**args)
-        instance = EC2Instance(self.key_pair, self.client, instances[0])
+        instance = EC2Instance(
+            self.key_pair, self.client, instances[0], username=username
+        )
 
         if wait:
             instance.wait()

pycloudlib/ec2/instance.py

@@ -14,15 +14,15 @@ class EC2Instance(BaseInstance):
 
     _type = "ec2"
 
-    def __init__(self, key_pair, client, instance):
+    def __init__(self, key_pair, client, instance, username=None):
         """Set up instance.
 
         Args:
             key_pair: SSH key object
             client: boto3 client object
             instance: created boto3 instance object
         """
-        super().__init__(key_pair)
+        super().__init__(key_pair, username)
 
         self._instance = instance
         self._ip = None

pycloudlib/instance.py

@@ -6,6 +6,7 @@
 import time
 from abc import ABC, abstractmethod
 from contextlib import suppress
+from typing import Optional
 
 import paramiko
 from paramiko.ssh_exception import (
@@ -26,7 +27,7 @@ class BaseInstance(ABC):
 
     _type = "base"
 
-    def __init__(self, key_pair):
+    def __init__(self, key_pair, username: Optional[str] = None):
         """Set up instance."""
         self._log = logging.getLogger(__name__)
         self._ssh_client = None
@@ -36,7 +37,7 @@ def __init__(self, key_pair):
         self.boot_timeout = 120
         self.key_pair = key_pair
         self.port = "22"
-        self.username = "ubuntu"
+        self.username = username or "ubuntu"
         self.connect_timeout = 60
         self.banner_timeout = 60