Merge pull request #34331 from petrosagg/upgrade-pg-deps

*: update postgres dependencies

Author: petrosagg

Cargo.lock

@@ -89,7 +89,7 @@ smallvec = { version = "1.15.1", features = ["union"] }
 static_assertions = "1.1"
 timely = "0.25.1"
 tokio = { version = "1.48.0", features = ["rt", "time"] }
-tokio-postgres = { version = "0.7.8" }
+tokio-postgres = { version = "0.7.15" }
 tokio-stream = "0.1.17"
 tracing = "0.1.37"
 tracing-core = "0.1.35"

src/adapter/Cargo.toml

@@ -45,7 +45,7 @@ proxy-header = "0.1.2"
 semver = "1.0.27"
 tokio = { version = "1.48.0", default-features = false }
 tokio-openssl = "0.6.5"
-tokio-postgres = { version = "0.7.8" }
+tokio-postgres = { version = "0.7.15" }
 tokio-util = { version = "0.7.17", features = ["codec"] }
 tokio-metrics = "0.4.5"
 tower = "0.5.2"
@@ -57,7 +57,7 @@ workspace-hack = { version = "0.0.0", path = "../workspace-hack", optional = tru
 [dev-dependencies]
 mz-environmentd = { path = "../environmentd", default-features = false, features = ["test"] }
 mz-frontegg-mock = { path = "../frontegg-mock" }
-postgres = "0.19.5"
+postgres = "0.19.12"
 reqwest = "0.11.24"
 tempfile = "3.23.0"
 

src/balancerd/Cargo.toml

@@ -30,6 +30,7 @@ use mz_frontegg_auth::{
 };
 use mz_frontegg_mock::{FronteggMockServer, models::ApiToken, models::UserConfig};
 use mz_ore::cast::CastFrom;
+use mz_ore::error::ErrorExt;
 use mz_ore::id_gen::{conn_id_org_uuid, org_id_conn_bits};
 use mz_ore::metrics::MetricsRegistry;
 use mz_ore::now::SYSTEM_TIME;
@@ -234,7 +235,10 @@ async fn test_balancer() {
             .unwrap();
         let _ = cancel.cancel_query(tls).await;
         let e = pin!(copy).next().await.unwrap().unwrap_err();
-        assert_contains!(e.to_string(), "canceling statement due to user request");
+        assert_contains!(
+            e.to_string_with_causes(),
+            "canceling statement due to user request"
+        );
 
         // Various tests about reloading of certs.
 

src/balancerd/tests/server.rs

@@ -85,8 +85,8 @@ openssl-sys = { version = "0.9.108", features = ["vendored"] }
 opentelemetry = { version = "0.24.0", features = ["trace"] }
 opentelemetry_sdk = { version = "0.24.1", features = ["rt-tokio"] }
 pin-project = "1.1.10"
-postgres = { version = "0.19.5", optional = true }
-postgres-openssl = { version = "0.5.0", optional = true }
+postgres = { version = "0.19.12", optional = true }
+postgres-openssl = { version = "0.5.2", optional = true }
 prometheus = { version = "0.14.0", default-features = false }
 rdkafka-sys = { version = "4.3.0", features = [
     "cmake-build",
@@ -108,7 +108,7 @@ sysctl = "0.7.1"
 tempfile = "3.23.0"
 thiserror = "2.0.17"
 tokio = { version = "1.48.0", features = ["sync"] }
-tokio-postgres = { version = "0.7.8" }
+tokio-postgres = { version = "0.7.15" }
 tokio-stream = { version = "0.1.17", features = ["net"] }
 tokio-metrics = "0.4.5"
 tower = { version = "0.5.2", features = ["buffer", "limit", "load-shed"] }
@@ -145,8 +145,8 @@ mz-pgrepr = { path = "../pgrepr" }
 mz-pgtest = { path = "../pgtest" }
 mz-repr = { path = "../repr" }
 mz-sql-parser = { path = "../sql-parser" }
-postgres = { version = "0.19.5", features = ["with-chrono-0_4"] }
-postgres-protocol = { version = "0.6.5" }
+postgres = { version = "0.19.12", features = ["with-chrono-0_4"] }
+postgres-protocol = { version = "0.6.9" }
 postgres_array = { version = "0.11.0" }
 predicates = "3.1.3"
 proptest = { version = "1.7.0", default-features = false, features = ["std"] }
@@ -161,7 +161,7 @@ serde_json = "1.0.145"
 serde_urlencoded = "0.7.1"
 similar-asserts = "1.7"
 timely = "0.25.1"
-tokio-postgres = { version = "0.7.8", features = ["with-chrono-0_4"] }
+tokio-postgres = { version = "0.7.15", features = ["with-chrono-0_4"] }
 
 [build-dependencies]
 anyhow = "1.0.100"

src/environmentd/Cargo.toml

@@ -45,6 +45,7 @@ use mz_frontegg_auth::{
 use mz_frontegg_mock::{
     FronteggMockServer, models::ApiToken, models::TenantApiTokenConfig, models::UserConfig,
 };
+use mz_ore::error::ErrorExt;
 use mz_ore::metrics::MetricsRegistry;
 use mz_ore::now::{NowFn, SYSTEM_TIME};
 use mz_ore::retry::Retry;
@@ -1159,7 +1160,10 @@ async fn test_auth_base_require_tls_frontegg() {
                 ssl_mode: SslMode::Require,
                 configure: Box::new(|b| Ok(b.set_verify(SslVerifyMode::NONE))),
                 assert: Assert::Err(Box::new(|err| {
-                    assert_contains!(err.to_string(), "unauthorized login to user 'mz_system'");
+                    assert_contains!(
+                        err.to_string_with_causes(),
+                        "unauthorized login to user 'mz_system'"
+                    );
                 })),
             },
             TestCase::Http {
@@ -1192,7 +1196,10 @@ async fn test_auth_base_require_tls_frontegg() {
                 ssl_mode: SslMode::Require,
                 configure: Box::new(|b| Ok(b.set_verify(SslVerifyMode::NONE))),
                 assert: Assert::Err(Box::new(|err| {
-                    assert_contains!(err.to_string(), "unauthorized login to user 'mz_system'");
+                    assert_contains!(
+                        err.to_string_with_causes(),
+                        "unauthorized login to user 'mz_system'"
+                    );
                 })),
             },
             TestCase::Http {
@@ -1226,7 +1233,10 @@ async fn test_auth_base_require_tls_frontegg() {
                 ssl_mode: SslMode::Require,
                 configure: Box::new(|b| Ok(b.set_verify(SslVerifyMode::NONE))),
                 assert: Assert::Err(Box::new(|err| {
-                    assert_contains!(err.to_string(), "unauthorized login to user 'PUBLIC'");
+                    assert_contains!(
+                        err.to_string_with_causes(),
+                        "unauthorized login to user 'PUBLIC'"
+                    );
                 })),
             },
             TestCase::Http {
@@ -1304,7 +1314,7 @@ async fn test_auth_base_disable_tls() {
                 configure: Box::new(|_| Ok(())),
                 assert: Assert::Err(Box::new(|err| {
                     assert_eq!(
-                        err.to_string(),
+                        err.to_string_with_causes(),
                         "error performing TLS handshake: server does not support TLS",
                     )
                 })),
@@ -1331,7 +1341,10 @@ async fn test_auth_base_disable_tls() {
                 ssl_mode: SslMode::Disable,
                 configure: Box::new(|_| Ok(())),
                 assert: Assert::DbErr(Box::new(|err| {
-                    assert_contains!(err.to_string(), "unauthorized login to user 'mz_system'");
+                    assert_contains!(
+                        err.to_string_with_causes(),
+                        "unauthorized login to user 'mz_system'"
+                    );
                 })),
             },
         ],
@@ -1451,7 +1464,10 @@ async fn test_auth_base_require_tls() {
                 ssl_mode: SslMode::Prefer,
                 configure: Box::new(|b| Ok(b.set_verify(SslVerifyMode::NONE))),
                 assert: Assert::DbErr(Box::new(|err| {
-                    assert_contains!(err.to_string(), "unauthorized login to user 'mz_system'");
+                    assert_contains!(
+                        err.to_string_with_causes(),
+                        "unauthorized login to user 'mz_system'"
+                    );
                 })),
             },
         ],
@@ -1488,7 +1504,10 @@ async fn test_auth_intermediate_ca_no_intermediary() {
                 ssl_mode: SslMode::Require,
                 configure: Box::new(|b| b.set_ca_file(ca.ca_cert_path())),
                 assert: Assert::Err(Box::new(|err| {
-                    assert_contains!(err.to_string(), "unable to get local issuer certificate");
+                    assert_contains!(
+                        err.to_string_with_causes(),
+                        "unable to get local issuer certificate"
+                    );
                 })),
             },
             TestCase::Http {

src/environmentd/tests/auth.rs

@@ -19,6 +19,7 @@ use fallible_iterator::FallibleIterator;
 use mz_adapter::session::DEFAULT_DATABASE_NAME;
 use mz_environmentd::test_util::{self, PostgresErrorExt};
 use mz_ore::collections::CollectionExt;
+use mz_ore::error::ErrorExt;
 use mz_ore::retry::Retry;
 use mz_ore::{assert_err, assert_ok};
 use mz_pgrepr::{Numeric, Record};
@@ -40,7 +41,8 @@ fn test_bind_params() {
     match client.query("SELECT ROW(1, 2) = $1", &[&"(1,2)"]) {
         Ok(_) => panic!("query with invalid parameters executed successfully"),
         Err(err) => assert!(
-            err.to_string().contains("operator does not exist"),
+            err.to_string_with_causes()
+                .contains("operator does not exist"),
             "unexpected error: {err}"
         ),
     }