commit 9611a859053085ce4e3c8c6d1aee538a683d3b8f
author Wesley Moy <wesleymoy@google.com> Wed Jun 24 14:18:11 2020 -0700
committer CQ Bot <commit-bot@chromium.org> Tue Sep 15 00:49:55 2020 +0000
tree 3090b60b03fac4dad1f246fbff2888e7174f7799
parent 049125e9b574bfcf819c2a1693862237c80bdd4b

[fx][gn-sdk] Replace default key location

This allows for a per-user, per-workstation Fuchsia identity (SSH
keypair) that can be shared between fx and the GN SDK.

If //.fx-ssh-path doesn't exist, the message printed by 'fx gen' is:

```
ERROR at //third_party/openssh-portable/fuchsia/developer-keys/BUILD.gn:10:24: Could not read file.
  manifest = read_file("//.fx-ssh-path", "list lines")
                       ^---------------
I resolved this to ".../fuchsia/.fx-ssh-path".
See //products/core.gni:68:3: which caused the file to be included.
  "//third_party/openssh-portable/fuchsia/developer-keys:ssh_config",
  ^-----------------------------------------------------------------
```

Unfortunately GN doesn't have an easy way to either catch this error
or test if a file exists to print a more user-friendly error message, so
this CL adds an explanation to the BUILD.gn in case the affected user
looks into the file mentioned in the error message.

Change-Id: I1cd0f8193612be2fdbf91cf4cf4d833826cd8f26
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/openssh-portable/+/402175
Commit-Queue: Wesley Moy <wesleymoy@google.com>
Reviewed-by: Renato Mangini Dias <mangini@google.com>
Reviewed-by: James Tucker <raggi@google.com>

fuchsia/developer-keys/BUILD.gn

diff --git a/fuchsia/developer-keys/BUILD.gn b/fuchsia/developer-keys/BUILD.gn
index 6a4f96b..967e471 100644
--- a/fuchsia/developer-keys/BUILD.gn
+++ b/fuchsia/developer-keys/BUILD.gn
@@ -5,10 +5,13 @@
 keys_dir = "${root_build_dir}/ssh-keys"
 
 action("ssh_config") {
+  # Assumes that //.fx-ssh-path exists. If it doesn't, the user must manually
+  # run //tools/ssh-keys/gen-ssh-keys.sh
+  manifest = read_file("//.fx-ssh-path", "list lines")
   config_file = "${keys_dir}/ssh_config"
   script = "generate_ssh_config.sh"
   args = [
-    rebase_path("//.ssh/pkey"),
+    manifest[0],
     rebase_path(config_file),
   ]
   outputs = [ config_file ]

fuchsia/developer-keys/generate_ssh_config.sh

diff --git a/fuchsia/developer-keys/generate_ssh_config.sh b/fuchsia/developer-keys/generate_ssh_config.sh
index 409c6ba..c9eadcd 100755
--- a/fuchsia/developer-keys/generate_ssh_config.sh
+++ b/fuchsia/developer-keys/generate_ssh_config.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
-cat <<EOF > $2
+
+cat <<EOF >"$2"
 Host 127.0.0.1
   Port 8022