Skip to content

Commit 11c7ff7

Browse files
committed
fix: clear-cache error
and secret setter error
1 parent 4ff5006 commit 11c7ff7

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

internal/util/secret.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package util
33

44
import (
55
"encoding/json"
6-
"fmt"
76
"os"
87
"time"
98

@@ -125,7 +124,8 @@ func AWSCredential(roleArn string) (*AWSCredentials, error) {
125124

126125
jsonStr, ok := Secret.AWSCredentials[roleArn]
127126
if !ok {
128-
Exit(fmt.Errorf("Not found the credential for %s", roleArn))
127+
Writeln("Not found the credential for %s", roleArn)
128+
return nil, nil
129129
}
130130

131131
Writeln("Got credential from OS secret store for %s", roleArn)

internal/web/web.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,15 @@ func (web *Web) GetSamlLogin(conf config.SamlConfig) (string, error) {
7878

7979
func (web *Web) ClearCache() error {
8080
errs := []error{}
81-
if err := os.Remove(*web.datadir); err != nil {
81+
82+
if err := os.RemoveAll(*web.datadir); err != nil {
8283
errs = append(errs, err)
8384
}
8485
if err := checkRodProcess(); err != nil {
8586
errs = append(errs, err)
8687
}
8788

88-
if errs != nil {
89+
if len(errs) > 0 {
8990
return fmt.Errorf("%v", errs[:])
9091
}
9192
return nil

0 commit comments

Comments
 (0)