Log a refused wording without what it quotes, and keep the secret-given words within bounds

The reviewer found that the logged reason quoted the refused fragment: a
hash-shaped secret would reach the journal, and a changing clock time
defeated the once-per-kind dedupe. The reason is now logged without its
quoted fragment, the test resets the dedupe so it repeats, and a module
name too long for the headline falls back to the machine.

cmd/mesh-controller/desk_secret.go

@@ -228,9 +228,16 @@ const kindSecretGiven = "secret-given"
 func secretGivenObservation(node, module, name, how string, at time.Time) conditions.Observation {
 	key := node + "." + module + "." + name
 	where := module + " on " + node
+	// Within the bounds whatever the names' length: the module and machine, else the module, else the machine.
 	headline := "New secret given for " + where
-	if len(headline) > conditions.HeadlineMax {
-		headline = "New secret given for " + module
+	for _, h := range []string{"New secret given for " + module, "New secret given on " + node} {
+		if len(headline) > conditions.HeadlineMax {
+			headline = h
+		}
+	}
+	resolved := "You saw that " + module + " was given a new secret"
+	if len(resolved) > conditions.HeadlineMax+20 {
+		resolved = "You saw that a new secret was given on " + node
 	}
 	return conditions.Observation{Scope: conditions.ScopeMachine, ID: key, Token: kindSecretGiven, Kind: kindSecretGiven,
 		Machine: node, Severity: conditions.Urgent, Source: kindSecretGiven,
@@ -240,7 +247,7 @@ func secretGivenObservation(node, module, name, how string, at time.Time) condit
 		Explanation: fmt.Sprintf("The secret %s of %s was given %s. If you gave it, nothing else is needed. If you "+
 			"did not, somebody else now holds what %s acts with.", secretNameWords(name), where, how, module),
 		Needs:    "silence this if you just gave it; if you did not, give it again yourself so that only you hold it.",
-		Resolved: "You saw that " + module + " was given a new secret",
+		Resolved: resolved,
 		Actions:  []conditions.Action{conditions.SilenceAction(conditions.Key(conditions.ScopeMachine, key, kindSecretGiven))}}
 }
 

cmd/mesh-controller/desk_secret_test.go

@@ -215,11 +215,14 @@ func TestTheSecretGivenConditionSaysItselfInPlainWords(t *testing.T) {
 			t.Error("the words carry the value")
 		}
 	}
-	// A long module name keeps the headline within its bound.
-	o := secretGivenObservation("anchor", "a-module-with-a-rather-long-name-indeed", "api-key", "at the controller's terminal", at)
-	if why, ok := conditions.PlainWords(conditions.Words{Headline: o.Headline, Explanation: o.Explanation,
-		Resolved: o.Resolved, Needs: o.Needs, Actions: o.Actions}, o.Machine); !ok {
-		t.Errorf("a long module name: %s", why)
+	// A long module name keeps the headline and the resolved line within their bounds.
+	for _, module := range []string{"a-module-with-a-rather-long-name-indeed",
+		"a-module-with-a-name-so-long-that-no-headline-could-ever-hold-it"} {
+		o := secretGivenObservation("anchor", module, "api-key", "at the controller's terminal", at)
+		if why, ok := conditions.PlainWords(conditions.Words{Headline: o.Headline, Explanation: o.Explanation,
+			Resolved: o.Resolved, Needs: o.Needs, Actions: o.Actions}, o.Machine); !ok {
+			t.Errorf("the module %s: %s", module, why)
+		}
 	}
 }