[WIP] Implement proper severity levels in pq_proto's ErrorResponse

proxy/src/auth/backend/link.rs

@@ -1,6 +1,6 @@
 use super::{AuthSuccess, NodeInfo};
 use crate::{auth, compute, error::UserFacingError, stream::PqStream, waiters};
-use pq_proto::{BeMessage as Be, BeParameterStatusMessage};
+use pq_proto::{BeMessage as Be, ParameterStatusMessage};
 use thiserror::Error;
 use tokio::io::{AsyncRead, AsyncWrite};
 use tracing::{info, info_span};
@@ -60,7 +60,7 @@ pub async fn handle_user(
         info!(parent: &span, "sending the auth URL to the user");
         client
             .write_message_noflush(&Be::AuthenticationOk)?
-            .write_message_noflush(&BeParameterStatusMessage::encoding())?
+            .write_message_noflush(&ParameterStatusMessage::encoding())?
             .write_message(&Be::NoticeResponse(&greeting))
             .await?;
 

proxy/src/auth/flow.rs

@@ -2,7 +2,7 @@
 
 use super::{AuthErrorImpl, PasswordHackPayload};
 use crate::{sasl, scram, stream::PqStream};
-use pq_proto::{BeAuthenticationSaslMessage, BeMessage, BeMessage as Be};
+use pq_proto::{BeMessage, BeMessage as Be, SaslMessage};
 use std::io;
 use tokio::io::{AsyncRead, AsyncWrite};
 
@@ -22,7 +22,7 @@ pub struct Scram<'a>(pub &'a scram::ServerSecret);
 impl AuthMethod for Scram<'_> {
     #[inline(always)]
     fn first_message(&self) -> BeMessage<'_> {
-        Be::AuthenticationSasl(BeAuthenticationSaslMessage::Methods(scram::METHODS))
+        Be::AuthenticationSasl(SaslMessage::Methods(scram::METHODS))
     }
 }
 

proxy/src/proxy.rs

@@ -257,12 +257,12 @@ impl<S: AsyncRead + AsyncWrite + Unpin + Send> Client<'_, S> {
         if !auth_result.reported_auth_ok {
             stream
                 .write_message_noflush(&Be::AuthenticationOk)?
-                .write_message_noflush(&BeParameterStatusMessage::encoding())?;
+                .write_message_noflush(&ParameterStatusMessage::encoding())?;
         }
 
         stream
             .write_message_noflush(&BeMessage::ParameterStatus(
-                BeParameterStatusMessage::ServerVersion(&db.version),
+                ParameterStatusMessage::ServerVersion(&db.version),
             ))?
             .write_message_noflush(&Be::BackendKeyData(cancel_key_data))?
             .write_message(&BeMessage::ReadyForQuery)

proxy/src/proxy/tests.rs

@@ -139,7 +139,7 @@ async fn dummy_proxy(
 
     stream
         .write_message_noflush(&Be::AuthenticationOk)?
-        .write_message_noflush(&BeParameterStatusMessage::encoding())?
+        .write_message_noflush(&ParameterStatusMessage::encoding())?
         .write_message(&BeMessage::ReadyForQuery)
         .await?;
 

proxy/src/sasl/messages.rs

@@ -1,7 +1,7 @@
 //! Definitions for SASL messages.
 
 use crate::parse::{split_at_const, split_cstr};
-use pq_proto::{BeAuthenticationSaslMessage, BeMessage};
+use pq_proto::{BeMessage, SaslMessage};
 
 /// SASL-specific payload of [`PasswordMessage`](pq_proto::FeMessage::PasswordMessage).
 #[derive(Debug)]
@@ -42,10 +42,9 @@ pub(super) enum ServerMessage<T> {
 
 impl<'a> ServerMessage<&'a str> {
     pub(super) fn to_reply(&self) -> BeMessage<'a> {
-        use BeAuthenticationSaslMessage::*;
         BeMessage::AuthenticationSasl(match self {
-            ServerMessage::Continue(s) => Continue(s.as_bytes()),
-            ServerMessage::Final(s) => Final(s.as_bytes()),
+            Self::Continue(s) => SaslMessage::Continue(s.as_bytes()),
+            Self::Final(s) => SaslMessage::Final(s.as_bytes()),
         })
     }
 }