refactor: pass key to loadAgeSSHIdentities

Signed-off-by: Nate Scherer <376408+natescherer@users.noreply.github.com>

Author: natescherer

age/keysource.go

@@ -321,7 +321,7 @@ func getOutputFromCmd(cmdString string, envVars []string) ([]byte, error) {
 // SopsAgeSshPrivateKeyCmdEnv environment variable
 // 3. `~/.ssh/id_ed25519` or `~/.ssh/id_rsa`.
 // If no age SSH identity is found, it will return nil.
-func loadAgeSSHIdentities() ([]age.Identity, []string, errSet) {
+func loadAgeSSHIdentities(key *MasterKey) ([]age.Identity, []string, errSet) {
 	var identities []age.Identity
 	var unusedLocations []string
 	var errs errSet
@@ -340,8 +340,7 @@ func loadAgeSSHIdentities() ([]age.Identity, []string, errSet) {
 
 	sshKeyCmd, ok := os.LookupEnv(SopsAgeSshPrivateKeyCmdEnv)
 	if ok {
-		ageRecipient, _ := os.LookupEnv(SopsAgeRecipientEnv)
-		out, err := getOutputFromCmd(sshKeyCmd, []string{fmt.Sprintf("%s=%s", SopsAgeRecipientEnv, ageRecipient)})
+		out, err := getOutputFromCmd(sshKeyCmd, []string{fmt.Sprintf("%s=%s", SopsAgeRecipientEnv, key.Recipient)})
 		if err != nil {
 			errs = append(errs, err)
 		} else {
@@ -404,7 +403,7 @@ func getUserConfigDir() (string, error) {
 // SopsAgeSshPrivateKeyFileEnv, SopsAgeKeyUserConfigPath). It will load all
 // found references, and expects at least one configuration to be present.
 func (key *MasterKey) loadIdentities() (ParsedIdentities, []string, errSet) {
-	identities, unusedLocations, errs := loadAgeSSHIdentities()
+	identities, unusedLocations, errs := loadAgeSSHIdentities(key)
 
 	var readers = make(map[string]io.Reader, 0)