Address comment and make Perspective and RIR required in boulder-va

cmd/boulder-va/main.go

@@ -30,9 +30,7 @@ type RemoteVAGRPCClientConfig struct {
 	// Requirement 2.7 ("Multi-Perspective Issuance Corroboration attempts
 	// from each Network Perspective"). It should uniquely identify a group
 	// of RVAs deployed in the same datacenter.
-	//
-	// TODO(#7615): Make mandatory.
-	Perspective string `validate:"omitempty"`
+	Perspective string `validate:"required"`
 
 	// RIR indicates the Regional Internet Registry where this RVA is
 	// located. This field is used to identify the RIR region from which a
@@ -44,9 +42,7 @@ type RemoteVAGRPCClientConfig struct {
 	//   - APNIC
 	//   - LACNIC
 	//   - AFRINIC
-	//
-	// TODO(#7615): Make mandatory.
-	RIR string `validate:"omitempty,oneof=ARIN RIPE APNIC LACNIC AFRINIC"`
+	RIR string `validate:"required,oneof=ARIN RIPE APNIC LACNIC AFRINIC"`
 }
 
 type Config struct {

va/va.go

@@ -486,8 +486,7 @@ func (va *ValidationAuthorityImpl) performRemoteValidation(
 			}
 			if res.Perspective != rva.Perspective || res.Rir != rva.RIR {
 				err = fmt.Errorf(
-					"Remote VA %q.PerformValidation result included mismatched Perspective remote=[%q] local=[%q] and/or RIR remote=[%q] local=[%q]",
-					rva.Perspective, res.Perspective, rva.Perspective, res.Rir, rva.RIR,
+					"Expected perspective %q (%q) but got reply from %q (%q) - misconfiguration likely", rva.Perspective, rva.RIR, res.Perspective, res.Rir,
 				)
 				responses <- &response{rva.Address, rva.Perspective, rva.RIR, res, err}
 				return