Skip to content

fix nil #555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ldmonster merged 1 commit into from
Jan 24, 2025
+31 −15
Merged

fix nil #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions pkg/module_manager/models/hooks/kind/batch_hook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,22 +228,42 @@ func (h *BatchHook) GetConfigForModule(_ string) (*config.HookConfig, error) {
}

func (h *BatchHook) GetOnStartup() *float64 {
if h.config == nil || h.config.OnStartup == nil {
return nil
}

res := float64(*h.config.OnStartup)

return &res
}

func (h *BatchHook) GetBeforeAll() *float64 {
if h.config == nil || h.config.OnBeforeHelm == nil {
return nil
}

res := float64(*h.config.OnBeforeHelm)

return &res
}

func (h *BatchHook) GetAfterAll() *float64 {
if h.config == nil || h.config.OnAfterHelm == nil {
return nil
}

res := float64(*h.config.OnAfterHelm)

return &res
}

func (h *BatchHook) GetAfterDeleteHelm() *float64 {
if h.config == nil || h.config.OnAfterDeleteHelm == nil {
return nil
}

res := float64(*h.config.OnAfterDeleteHelm)

return &res
}

Expand Down
26 changes: 11 additions & 15 deletions pkg/module_manager/models/hooks/kind/gohook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,43 +198,39 @@ func (h *GoHook) GetConfigForModule(_ string) (*config.HookConfig, error) {
}

func (h *GoHook) GetOnStartup() *float64 {
if h.config.OnStartup != nil {
return &h.config.OnStartup.Order
if h.config == nil || h.config.OnStartup == nil {
return nil
}

return nil
return &h.config.OnStartup.Order
}

func (h *GoHook) GetBeforeAll() *float64 {
if h.config.OnBeforeAll != nil {
return &h.config.OnBeforeAll.Order
}

if h.config.OnBeforeHelm != nil {
return &h.config.OnBeforeHelm.Order
if h.config == nil || h.config.OnBeforeAll == nil {
return nil
}

return nil
return &h.config.OnBeforeAll.Order
}

func (h *GoHook) GetAfterAll() *float64 {
if h.config.OnAfterAll != nil {
if h.config != nil && h.config.OnAfterAll != nil {
return &h.config.OnAfterAll.Order
}

if h.config.OnAfterHelm != nil {
if h.config != nil && h.config.OnAfterHelm != nil {
return &h.config.OnAfterHelm.Order
}

return nil
}

func (h *GoHook) GetAfterDeleteHelm() *float64 {
if h.config.OnAfterDeleteHelm != nil {
return &h.config.OnAfterDeleteHelm.Order
if h.config == nil || h.config.OnAfterDeleteHelm == nil {
return nil
}

return nil
return &h.config.OnAfterDeleteHelm.Order
}

func newHookConfigFromGoConfig(input *gohook.HookConfig) (config.HookConfig, error) {
Expand Down
Loading