fix panic when HelmRepository's artifact size is nil

This fixes the immediate issue of the nil pointer dereference but we
still haven't isolated the actual cause of the size being nil to begin
with. This is ongoing work and as soon as we have boiled that down to
the simplest case we will provide a regression test for that case.

closes #680

Signed-off-by: Max Jonas Werner <mail@makk.es>
Co-authored-by: Hidde Beydals <hiddeco@users.noreply.github.com>
This commit is contained in:
Max Jonas Werner 2022-04-22 10:16:36 +02:00
parent c51b359a6a
commit c3d5dac4a8
No known key found for this signature in database
GPG Key ID: EB525E0F02B52140
2 changed files with 14 additions and 2 deletions

View File

@ -255,14 +255,17 @@ func (r *HelmRepositoryReconciler) notify(oldObj, newObj *sourcev1.HelmRepositor
sourcev1.GroupVersion.Group + "/checksum": newObj.Status.Artifact.Checksum,
}
size := units.HumanSize(float64(*newObj.Status.Artifact.Size))
humanReadableSize := "unknown size"
if size := newObj.Status.Artifact.Size; size != nil {
humanReadableSize = fmt.Sprintf("size %s", units.HumanSize(float64(*size)))
}
var oldChecksum string
if oldObj.GetArtifact() != nil {
oldChecksum = oldObj.GetArtifact().Checksum
}
message := fmt.Sprintf("stored fetched index of size %s from '%s'", size, chartRepo.URL)
message := fmt.Sprintf("stored fetched index of %s from '%s'", humanReadableSize, chartRepo.URL)
// Notify on new artifact and failure recovery.
if oldChecksum != newObj.GetArtifact().Checksum {

View File

@ -859,6 +859,15 @@ func TestHelmRepositoryReconciler_notify(t *testing.T) {
res: sreconcile.ResultEmpty,
resErr: errors.New("some error"),
},
{
name: "new artifact with nil size",
res: sreconcile.ResultSuccess,
resErr: nil,
newObjBeforeFunc: func(obj *sourcev1.HelmRepository) {
obj.Status.Artifact = &sourcev1.Artifact{Revision: "xxx", Checksum: "yyy", Size: nil}
},
wantEvent: "Normal NewArtifact stored fetched index of unknown size",
},
{
name: "new artifact",
res: sreconcile.ResultSuccess,