Skip to content
This repository was archived by the owner on Feb 16, 2023. It is now read-only.

Commit fb4dc31

Browse files
committed
Flatten acl check command listLevels func
1 parent 9ce5439 commit fb4dc31

1 file changed

Lines changed: 16 additions & 15 deletions

File tree

internals/secrethub/acl_check.go

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -86,23 +86,24 @@ func (cmd *ACLCheckCommand) listLevels() ([]*api.AccessLevel, error) {
8686
path := cmd.path.Value()
8787

8888
levels, err := client.AccessRules().ListLevels(path)
89-
if api.IsErrNotFound(err) {
90-
isSecret, isSecretErr := client.Secrets().Exists(path)
91-
if isSecretErr != nil {
92-
return nil, err
93-
}
94-
if isSecret {
95-
levels, err = client.AccessRules().ListLevels(secretpath.Parent(path))
96-
if err != nil {
97-
return nil, err
98-
}
99-
return levels, nil
100-
} else {
89+
if err == nil {
90+
return levels, nil
91+
}
92+
if !api.IsErrNotFound(err) {
93+
return nil, err
94+
}
95+
96+
isSecret, isSecretErr := client.Secrets().Exists(path)
97+
if isSecretErr != nil {
98+
return nil, err
99+
}
100+
if isSecret {
101+
levels, err = client.AccessRules().ListLevels(secretpath.Parent(path))
102+
if err != nil {
101103
return nil, err
102104
}
103-
} else if err != nil {
104-
return nil, err
105+
return levels, nil
105106
}
107+
return nil, err
106108

107-
return levels, nil
108109
}

0 commit comments

Comments
 (0)