fixed static code check issues

Author: lazou

pkg/notifications/notifier.go

@@ -95,9 +95,8 @@ func GetDelay(c *cobra.Command, legacyDelay time.Duration) time.Duration {
 	delay, _ := c.PersistentFlags().GetInt("notifications-delay")
 	if delay > 0 {
 		return time.Duration(delay) * time.Second
-	} else {
-		return time.Duration(0)
 	}
+	return time.Duration(0)
 }
 
 // GetTitle returns a common notification title with hostname appended

pkg/notifications/notifier_test.go

@@ -82,13 +82,13 @@ var _ = Describe("notifications", func() {
 			})
 		})
 		When("legacy delay and delay is defined", func() {
-			It("should use the specified legacy delay", func() {
+			It("should use the specified legacy delay and ignore the specified delay", func() {
 				command := cmd.NewRootCommand()
 				flags.RegisterNotificationFlags(command)
 
 				err := command.ParseFlags([]string{
 					"--notifications-delay",
-					"5",
+					"0",
 				})
 				Expect(err).NotTo(HaveOccurred())
 				delay := notifications.GetDelay(command, time.Duration(7)*time.Second)