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

go fixes

Browse source
This commit is contained in:
vdbewout 2023-10-28 19:36:01 +02:00
parent dc74efa509
commit 3069417150
No known key found for this signature in database
GPG key ID: F4756403592D3E9F
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -402,12 +402,12 @@ func lookupKeysGroup() (int, error) {
return 0, fmt.Errorf("Can't find group 'keys' nor 'nogroup' (%w).", err2)
}
func (app *appContext) loadSopsFile(s *secret, sopsFileIndex int) (*secretFile, error) {
func (app *appContext) loadSopsFile(s *secret, sopsFile *string) (*secretFile, error) {
if app.checkMode == Manifest {
return &secretFile{firstSecret: s}, nil
}
cipherText, err := os.ReadFile(s.SopsFiles[sopsFileIndex])
cipherText, err := os.ReadFile(*sopsFile)
if err != nil {
return nil, fmt.Errorf("Failed reading %s: %w", SopsFile, err)
}
@ -417,17 +417,17 @@ func (app *appContext) loadSopsFile(s *secret, sopsFileIndex int) (*secretFile,
switch s.Format {
case Binary:
if err := json.Unmarshal(cipherText, &keys); err != nil {
return nil, fmt.Errorf("Cannot parse json of '%s': %w", s.SopsFiles[sopsFileIndex], err)
return nil, fmt.Errorf("Cannot parse json of '%s': %w", *sopsFile, err)
}
return &secretFile{cipherText: cipherText, firstSecret: s}, nil
case Yaml:
if err := yaml.Unmarshal(cipherText, &keys); err != nil {
return nil, fmt.Errorf("Cannot parse yaml of '%s': %w", s.SopsFiles[sopsFileIndex], err)
return nil, fmt.Errorf("Cannot parse yaml of '%s': %w", *sopsFile, err)
}
case Dotenv:
env, err := godotenv.Unmarshal(string(cipherText))
if err != nil {
return nil, fmt.Errorf("Cannot parse dotenv of '%s': %w", s.SopsFiles[sopsFileIndex], err)
return nil, fmt.Errorf("Cannot parse dotenv of '%s': %w", *sopsFile, err)
}
keys = map[string]interface{}{}
for k, v := range env {
@ -435,7 +435,7 @@ func (app *appContext) loadSopsFile(s *secret, sopsFileIndex int) (*secretFile,
}
case Json:
if err := json.Unmarshal(cipherText, &keys); err != nil {
return nil, fmt.Errorf("Cannot parse json of '%s': %w", s.SopsFiles[sopsFileIndex], err)
return nil, fmt.Errorf("Cannot parse json of '%s': %w", *sopsFile, err)
}
}
@ -503,10 +503,10 @@ func (app *appContext) validateSecret(secret *secret) error {
}
files := []secretFile {};
for index, sopsFile := range secret.SopsFiles {
for _, sopsFile := range secret.SopsFiles {
file, ok := app.secretFiles[sopsFile]
if !ok {
maybeFile, err := app.loadSopsFile(secret, index)
maybeFile, err := app.loadSopsFile(secret, &sopsFile)
if err != nil {
return err
}
@ -523,7 +523,7 @@ func (app *appContext) validateSecret(secret *secret) error {
break
} else if i == 0 {
// No valid sopsFile found in sopsFiles
return err
return fmt.Errorf("Failed to find valid secret %s in %v", secret.Name, secret.SopsFiles)
}
}
return nil