Skip to content

Commit e76a82a

Browse files
authored
fix nil (#556)
Signed-off-by: Pavel Okhlopkov <pavel.okhlopkov@flant.com> Co-authored-by: Pavel Okhlopkov <pavel.okhlopkov@flant.com>
1 parent 53477c0 commit e76a82a

File tree

1 file changed

+7
-3
lines changed
  • pkg/module_manager/models/hooks/kind

1 file changed

+7
-3
lines changed

pkg/module_manager/models/hooks/kind/gohook.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,15 @@ func (h *GoHook) GetOnStartup() *float64 {
206206
}
207207

208208
func (h *GoHook) GetBeforeAll() *float64 {
209-
if h.config == nil || h.config.OnBeforeAll == nil {
210-
return nil
209+
if h.config != nil && h.config.OnBeforeAll != nil {
210+
return &h.config.OnBeforeAll.Order
211+
}
212+
213+
if h.config != nil && h.config.OnBeforeHelm != nil {
214+
return &h.config.OnBeforeHelm.Order
211215
}
212216

213-
return &h.config.OnBeforeAll.Order
217+
return nil
214218
}
215219

216220
func (h *GoHook) GetAfterAll() *float64 {

0 commit comments

Comments
 (0)