Merge branch 'master' into releases/1.6.x

mmetc · mmetc · commit 72b4354b1cc2 · 2025-02-10T11:28:28.000+01:00
diff --git a/pkg/cwhub/hub.go b/pkg/cwhub/hub.go
@@ -165,7 +165,9 @@ func (h *Hub) Update(ctx context.Context, indexProvider IndexProvider, withConte
 	}
 
 	if !downloaded {
-		fmt.Println("Nothing to do, the hub index is up to date.")
+		// use logger and the message will be silenced in the cron job
+		// (no mail if nothing happened)
+		h.logger.Info("Nothing to do, the hub index is up to date.")
 	}
 
 	return nil
diff --git a/test/bats/20_hub.bats b/test/bats/20_hub.bats
@@ -109,7 +109,8 @@ teardown() {
     rune -0 cscli hub update
     assert_output "Downloading $INDEX_PATH"
     rune -0 cscli hub update
-    assert_output "Nothing to do, the hub index is up to date."
+    refute_output
+    assert_stderr 'level=info msg="Nothing to do, the hub index is up to date."'
 }
 
 @test "cscli hub upgrade (up to date)" {

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,9 @@ func (h *Hub) Update(ctx context.Context, indexProvider IndexProvider, withConte`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`if !downloaded {`
`168`		`- fmt.Println("Nothing to do, the hub index is up to date.")`
	`168`	`+ // use logger and the message will be silenced in the cron job`
	`169`	`+ // (no mail if nothing happened)`
	`170`	`+ h.logger.Info("Nothing to do, the hub index is up to date.")`
`169`	`171`	`}`
`170`	`172`
`171`	`173`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,8 @@ teardown() {`
`109`	`109`	`rune -0 cscli hub update`
`110`	`110`	`assert_output "Downloading $INDEX_PATH"`
`111`	`111`	`rune -0 cscli hub update`
`112`		`- assert_output "Nothing to do, the hub index is up to date."`
	`112`	`+ refute_output`
	`113`	`+ assert_stderr 'level=info msg="Nothing to do, the hub index is up to date."'`
`113`	`114`	`}`
`114`	`115`
`115`	`116`	`@test "cscli hub upgrade (up to date)" {`