sfe: Keep loading intervals in sync with promise, fix wording (#8500)

Small comments to keep these three areas of our code in sync. Small fix
to wording; not all of our limits are for a 1 week period.

Author: beautifulentropy

cmd/boulder-ra/main.go

@@ -274,6 +274,9 @@ func main() {
 			txnBuilder, err = ratelimits.NewTransactionBuilderFromFiles(c.RA.Limiter.Defaults, c.RA.Limiter.Overrides, scope, logger)
 		}
 		cmd.FailOnError(err, "Failed to create rate limits transaction builder")
+
+		// The 30 minute period here must be kept in sync with the promise
+		// (successCommentBody) made to requesters in sfe/overridesimporter.go
 		overrideRefresherShutdown := txnBuilder.NewRefresher(30 * time.Minute)
 		defer overrideRefresherShutdown()
 	}

cmd/boulder-wfe2/main.go

@@ -348,6 +348,9 @@ func main() {
 			txnBuilder, err = ratelimits.NewTransactionBuilderFromFiles(c.WFE.Limiter.Defaults, c.WFE.Limiter.Overrides, stats, logger)
 		}
 		cmd.FailOnError(err, "Failed to create rate limits transaction builder")
+
+		// The 30 minute period here must be kept in sync with the promise
+		// (successCommentBody) made to requesters in sfe/overridesimporter.go
 		overridesRefresherShutdown = txnBuilder.NewRefresher(30 * time.Minute)
 	}
 

sfe/overridesimporter.go

@@ -261,9 +261,14 @@ func (im *OverridesImporter) processTicket(ctx context.Context, ticketID int64,
 		return fmt.Errorf("override for rate limit %s and account/domain/IP: %s is administratively disabled", rateLimit, accountDomainOrIP)
 	}
 
+	// The "30 minutes" promised in the comment below must be kept in sync with
+	// the override reloading interval values (overrideRefresherShutdown) in:
+	//   - cmd/boulder-ra/main.go and
+	//   - cmd/boulder-wfe/main.go
 	successCommentBody := fmt.Sprintf(
 		"Your override request for rate limit %s and account/domain/IP: %s "+
-			"has been approved. Your new limit is %d per week. Please allow up to 30 minutes for this change to take effect.",
+			"has been approved. Your new limit is %d per period (see: https://letsencrypt.org/docs/rate-limits for the period). "+
+			"Please allow up to 30 minutes for this change to take effect.",
 		rateLimit, accountDomainOrIP, req.Count,
 	)
 

sfe/overridesimporter_test.go

@@ -158,7 +158,7 @@ func TestOverridesImporterProcessTicketHappyPath(t *testing.T) {
 			expectCount:                1000,
 			expectPeriod:               7 * 24 * time.Hour,
 			expectOrgComment:           "Acme Corp",
-			expectLastCommentSubstring: "has been approved. Your new limit is 1000 per week",
+			expectLastCommentSubstring: "has been approved. Your new limit is 1000 per period",
 		},
 		{
 			name: "CertificatesPerDomain with valid Registered Domain",
@@ -175,7 +175,7 @@ func TestOverridesImporterProcessTicketHappyPath(t *testing.T) {
 			expectCount:                300,
 			expectPeriod:               7 * 24 * time.Hour,
 			expectOrgComment:           "Acme Corp",
-			expectLastCommentSubstring: "has been approved. Your new limit is 300 per week",
+			expectLastCommentSubstring: "has been approved. Your new limit is 300 per period",
 		},
 		{
 			name: "CertificatesPerDomain with valid IPv4 Address",
@@ -192,7 +192,7 @@ func TestOverridesImporterProcessTicketHappyPath(t *testing.T) {
 			expectCount:                300,
 			expectPeriod:               7 * 24 * time.Hour,
 			expectOrgComment:           "Acme Corp",
-			expectLastCommentSubstring: "has been approved. Your new limit is 300 per week",
+			expectLastCommentSubstring: "has been approved. Your new limit is 300 per period",
 		},
 		{
 			name: "CertificatesPerDomain with valid IPv6",
@@ -207,7 +207,7 @@ func TestOverridesImporterProcessTicketHappyPath(t *testing.T) {
 			expectTier:      300, expectBurst: 300, expectCount: 300,
 			expectPeriod:               7 * 24 * time.Hour,
 			expectOrgComment:           "Acme Corp",
-			expectLastCommentSubstring: "has been approved. Your new limit is 300 per week",
+			expectLastCommentSubstring: "has been approved. Your new limit is 300 per period",
 		},
 		{
 			name: "CertificatesPerDomainPerAccount with valid Account URI",
@@ -224,7 +224,7 @@ func TestOverridesImporterProcessTicketHappyPath(t *testing.T) {
 			expectCount:                300,
 			expectPeriod:               7 * 24 * time.Hour,
 			expectOrgComment:           "Acme Corp",
-			expectLastCommentSubstring: "has been approved. Your new limit is 300 per week",
+			expectLastCommentSubstring: "has been approved. Your new limit is 300 per period",
 		},
 	}