getsops/sops
1
0
Fork 0
mirror of https://github.com/getsops/sops.git synced 2026-02-05 12:45:21 +01:00
Code Issues Activity

Make sure to wrap raw errors with toExitError().

Browse Source 
Signed-off-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
Felix Fontein
2023-10-08 15:37:26 +02:00
committed by Hidde Beydals
parent 871d10fe2e
commit 0a9b441181
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/sops/main.go
View File

@@ -282,14 +282,14 @@ func main() {
path := c.Args()[0]
info, err := os.Stat(path)
if err != nil {
return err
return toExitError(err)
}
if info.IsDir() && !c.Bool("recursive") {
return fmt.Errorf("can't operate on a directory without --recursive flag.")
}
err = filepath.Walk(path, func(subPath string, info os.FileInfo, err error) error {
if err != nil {
return err
return toExitError(err)
}
if !info.IsDir() {
err = publishcmd.Run(publishcmd.Opts{
@@ -312,7 +312,7 @@ func main() {
return nil
})
if err != nil {
return err
return toExitError(err)
}
return nil
},
@@ -842,21 +842,21 @@ func main() {
}
azureKeys, err := azkv.MasterKeysFromURLs(c.String("add-azure-kv"))
if err != nil {
return err
return toExitError(err)
}
for _, k := range azureKeys {
addMasterKeys = append(addMasterKeys, k)
}
hcVaultKeys, err := hcvault.NewMasterKeysFromURIs(c.String("add-hc-vault-transit"))
if err != nil {
return err
return toExitError(err)
}
for _, k := range hcVaultKeys {
addMasterKeys = append(addMasterKeys, k)
}
ageKeys, err := age.MasterKeysFromRecipients(c.String("add-age"))
if err != nil {
return err
return toExitError(err)
}
for _, k := range ageKeys {
addMasterKeys = append(addMasterKeys, k)
@@ -874,21 +874,21 @@ func main() {
}
azureKeys, err = azkv.MasterKeysFromURLs(c.String("rm-azure-kv"))
if err != nil {
return err
return toExitError(err)
}
for _, k := range azureKeys {
rmMasterKeys = append(rmMasterKeys, k)
}
hcVaultKeys, err = hcvault.NewMasterKeysFromURIs(c.String("rm-hc-vault-transit"))
if err != nil {
return err
return toExitError(err)
}
for _, k := range hcVaultKeys {
rmMasterKeys = append(rmMasterKeys, k)
}
ageKeys, err = age.MasterKeysFromRecipients(c.String("rm-age"))
if err != nil {
return err
return toExitError(err)
}
for _, k := range ageKeys {
rmMasterKeys = append(rmMasterKeys, k)