From 480d33e7ab1462c33e0d0126e018ece32c425371 Mon Sep 17 00:00:00 2001
From: Jason Harmon <jharmon@marathonus.com>
Date: Wed, 20 Jan 2021 13:16:02 -0500
Subject: [PATCH] Clean up loading logs

---
 rules/chaos.go                 | 2 +-
 rules/chaos_test.go            | 2 +-
 rules/container_status.go      | 2 +-
 rules/container_status_test.go | 2 +-
 rules/duration.go              | 2 +-
 rules/duration_test.go         | 2 +-
 rules/pod_status.go            | 2 +-
 rules/pod_status_test.go       | 2 +-
 rules/unready.go               | 2 +-
 rules/unready_test.go          | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/rules/chaos.go b/rules/chaos.go
index 3cf645c..eed172b 100644
--- a/rules/chaos.go
+++ b/rules/chaos.go
@@ -42,7 +42,7 @@ func (rule *chaos) load() (bool, string, error) {
 	if rule.chance != 0 {
 		return true, fmt.Sprintf("chaos chance %s", value), nil
 	}
-	return true, fmt.Sprint("chaos loaded explicitly"), nil
+	return true, fmt.Sprint("chaos (no default)"), nil
 }
 
 func (rule *chaos) ShouldReap(pod v1.Pod) (bool, string) {
diff --git a/rules/chaos_test.go b/rules/chaos_test.go
index 9200a6b..1913aa2 100644
--- a/rules/chaos_test.go
+++ b/rules/chaos_test.go
@@ -37,7 +37,7 @@ func TestChaosLoad(t *testing.T) {
 		os.Setenv(envExplicitLoad, ruleChaos)
 		loaded, message, err := (&chaos{}).load()
 		assert.NoError(t, err)
-		assert.Equal(t, "chaos loaded explicitly", message)
+		assert.Equal(t, "chaos (no default)", message)
 		assert.True(t, loaded)
 	})
 }
diff --git a/rules/container_status.go b/rules/container_status.go
index d6a166d..7c6540c 100644
--- a/rules/container_status.go
+++ b/rules/container_status.go
@@ -33,7 +33,7 @@ func (rule *containerStatus) load() (bool, string, error) {
 	if len(rule.reapStatuses) != 0 {
 		return true, fmt.Sprintf("container status in [%s]", value), nil
 	}
-	return true, "container status loaded explicitly", nil
+	return true, "container status (no default)", nil
 }
 
 func (rule *containerStatus) ShouldReap(pod v1.Pod) (bool, string) {
diff --git a/rules/container_status_test.go b/rules/container_status_test.go
index e6edae1..6e98076 100644
--- a/rules/container_status_test.go
+++ b/rules/container_status_test.go
@@ -70,7 +70,7 @@ func TestContainerStatusLoad(t *testing.T) {
 		os.Setenv(envExplicitLoad, containerStatusName)
 		loaded, message, err := (&containerStatus{}).load()
 		assert.NoError(t, err)
-		assert.Equal(t, "container status loaded explicitly", message)
+		assert.Equal(t, "container status (no default)", message)
 		assert.True(t, loaded)
 	})
 }
diff --git a/rules/duration.go b/rules/duration.go
index 58e2f62..4b957e1 100644
--- a/rules/duration.go
+++ b/rules/duration.go
@@ -36,7 +36,7 @@ func (rule *duration) load() (bool, string, error) {
 	if rule.duration != 0 {
 		return true, fmt.Sprintf("maximum run duration %s", value), nil
 	}
-	return true, fmt.Sprint("maximum run duration loaded explicitly"), nil
+	return true, fmt.Sprint("maximum run duration (no default)"), nil
 }
 
 func (rule *duration) ShouldReap(pod v1.Pod) (bool, string) {
diff --git a/rules/duration_test.go b/rules/duration_test.go
index 97d3dd7..6446570 100644
--- a/rules/duration_test.go
+++ b/rules/duration_test.go
@@ -48,7 +48,7 @@ func TestDurationLoad(t *testing.T) {
 		os.Setenv(envExplicitLoad, ruleDuration)
 		loaded, message, err := (&duration{}).load()
 		assert.NoError(t, err)
-		assert.Equal(t, "maximum run duration loaded explicitly", message)
+		assert.Equal(t, "maximum run duration (no default)", message)
 		assert.True(t, loaded)
 	})
 }
diff --git a/rules/pod_status.go b/rules/pod_status.go
index ef907a0..e5255eb 100644
--- a/rules/pod_status.go
+++ b/rules/pod_status.go
@@ -33,7 +33,7 @@ func (rule *podStatus) load() (bool, string, error) {
 	if len(rule.reapStatuses) != 0 {
 		return true, fmt.Sprintf("pod status in [%s]", value), nil
 	}
-	return true, "pod status loaded explicitly", nil
+	return true, "pod status (no default)", nil
 }
 
 func (rule *podStatus) ShouldReap(pod v1.Pod) (bool, string) {
diff --git a/rules/pod_status_test.go b/rules/pod_status_test.go
index 61c4599..eb74f7f 100644
--- a/rules/pod_status_test.go
+++ b/rules/pod_status_test.go
@@ -49,7 +49,7 @@ func TestPodStatusLoad(t *testing.T) {
 		os.Setenv(envExplicitLoad, podStatusName)
 		loaded, message, err := (&podStatus{}).load()
 		assert.NoError(t, err)
-		assert.Equal(t, "pod status loaded explicitly", message)
+		assert.Equal(t, "pod status (no default)", message)
 		assert.True(t, loaded)
 	})
 }
diff --git a/rules/unready.go b/rules/unready.go
index 145724e..7b72445 100644
--- a/rules/unready.go
+++ b/rules/unready.go
@@ -36,7 +36,7 @@ func (rule *unready) load() (bool, string, error) {
 	if rule.duration != 0 {
 		return true, fmt.Sprintf("maximum unready %s", value), nil
 	}
-	return true, fmt.Sprint("maximum unready duration loaded explicitly"), nil
+	return true, fmt.Sprint("maximum unready duration (no default)"), nil
 }
 
 func (rule *unready) ShouldReap(pod v1.Pod) (bool, string) {
diff --git a/rules/unready_test.go b/rules/unready_test.go
index c1aeec2..342b668 100644
--- a/rules/unready_test.go
+++ b/rules/unready_test.go
@@ -55,7 +55,7 @@ func TestUnreadyLoad(t *testing.T) {
 		os.Setenv(envExplicitLoad, ruleUnready)
 		loaded, message, err := (&unready{}).load()
 		assert.NoError(t, err)
-		assert.Equal(t, "maximum unready duration loaded explicitly", message)
+		assert.Equal(t, "maximum unready duration (no default)", message)
 		assert.True(t, loaded)
 	})
 }