machine: hetzner: Fix initial deploy when ssh-key is #f.

This fixes a regression introduced in commit a2ef2bcbfd7 ("machine: hetzner:
Allow connections using ssh-agent"), where having no ssh-key would cause the
early Hetzner provisioning to fail due to the lack of SSH authentication.

* gnu/machine/hetzner.scm (%hetzner-ssh-key-file): New parameter.
(<hetzner-configuration>) [ssh-public-key]: Compute default according to the
value of the private ssh-key field.  Introduce an indirection via...
(hetzner-configuration-ssh-public-key): ... this new procedure, to honor
%hetzner-ssh-key-file.
(hetzner-configuration-ssh-key): Likewise for the private ssh-key.
(hetzner-configuration-ssh-key-fingerprint): Rename to...
(public-key->fingerprint): ... this, taking just the public key as argument.
Update doc.
(hetzner-configuration-ssh-key-public): Rename to...
(public-key->string-with-type): ...this, for clarity, and accept just a
public-key object.  Update doc.
(hetzner-machine-ssh-key): Exit early with #f when no ssh key is provided.
(temporary-ssh-key-file): New procedure.
(hetzner-machine-ssh-key-create): Assert a public key is defined.  Adjust
calls to renamed procedures, and adjust for the `hetzner-api-server-create'
API change.
(hetzner-machine-enable-rescue-system): Refine doc and fix code path when
ssh-key is #f.
(hetzner-machine-rescue-install-os): Document.
(hetzner-machine-provision): Refine doc. Remove extraneous sleep and #:unwind
argument. Limit ssh-session dynamic scope to where it's needed.
(cleanup-temporary-ssh-key/maybe): New procedure.
(deploy-hetzner): Create and use a temporary SSH key when none is defined, and
clean it up when done or on errors.
* gnu/machine/hetzner/http.scm (hetzner-api-server-create): Make ssh-keys a
keyword argument, and fix execution when it's #f.
(hetzner-api-server-enable-rescue-system): Likewise.
* tests/machine/hetzner.scm ("deploy-machine-mock-with-unprovisioned-server"):
Adjust test.
* tests/machine/hetzner/http.scm (create-server)
("hetzner-api-server-create-unit")
("hetzner-api-server-enable-rescue-system-unit")
("hetzner-api-actions-integration")
("hetzner-api-server-enable-rescue-system-integration"): Likewise.
* doc/guix.texi (Invoking guix deploy): Precise what happens when 'ssh-key' is
 #f in hetzner-configuration, and suggest declaratively authorizing your SSH
key.

Change-Id: I812b348fb553f3b5aebd0bf66850c6ecb9e06653

2 files changed, 12 insertions, 7 deletions

diff --git a/tests/machine/hetzner.scm b/tests/machine/hetzner.scm
index 1552bcb9a08..6f02c349f91 100644
--- a/tests/machine/hetzner.scm
+++ b/tests/machine/hetzner.scm
@@ -234,11 +234,11 @@
              (lambda* (api . options)
                servers))
             ((gnu machine hetzner http) hetzner-api-server-create
-             (lambda* (api name ssh-keys . options)
+             (lambda* (api name #:key ssh-keys #:allow-other-keys)
                (set! servers (list (mock-server machine)))
                (car servers)))
             ((gnu machine hetzner http) hetzner-api-server-enable-rescue-system
-             (lambda (api server ssh-keys)
+             (lambda* (api server #:key ssh-keys #:allow-other-keys)
                (mock-action "enable_rescue")))
             ((gnu machine hetzner http) hetzner-api-server-power-on
              (lambda (api server)
diff --git a/tests/machine/hetzner/http.scm b/tests/machine/hetzner/http.scm
index 6c6d848a578..bd516db023b 100644
--- a/tests/machine/hetzner/http.scm
+++ b/tests/machine/hetzner/http.scm
@@ -286,7 +286,8 @@
    #:labels labels))
 
 (define* (create-server api ssh-key #:key (labels %labels))
-  (hetzner-api-server-create api %server-name (list ssh-key)
+  (hetzner-api-server-create api %server-name
+                             #:ssh-keys (list ssh-key)
                              #:labels labels
                              #:server-type "cpx31"))
 
@@ -384,7 +385,8 @@
               (body `(("actions" . ,(vector (cons `("status" . "success")
                                                   action-create-server-alist)))
                       ("meta" . ,meta-page-alist))))))))
-        (hetzner-api-server-create (hetzner-api) %server-name (list ssh-key-root))))
+        (hetzner-api-server-create (hetzner-api) %server-name
+                                   #:ssh-keys (list ssh-key-root))))
 
 (test-equal "hetzner-api-server-delete-unit"
   (make-hetzner-action
@@ -425,7 +427,8 @@
               (body `(("actions" . ,(vector (cons `("status" . "success")
                                                   action-enable-rescue-alist)))
                       ("meta" . ,meta-page-alist))))))))
-        (hetzner-api-server-enable-rescue-system (hetzner-api) server-x86 (list ssh-key-root))))
+        (hetzner-api-server-enable-rescue-system
+         (hetzner-api) server-x86 #:ssh-keys (list ssh-key-root))))
 
 (test-equal "hetzner-api-server-power-on-unit"
   action-power-on
@@ -557,7 +560,8 @@
   (with-cleanup-api (api (hetzner-api))
     (let* ((ssh-key (create-ssh-key api %ssh-key))
            (server (create-server api ssh-key))
-           (action (hetzner-api-server-enable-rescue-system api server (list ssh-key))))
+           (action (hetzner-api-server-enable-rescue-system
+                    api server #:ssh-keys (list ssh-key))))
       (member action (hetzner-api-actions api (list (hetzner-action-id action)))))))
 
 (test-skip %when-no-token)
@@ -595,7 +599,8 @@
   (with-cleanup-api (api (hetzner-api))
     (let* ((ssh-key (create-ssh-key api %ssh-key))
            (server (create-server api ssh-key))
-           (action (hetzner-api-server-enable-rescue-system api server (list ssh-key))))
+           (action (hetzner-api-server-enable-rescue-system
+                    api server #:ssh-keys (list ssh-key))))
       (and (hetzner-action? action)
            (equal? "enable_rescue"
                    (hetzner-action-command action))))))