From 77d0fa5920f788bc5e30667693e3d23d7c00fe81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 2 Sep 2021 09:18:17 +0200 Subject: [PATCH] Simplify age logic in sops-install-secrets --- pkgs/sops-install-secrets/main.go | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/sops-install-secrets/main.go b/pkgs/sops-install-secrets/main.go index f42d1bd..9fc50d3 100644 --- a/pkgs/sops-install-secrets/main.go +++ b/pkgs/sops-install-secrets/main.go @@ -643,18 +643,15 @@ func installSecrets(args []string) error { defer keyring.Remove() } else if manifest.GnupgHome != "" { os.Setenv("GNUPGHOME", manifest.GnupgHome) - } else if manifest.AgeKeyFile != "" || len(manifest.AgeSshKeyPaths) != 0 { - if len(manifest.AgeSshKeyPaths) == 0 { - os.Setenv("SOPS_AGE_KEY_FILE", manifest.AgeKeyFile) - } else { - keyfile := filepath.Join(manifest.SecretsMountPoint, "age-keys.txt") - err = importAgeSSHKeys(manifest.AgeSshKeyPaths, keyfile) - if err != nil { - return err - } - fmt.Printf("Wrote keys to %s\n", keyfile) - os.Setenv("SOPS_AGE_KEY_FILE", keyfile) + } else if len(manifest.AgeSshKeyPaths) != 0 { + keyfile := filepath.Join(manifest.SecretsMountPoint, "age-keys.txt") + err = importAgeSSHKeys(manifest.AgeSshKeyPaths, keyfile) + if err != nil { + return err } + os.Setenv("SOPS_AGE_KEY_FILE", keyfile) + } else if manifest.AgeKeyFile != "" { + os.Setenv("SOPS_AGE_KEY_FILE", manifest.AgeKeyFile) } if err := decryptSecrets(manifest.Secrets); err != nil {