Merge pull request #683 from fluxcd/fix-panic

fluxcd · Apr 22, 2022 · 0836d88 · 0836d88
2 parents c51b359 + c3d5dac
commit 0836d88
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/controllers/helmrepository_controller.go b/controllers/helmrepository_controller.go
@@ -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 {

diff --git a/controllers/helmrepository_controller_test.go b/controllers/helmrepository_controller_test.go
@@ -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,