github/polaris
1
0
Fork 0
mirror of https://github.com/FairwindsOps/polaris.git synced 2026-05-11 11:47:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some nil pointer dereference fixes

Browse Source
This commit is contained in:
Jordan Doig
2021-01-07 20:40:22 -07:00
parent ba53a2b8ab
commit 4cee8b7e35
2 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
pkg/dashboard/templates/dashboard.gohtml
View File

@@ -141,9 +141,11 @@
<div class="status-bar">
<div class="status">
<div class="failing">
<div class="warning" style="width: {{ getWarningWidth .PodResult.GetSummary 200 }}px;">
<div class="passing" style="width: {{ getSuccessWidth .PodResult.GetSummary 200 }}px;"></div>
</div>
{{ if .PodResult }}
<div class="warning" style="width: {{ getWarningWidth .PodResult.GetSummary 200 }}px;">
<div class="passing" style="width: {{ getSuccessWidth .PodResult.GetSummary 200 }}px;"></div>
</div>
{{ end }}
</div>
</div>
</div>
@@ -192,26 +194,28 @@
</div>
{{ end }}
{{ range .PodResult.ContainerResults }}
<div class="result-messages expandable-content">
<h4>Container {{ .Name }}:
{{ if eq 0 (len .Results.GetSortedResults) }}
<i>no checks applied</i>
{{ end }}
</h4>
<ul class="message-list">
{{ range $message := .Results.GetSortedResults }}
<li class="{{ getResultClass . }}">
<i class="message-icon {{ getIcon $message }}"></i>
<span class="message">{{ .Message }}</span>
<a class="more-info" href="{{ getCategoryLink .Category }}" target="_blank">
<i class="far fa-question-circle"></i>
</a>
</li>
{{ end }}
</ul>
</div>
{{ end }} {{/* end range .PodResult.ContainerResults */}}
{{ if .PodResult }}
{{ range .PodResult.ContainerResults }}
<div class="result-messages expandable-content">
<h4>Container {{ .Name }}:
{{ if eq 0 (len .Results.GetSortedResults) }}
<i>no checks applied</i>
{{ end }}
</h4>
<ul class="message-list">
{{ range $message := .Results.GetSortedResults }}
<li class="{{ getResultClass . }}">
<i class="message-icon {{ getIcon $message }}"></i>
<span class="message">{{ .Message }}</span>
<a class="more-info" href="{{ getCategoryLink .Category }}" target="_blank">
<i class="far fa-question-circle"></i>
</a>
</li>
{{ end }}
</ul>
</div>
{{ end }} {{/* end range .PodResult.ContainerResults */}}
{{ end }} {{/* end if .PodResult */}}
</div>
{{ end }} {{/* end range .Results.GetSortedResults */}}
</div>

8
pkg/validator/summary.go
View File

@@ -121,7 +121,9 @@ func (c Result) GetSummaryByCategory() CountSummaryByCategory {
func (a AuditData) GetSummary() CountSummary {
summary := CountSummary{}
for _, ctrlResult := range a.Results {
summary.AddSummary(ctrlResult.GetSummary())
if ctrlResult.PodResult != nil {
summary.AddSummary(ctrlResult.GetSummary())
}
}
return summary
}
@@ -130,7 +132,9 @@ func (a AuditData) GetSummary() CountSummary {
func (a AuditData) GetSummaryByCategory() CountSummaryByCategory {
summaries := CountSummaryByCategory{}
for _, ctrlResult := range a.Results {
summaries.AddSummary(ctrlResult.GetSummaryByCategory())
if ctrlResult.PodResult != nil {
summaries.AddSummary(ctrlResult.GetSummaryByCategory())
}
}
return summaries
}