pkg/sops-nix
1
0
Fork 0
mirror of https://github.com/Mic92/sops-nix.git synced 2025-12-26 22:24:59 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix: validateSecret

Browse source 
Fix logic error in previous commit
This commit is contained in:
vdbewout 2023-10-14 12:30:43 +02:00
parent abcc999367
commit a140a3706d
No known key found for this signature in database
GPG key ID: F4756403592D3E9F
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pkgs/sops-install-secrets/main.go
View file

@ -287,7 +287,7 @@ func decryptSecret(s *secret, sourceFiles map[string]plainData) error {
case Yaml, Json:
strVal, err := recurseSecretKey(sourceFile.data, s.Key)
if err != nil {
continue;
continue
}
s.value = []byte(strVal)
}
@ -511,7 +511,6 @@ func (app *appContext) validateSecret(secret *secret) error {
return err
}
app.secretFiles[sopsFile] = *maybeFile
files = append(files, *maybeFile)
file = *maybeFile
}
files = append(files, file)
@ -519,11 +518,15 @@ func (app *appContext) validateSecret(secret *secret) error {
for i := len(files) - 1; i >= 0; i-- {
err := app.validateSopsFile(secret, &files[i])
if err != nil && i == 0 {
if err == nil {
// Found valid sopsFile
break
} else if i == 0 {
// No valid sopsFile found in sopsFiles
return err
}
}
return nil;
return nil
}
func (app *appContext) validateManifest() error {