migration to new secrets nearly complete

cmd/dkl-local-server/ssh-secrets.go

@@ -15,34 +15,16 @@ import (
 	"os/exec"
 )
 
+var sshHostKeys = KVSecrets[[]SSHKeyPair]{"hosts/ssh-host-keys"}
+
 type SSHKeyPair struct {
 	Type    string
 	Public  string
 	Private string
 }
 
-func (sd *SecretData) SSHKeyPairs(cluster, host string) (pairs []SSHKeyPair, err error) {
-	cs := sd.cluster(cluster)
-
-	if cs.SSHKeyPairs == nil {
-		cs.SSHKeyPairs = map[string][]SSHKeyPair{}
-	}
-
-	outFile, err := ioutil.TempFile("/tmp", "dls-key.")
-	if err != nil {
-		return
-	}
-
-	outPath := outFile.Name()
-
-	removeTemp := func() {
-		os.Remove(outPath)
-		os.Remove(outPath + ".pub")
-	}
-
-	defer removeTemp()
-
-	pairs = cs.SSHKeyPairs[host]
+func getSSHKeyPairs(host string) (pairs []SSHKeyPair, err error) {
+	pairs, _, err = sshHostKeys.Get(host)
 
 	didGenerate := false
 
@@ -59,46 +41,64 @@ genLoop:
 			}
 		}
 
-		didGenerate = true
+		err = func() (err error) {
+			outFile, err := ioutil.TempFile("/tmp", "dls-key.")
+			if err != nil {
+				return
+			}
 
-		removeTemp()
+			outPath := outFile.Name()
 
-		var out, privKey, pubKey []byte
+			removeTemp := func() {
+				os.Remove(outPath)
+				os.Remove(outPath + ".pub")
+			}
+
+            removeTemp()
+			defer removeTemp()
+
+			var out, privKey, pubKey []byte
+
+			out, err = exec.Command("ssh-keygen",
+				"-N", "",
+				"-C", "root@"+host,
+				"-f", outPath,
+				"-t", keyType).CombinedOutput()
+			if err != nil {
+				err = fmt.Errorf("ssh-keygen failed: %v: %s", err, string(out))
+				return
+			}
+
+			privKey, err = ioutil.ReadFile(outPath)
+			if err != nil {
+				return
+			}
+
+			pubKey, err = ioutil.ReadFile(outPath + ".pub")
+			if err != nil {
+				return
+			}
+
+			pairs = append(pairs, SSHKeyPair{
+				Type:    keyType,
+				Public:  string(pubKey),
+				Private: string(privKey),
+			})
+			didGenerate = true
 
-		out, err = exec.Command("ssh-keygen",
-			"-N", "",
-			"-C", "root@"+host,
-			"-f", outPath,
-			"-t", keyType).CombinedOutput()
-		if err != nil {
-			err = fmt.Errorf("ssh-keygen failed: %v: %s", err, string(out))
 			return
-		}
+		}()
 
-		privKey, err = ioutil.ReadFile(outPath)
 		if err != nil {
 			return
 		}
-
-		os.Remove(outPath)
-
-		pubKey, err = ioutil.ReadFile(outPath + ".pub")
-		if err != nil {
-			return
-		}
-
-		os.Remove(outPath + ".pub")
-
-		pairs = append(pairs, SSHKeyPair{
-			Type:    keyType,
-			Public:  string(pubKey),
-			Private: string(privKey),
-		})
 	}
 
 	if didGenerate {
-		cs.SSHKeyPairs[host] = pairs
-		err = sd.Save()
+		err = sshHostKeys.Put(host, pairs)
+		if err != nil {
+			return
+		}
 	}
 
 	return