backport of commit 142b9d6

Author: markcampv

agent/consul/catalog_endpoint.go

@@ -202,7 +202,7 @@ func servicePreApply(service *structs.NodeService, authz resolver.Result, authzC
 	}
 	// Check if service name and service ID are empty.
 	if service.ID == "" && service.Service == "" {
-		return fmt.Errorf("Must provide service name (Service.Service)")
+		return fmt.Errorf("service name (Service.Service) is required; both Service ID (Service.ID) and Service Name cannot be empty")
 	}
 
 	// If no service id, but service name, use default

agent/consul/catalog_endpoint_test.go

@@ -334,7 +334,7 @@ func TestCatalog_Register_RejectsMissingServiceName(t *testing.T) {
 	var out struct{}
 	err := msgpackrpc.CallWithCodec(codec, "Catalog.Register", &args, &out)
 	require.Error(t, err)
-	require.Contains(t, err.Error(), "Must provide service name (Service.Service)")
+	require.Contains(t, err.Error(), "service name (Service.Service) is required; both Service ID (Service.ID) and Service Name cannot be empty")
 }
 func TestCatalog_Register_ForwardLeader(t *testing.T) {
 	if testing.Short() {