fix tests; lint

.golangci.yml

@@ -387,3 +387,7 @@ issues:
     - linters:
         - nonamedreturns
       text: "named return .* with type .* found"
+
+    - linters:
+        - staticcheck
+      text: "csdaemon.NotifySystemd is deprecated: Use Notify instead."

pkg/cwhub/hub_test.go

@@ -72,5 +72,5 @@ func TestUpdateIndex(t *testing.T) {
 	hub.local.HubIndexFile = "/does/not/exist/index.json"
 
 	err = hub.updateIndex()
-	cstest.RequireErrorContains(t, err, "failed to write hub index: open /does/not/exist/index.json:")
+	cstest.RequireErrorContains(t, err, "failed to create temporary download file for /does/not/exist/index.json:")
 }

pkg/cwhub/iteminstall.go

@@ -58,15 +58,15 @@ func (i *Item) Install(force bool, downloadOnly bool) error {
 		return nil
 	}
 
+	if err := i.enable(); err != nil {
+		return fmt.Errorf("while enabling %s: %w", i.Name, err)
+	}
+
 	// a check on stdout is used while scripting to know if the hub has been upgraded
 	// and a configuration reload is required
 	// TODO: use a better way to communicate this
 	fmt.Printf("installed %s\n", i.Name)
 
-	if err := i.enable(); err != nil {
-		return fmt.Errorf("while enabling %s: %w", i.Name, err)
-	}
-
 	i.hub.logger.Infof("Enabled %s", i.Name)
 
 	return nil

pkg/cwhub/itemupgrade.go

@@ -17,8 +17,6 @@ import (
 
 // Upgrade downloads and applies the last version of the item from the hub.
 func (i *Item) Upgrade(force bool) (bool, error) {
-	updated := false
-
 	if i.State.IsLocal() {
 		i.hub.logger.Infof("not upgrading %s: local item", i.Name)
 		return false, nil
@@ -53,17 +51,16 @@ func (i *Item) Upgrade(force bool) (bool, error) {
 		if i.State.Tainted {
 			i.hub.logger.Warningf("%v %s is tainted, --force to overwrite", emoji.Warning, i.Name)
 		}
-	} else {
+		return false, nil
+	}
+
 	// a check on stdout is used while scripting to know if the hub has been upgraded
 	// and a configuration reload is required
 	// TODO: use a better way to communicate this
 	fmt.Printf("updated %s\n", i.Name)
 	i.hub.logger.Infof("%v %s: updated", emoji.Package, i.Name)
 
-		updated = true
-	}
-
-	return updated, nil
+	return true, nil
 }
 
 // downloadLatest downloads the latest version of the item to the hub directory.

test/bats/20_hub.bats

@@ -125,13 +125,19 @@ teardown() {
     assert_stderr --partial "Upgraded 0 contexts"
     assert_stderr --partial "Upgrading collections"
     assert_stderr --partial "Upgraded 0 collections"
+    assert_stderr --partial "Upgrading appsec-configs"
+    assert_stderr --partial "Upgraded 0 appsec-configs"
+    assert_stderr --partial "Upgrading appsec-rules"
+    assert_stderr --partial "Upgraded 0 appsec-rules"
+    assert_stderr --partial "Upgrading collections"
+    assert_stderr --partial "Upgraded 0 collections"
 
     rune -0 cscli parsers install crowdsecurity/syslog-logs
     rune -0 cscli hub upgrade
     assert_stderr --partial "crowdsecurity/syslog-logs: up-to-date"
 
     rune -0 cscli hub upgrade --force
-    assert_stderr --partial "crowdsecurity/syslog-logs: overwrite"
+    assert_stderr --partial "crowdsecurity/syslog-logs: up-to-date"
     assert_stderr --partial "crowdsecurity/syslog-logs: updated"
     assert_stderr --partial "Upgraded 1 parsers"
     # this is used by the cron script to know if the hub was updated

test/bats/20_hub_collections.bats

@@ -180,7 +180,6 @@ teardown() {
     assert_stderr --partial "error while installing 'crowdsecurity/sshd': while enabling crowdsecurity/sshd: crowdsecurity/sshd is tainted, won't enable unless --force"
 
     rune -0 cscli collections install crowdsecurity/sshd --force
-    assert_stderr --partial "crowdsecurity/sshd: overwrite"
     assert_stderr --partial "Enabled crowdsecurity/sshd"
 }
 

test/bats/20_hub_parsers.bats

@@ -180,7 +180,6 @@ teardown() {
     assert_stderr --partial "error while installing 'crowdsecurity/whitelists': while enabling crowdsecurity/whitelists: crowdsecurity/whitelists is tainted, won't enable unless --force"
 
     rune -0 cscli parsers install crowdsecurity/whitelists --force
-    assert_stderr --partial "crowdsecurity/whitelists: overwrite"
     assert_stderr --partial "Enabled crowdsecurity/whitelists"
 }
 

test/bats/20_hub_postoverflows.bats

@@ -180,7 +180,6 @@ teardown() {
     assert_stderr --partial "error while installing 'crowdsecurity/rdns': while enabling crowdsecurity/rdns: crowdsecurity/rdns is tainted, won't enable unless --force"
 
     rune -0 cscli postoverflows install crowdsecurity/rdns --force
-    assert_stderr --partial "crowdsecurity/rdns: overwrite"
     assert_stderr --partial "Enabled crowdsecurity/rdns"
 }
 

test/bats/20_hub_scenarios.bats

@@ -181,7 +181,6 @@ teardown() {
     assert_stderr --partial "error while installing 'crowdsecurity/ssh-bf': while enabling crowdsecurity/ssh-bf: crowdsecurity/ssh-bf is tainted, won't enable unless --force"
 
     rune -0 cscli scenarios install crowdsecurity/ssh-bf --force
-    assert_stderr --partial "crowdsecurity/ssh-bf: overwrite"
     assert_stderr --partial "Enabled crowdsecurity/ssh-bf"
 }