more wip

Author: ezilber-akamai

linode_api4/objects/linode.py

@@ -1591,26 +1591,27 @@ def rebuild(
 
         :param image: The Image to deploy to this Instance
         :type image: str or Image
-        :param root_pass: The root password for the newly rebuilt Instance.  If
-                          omitted, a password will be generated and returned.
+        :param root_pass: The root password for the newly rebuilt Instance.
+                          At least one of root_pass or authorized_keys is
+                          required.  Both may be provided.
         :type root_pass: str
         :param authorized_keys: The ssh public keys to install in the linode's
                                 /root/.ssh/authorized_keys file.  Each entry may
                                 be a single key, or a path to a file containing
-                                the key.
+                                the key.  At least one of authorized_keys or
+                                root_pass is required.
         :type authorized_keys: list or str
         :param disk_encryption: The disk encryption policy for this Linode.
                                 NOTE: Disk encryption may not currently be available to all users.
         :type disk_encryption: InstanceDiskEncryptionType or str
 
-        :returns: The newly generated password, if one was not provided
-                  (otherwise True)
-        :rtype: str or bool
+        :returns: True if the rebuild was successful.
+        :rtype: bool
         """
-        ret_pass = None
-        if not root_pass:
-            ret_pass = Instance.generate_root_password()
-            root_pass = ret_pass
+        if not root_pass and not authorized_keys:
+            raise ValueError(
+                "At least one of root_pass or authorized_keys is required."
+            )
 
         authorized_keys = load_and_validate_keys(authorized_keys)
 
@@ -1639,10 +1640,7 @@ def rebuild(
         # update ourself with the newly-returned information
         self._populate(result)
 
-        if not ret_pass:
-            return True
-        else:
-            return ret_pass
+        return True
 
     def rescue(self, *disks):
         """

test/unit/objects/linode_test.py

@@ -93,21 +93,21 @@ def test_rebuild(self):
         linode = Instance(self.client, 123)
 
         with self.mock_post("/linode/instances/123") as m:
-            pw = linode.rebuild(
+            result = linode.rebuild(
                 "linode/debian9",
+                root_pass="test123ABC!",
                 disk_encryption=InstanceDiskEncryptionType.enabled,
             )
 
-            self.assertIsNotNone(pw)
-            self.assertTrue(isinstance(pw, str))
+            self.assertTrue(result)
 
             self.assertEqual(m.call_url, "/linode/instances/123/rebuild")
 
             self.assertEqual(
                 m.call_data,
                 {
                     "image": "linode/debian9",
-                    "root_pass": pw,
+                    "root_pass": "test123ABC!",
                     "disk_encryption": "enabled",
                 },
             )