ssh keys: retry on 404

    DEBUG:packet.baseapi:POST https://api.packet.net/projects/86d5d066-b891-4608-af55-a481aa2c0094/ssh-keys {'key': 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL/w0nE8ezh9UX88pT3BLtn9Sx2dFZcDSR1+tv4oBjSj', 'label': 'grahamc-test'} {'X-Auth-Token': 'TOKEN', 'X-Consumer-Token': None, 'Content-Type': 'application/json'}
    DEBUG:urllib3.connectionpool:Starting new HTTPS connection (1): api.packet.net:443
    DEBUG:urllib3.connectionpool:https://api.packet.net:443 "POST /projects/86d5d066-b891-4608-af55-a481aa2c0094/ssh-keys HTTP/1.1" 404 24
    DEBUG:packet.baseapi:POST https://api.packet.net/projects/86d5d066-b891-4608-af55-a481aa2c0094/ssh-keys {'key': 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL/w0nE8ezh9UX88pT3BLtn9Sx2dFZcDSR1+tv4oBjSj', 'label': 'grahamc-test'} {'X-Auth-Token': 'TOKEN', 'X-Consumer-Token': None, 'Content-Type': 'application/json'}
    DEBUG:urllib3.connectionpool:Starting new HTTPS connection (1): api.packet.net:443
    DEBUG:urllib3.connectionpool:https://api.packet.net:443 "POST /projects/86d5d066-b891-4608-af55-a481aa2c0094/ssh-keys HTTP/1.1" 422 33
    DEBUG:packet.baseapi:GET https://api.packet.net/ssh-keys {} {'X-Auth-Token': 'TOKEN', 'X-Consumer-Token': None, 'Content-Type': 'application/json'}
    DEBUG:urllib3.connectionpool:Starting new HTTPS connection (1): api.packet.net:443
    DEBUG:urllib3.connectionpool:https://api.packet.net:443 "GET /ssh-keys HTTP/1.1" 200 None
    SSHKey: 3088ab9e-af4d-4f5a-b301-94d90384b2f9

Author: grahamc

packet/Manager.py

@@ -3,6 +3,7 @@
 from packet.Vlan import Vlan
 from .baseapi import BaseAPI
 from .baseapi import Error as PacketError
+from .baseapi import ResponseError
 from .Batch import Batch
 from .Plan import Plan
 from .Device import Device
@@ -197,11 +198,46 @@ def create_ssh_key(self, label, public_key):
         return SSHKey(data, self)
 
     def create_project_ssh_key(self, project_id, label, public_key):
-        params = {"key": public_key, "label": label}
-        data = self.call_api(
-            "projects/%s/ssh-keys" % project_id, type="POST", params=params
-        )
-        return SSHKey(data, self)
+        """
+        Successfully creating an SSH key with a Project API Token results
+        in a 404 from the API. If we get a 404, we try the request again.
+
+        If the request actually failed with a 404, we will get another 404
+        which we raise.
+
+        If the request actually succeeded, we will get a 422. In this case,
+        we will try to list all the keys and find the SSHKey we just
+        received.
+
+        Customer Report Reference: TUVD-0107-UIKB
+        """
+
+        def issue_req():
+            try:
+                params = {"key": public_key, "label": label}
+                data = self.call_api(
+                    "projects/%s/ssh-keys" % project_id, type="POST", params=params
+                )
+                return SSHKey(data, self)
+            except ResponseError as e:
+                if e.response.status_code == 422:
+                    # Try to pluck the SSH key from the listing API
+                    keys = [
+                        key
+                        for key in self.list_ssh_keys()
+                        if key.key.strip() == public_key.strip()
+                    ]
+                    if len(keys) == 1:
+                        return keys.pop()
+                raise
+
+        try:
+            return issue_req()
+        except ResponseError as e:
+            if e.response.status_code == 404:
+                return issue_req()
+            else:
+                raise
 
     def list_volumes(self, project_id, params={}):
         params["include"] = "facility,attachments.device"

packet/__init__.py

@@ -26,3 +26,4 @@
 from .Organization import Organization  # noqa
 from .Provider import Provider  # noqa
 from .baseapi import Error  # noqa
+from .baseapi import ResponseError  # noqa