From ba98e48c433bdec9d1d54cc8e01cc17e74f6cf27 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 28 Dec 2023 19:15:50 +0000
Subject: [PATCH 1/3] chore(deps): Bump google-cloud-pubsub from 0.21.0 to
 0.22.0

Bumps [google-cloud-pubsub](https://github.com/yoshidan/google-cloud-rust) from 0.21.0 to 0.22.0.
- [Release notes](https://github.com/yoshidan/google-cloud-rust/releases)
- [Commits](https://github.com/yoshidan/google-cloud-rust/commits)

---
updated-dependencies:
- dependency-name: google-cloud-pubsub
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock                                  | 32 +++++++++++++++------
 scripts/source/prepare_ci_pubsub/Cargo.toml |  2 +-
 src/connector/Cargo.toml                    |  2 +-
 src/risedevtool/Cargo.toml                  |  2 +-
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c4c882ea9bde3..398d3c29b4edf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4270,16 +4270,16 @@ dependencies = [
 
 [[package]]
 name = "google-cloud-gax"
-version = "0.16.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7324ffbab9043aecca2d0e9b9be04944d31565e15c06297fb8ff151b01a7705d"
+checksum = "8cb60314136e37de9e2a05ddb427b9c5a39c3d188de2e2f026c6af74425eef44"
 dependencies = [
  "google-cloud-token",
  "http 0.2.9",
  "thiserror",
  "tokio",
  "tokio-retry",
- "tonic 0.9.2",
+ "tonic 0.10.2",
  "tower",
  "tracing",
 ]
@@ -4295,6 +4295,17 @@ dependencies = [
  "tonic 0.9.2",
 ]
 
+[[package]]
+name = "google-cloud-googleapis"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db8a478015d079296167e3f08e096dc99cffc2cb50fa203dd38aaa9dd37f8354"
+dependencies = [
+ "prost 0.12.1",
+ "prost-types 0.12.1",
+ "tonic 0.10.2",
+]
+
 [[package]]
 name = "google-cloud-metadata"
 version = "0.4.0"
@@ -4308,17 +4319,17 @@ dependencies = [
 
 [[package]]
 name = "google-cloud-pubsub"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a501b632b606f8fdb36661d461cdd798db214117d1d433baa11f51dda4983870"
+checksum = "72c96d7e0fd07ecbce85bc8420bb7a049bb70ea74036e59fbee1a51deaa79216"
 dependencies = [
  "async-channel",
  "async-stream",
  "google-cloud-auth",
  "google-cloud-gax",
- "google-cloud-googleapis",
+ "google-cloud-googleapis 0.12.0",
  "google-cloud-token",
- "prost-types 0.11.9",
+ "prost-types 0.12.1",
  "thiserror",
  "tokio",
  "tokio-util",
@@ -7139,7 +7150,7 @@ name = "prepare_ci_pubsub"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "google-cloud-googleapis",
+ "google-cloud-googleapis 0.11.0",
  "google-cloud-pubsub",
  "madsim-tokio",
 ]
@@ -11516,6 +11527,7 @@ dependencies = [
  "axum",
  "base64 0.21.4",
  "bytes",
+ "flate2",
  "h2",
  "http 0.2.9",
  "http-body",
@@ -11524,12 +11536,16 @@ dependencies = [
  "percent-encoding",
  "pin-project",
  "prost 0.12.1",
+ "rustls",
+ "rustls-pemfile",
  "tokio",
+ "tokio-rustls",
  "tokio-stream",
  "tower",
  "tower-layer",
  "tower-service",
  "tracing",
+ "webpki-roots 0.25.2",
 ]
 
 [[package]]
diff --git a/scripts/source/prepare_ci_pubsub/Cargo.toml b/scripts/source/prepare_ci_pubsub/Cargo.toml
index 61c131ae85ef8..a8b3bebe1790b 100644
--- a/scripts/source/prepare_ci_pubsub/Cargo.toml
+++ b/scripts/source/prepare_ci_pubsub/Cargo.toml
@@ -13,7 +13,7 @@ normal = ["workspace-hack"]
 [dependencies]
 anyhow = "1"
 google-cloud-googleapis = { version = "0.11", features = ["pubsub"] }
-google-cloud-pubsub = "0.21"
+google-cloud-pubsub = "0.22"
 tokio = { version = "0.2", package = "madsim-tokio", features = [
     "rt",
     "rt-multi-thread",
diff --git a/src/connector/Cargo.toml b/src/connector/Cargo.toml
index 70eb4a0435ab3..39c90ce0b2889 100644
--- a/src/connector/Cargo.toml
+++ b/src/connector/Cargo.toml
@@ -54,7 +54,7 @@ futures = { version = "0.3", default-features = false, features = ["alloc"] }
 futures-async-stream = { workspace = true }
 gcp-bigquery-client = "0.18.0"
 glob = "0.3"
-google-cloud-pubsub = "0.21"
+google-cloud-pubsub = "0.22"
 http = "0.2"
 hyper = { version = "0.14", features = [
     "client",
diff --git a/src/risedevtool/Cargo.toml b/src/risedevtool/Cargo.toml
index b1573a86e165d..3b4acc0f9877e 100644
--- a/src/risedevtool/Cargo.toml
+++ b/src/risedevtool/Cargo.toml
@@ -20,7 +20,7 @@ clap = { version = "4", features = ["derive"] }
 console = "0.15"
 fs-err = "2.11.0"
 glob = "0.3"
-google-cloud-pubsub = "0.21"
+google-cloud-pubsub = "0.22"
 indicatif = "0.17"
 itertools = "0.12"
 rdkafka = { workspace = true }

From 7a3af0226a72f192d5324921d5d160cb8768f42a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Thu, 28 Dec 2023 19:17:09 +0000
Subject: [PATCH 2/3] Fix "cargo-hakari"

---
 Cargo.lock                    | 31 +++++--------------------------
 src/workspace-hack/Cargo.toml |  5 ++---
 2 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 398d3c29b4edf..5d173bc2b3efe 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -756,7 +756,7 @@ dependencies = [
  "rustls",
  "rustls-native-certs",
  "rustls-pemfile",
- "rustls-webpki 0.101.7",
+ "rustls-webpki",
  "serde",
  "serde_json",
  "serde_nanos",
@@ -4644,7 +4644,7 @@ dependencies = [
  "rustls-native-certs",
  "tokio",
  "tokio-rustls",
- "webpki-roots 0.25.2",
+ "webpki-roots",
 ]
 
 [[package]]
@@ -7909,7 +7909,7 @@ dependencies = [
  "wasm-bindgen-futures",
  "wasm-streams",
  "web-sys",
- "webpki-roots 0.25.2",
+ "webpki-roots",
  "winreg",
 ]
 
@@ -9663,7 +9663,7 @@ checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c"
 dependencies = [
  "log",
  "ring 0.17.5",
- "rustls-webpki 0.101.7",
+ "rustls-webpki",
  "sct",
 ]
 
@@ -9688,16 +9688,6 @@ dependencies = [
  "base64 0.21.4",
 ]
 
-[[package]]
-name = "rustls-webpki"
-version = "0.100.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab"
-dependencies = [
- "ring 0.16.20",
- "untrusted 0.7.1",
-]
-
 [[package]]
 name = "rustls-webpki"
 version = "0.101.7"
@@ -11513,7 +11503,6 @@ dependencies = [
  "tower-layer",
  "tower-service",
  "tracing",
- "webpki-roots 0.23.1",
 ]
 
 [[package]]
@@ -11545,7 +11534,7 @@ dependencies = [
  "tower-layer",
  "tower-service",
  "tracing",
- "webpki-roots 0.25.2",
+ "webpki-roots",
 ]
 
 [[package]]
@@ -12111,15 +12100,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "webpki-roots"
-version = "0.23.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338"
-dependencies = [
- "rustls-webpki 0.100.2",
-]
-
 [[package]]
 name = "webpki-roots"
 version = "0.25.2"
@@ -12475,7 +12455,6 @@ dependencies = [
  "reqwest",
  "ring 0.16.20",
  "rust_decimal",
- "rustls",
  "scopeguard",
  "sea-orm",
  "sea-query",
diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml
index 7d43bb2a359f5..80ca5885a6491 100644
--- a/src/workspace-hack/Cargo.toml
+++ b/src/workspace-hack/Cargo.toml
@@ -109,7 +109,6 @@ regex-syntax = { version = "0.8" }
 reqwest = { version = "0.11", features = ["blocking", "json", "rustls-tls", "rustls-tls-native-roots", "stream"] }
 ring = { version = "0.16", features = ["std"] }
 rust_decimal = { version = "1", features = ["db-postgres", "maths"] }
-rustls = { version = "0.21" }
 scopeguard = { version = "1" }
 sea-orm = { version = "0.12", features = ["runtime-tokio-native-tls", "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite"] }
 sea-query = { version = "0.30", default-features = false, features = ["backend-mysql", "backend-postgres", "backend-sqlite", "derive", "hashable-value", "postgres-array", "thread-safe", "with-bigdecimal", "with-chrono", "with-json", "with-rust_decimal", "with-time", "with-uuid"] }
@@ -136,8 +135,8 @@ tokio-stream = { git = "https://github.com/madsim-rs/tokio.git", rev = "fe39bb8e
 tokio-util = { version = "0.7", features = ["codec", "io"] }
 toml_datetime = { version = "0.6", default-features = false, features = ["serde"] }
 toml_edit = { version = "0.19", features = ["serde"] }
-tonic-274715c4dabd11b0 = { package = "tonic", version = "0.9", features = ["gzip", "tls-webpki-roots"] }
-tonic-93f6ce9d446188ac = { package = "tonic", version = "0.10" }
+tonic-274715c4dabd11b0 = { package = "tonic", version = "0.9", features = ["gzip", "tls"] }
+tonic-93f6ce9d446188ac = { package = "tonic", version = "0.10", features = ["gzip", "tls-webpki-roots"] }
 tower = { version = "0.4", features = ["balance", "buffer", "filter", "limit", "load-shed", "timeout", "util"] }
 tracing = { version = "0.1", features = ["log"] }
 tracing-core = { version = "0.1" }

From c72a77fccbc52c81bb454e85b3e5810a4ec9c279 Mon Sep 17 00:00:00 2001
From: xxchan <xxchan22f@gmail.com>
Date: Mon, 1 Jan 2024 22:23:27 +0800
Subject: [PATCH 3/3] fix

---
 .github/dependabot.yml                        |  3 +++
 Cargo.lock                                    | 24 +++----------------
 scripts/source/prepare_ci_pubsub/Cargo.toml   |  2 +-
 src/connector/Cargo.toml                      |  2 +-
 .../src/source/google_pubsub/source/reader.rs |  2 +-
 src/workspace-hack/Cargo.toml                 | 15 ++++--------
 6 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index c4689affbb32b..39dd579aa3732 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -32,3 +32,6 @@ updates:
       patterns:
         - "mysql_common"
         - "mysql_async"
+    google-cloud:
+      patterns:
+        - "google-cloud*"
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 5d173bc2b3efe..0fe3d4948798a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4284,17 +4284,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "google-cloud-googleapis"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5453af21ac0cc1f3b2cfb5b687c174e701c10ec2d5c286aff7ca8cbbf08d31b4"
-dependencies = [
- "prost 0.11.9",
- "prost-types 0.11.9",
- "tonic 0.9.2",
-]
-
 [[package]]
 name = "google-cloud-googleapis"
 version = "0.12.0"
@@ -4327,7 +4316,7 @@ dependencies = [
  "async-stream",
  "google-cloud-auth",
  "google-cloud-gax",
- "google-cloud-googleapis 0.12.0",
+ "google-cloud-googleapis",
  "google-cloud-token",
  "prost-types 0.12.1",
  "thiserror",
@@ -7150,7 +7139,7 @@ name = "prepare_ci_pubsub"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "google-cloud-googleapis 0.11.0",
+ "google-cloud-googleapis",
  "google-cloud-pubsub",
  "madsim-tokio",
 ]
@@ -8522,7 +8511,7 @@ dependencies = [
  "tokio-retry",
  "tokio-stream",
  "tokio-util",
- "tonic 0.9.2",
+ "tonic 0.10.2",
  "tracing",
  "tracing-futures",
  "tracing-subscriber",
@@ -11479,12 +11468,10 @@ version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a"
 dependencies = [
- "async-stream",
  "async-trait",
  "axum",
  "base64 0.21.4",
  "bytes",
- "flate2",
  "futures-core",
  "futures-util",
  "h2",
@@ -11495,9 +11482,7 @@ dependencies = [
  "percent-encoding",
  "pin-project",
  "prost 0.11.9",
- "rustls-pemfile",
  "tokio",
- "tokio-rustls",
  "tokio-stream",
  "tower",
  "tower-layer",
@@ -12408,7 +12393,6 @@ dependencies = [
  "hmac",
  "hyper",
  "indexmap 1.9.3",
- "itertools 0.10.5",
  "itertools 0.11.0",
  "jni",
  "lazy_static",
@@ -12441,7 +12425,6 @@ dependencies = [
  "postgres-types",
  "proc-macro2",
  "prometheus",
- "prost 0.11.9",
  "prost 0.12.1",
  "prost-types 0.12.1",
  "quote",
@@ -12484,7 +12467,6 @@ dependencies = [
  "toml_datetime",
  "toml_edit 0.19.15",
  "tonic 0.10.2",
- "tonic 0.9.2",
  "tower",
  "tracing",
  "tracing-core",
diff --git a/scripts/source/prepare_ci_pubsub/Cargo.toml b/scripts/source/prepare_ci_pubsub/Cargo.toml
index a8b3bebe1790b..7c5f8ce89bfc8 100644
--- a/scripts/source/prepare_ci_pubsub/Cargo.toml
+++ b/scripts/source/prepare_ci_pubsub/Cargo.toml
@@ -12,7 +12,7 @@ normal = ["workspace-hack"]
 
 [dependencies]
 anyhow = "1"
-google-cloud-googleapis = { version = "0.11", features = ["pubsub"] }
+google-cloud-googleapis = { version = "0.12", features = ["pubsub"] }
 google-cloud-pubsub = "0.22"
 tokio = { version = "0.2", package = "madsim-tokio", features = [
     "rt",
diff --git a/src/connector/Cargo.toml b/src/connector/Cargo.toml
index 39c90ce0b2889..18811175608db 100644
--- a/src/connector/Cargo.toml
+++ b/src/connector/Cargo.toml
@@ -132,7 +132,7 @@ tokio-postgres = "0.7"
 tokio-retry = "0.3"
 tokio-stream = "0.1"
 tokio-util = { version = "0.7", features = ["codec", "io"] }
-tonic_0_9 = { package = "tonic", version = "0.9" }
+tonic = "0.10.2"
 tracing = "0.1"
 tracing-futures = { version = "0.2", features = ["futures-03"] }
 url = "2"
diff --git a/src/connector/src/source/google_pubsub/source/reader.rs b/src/connector/src/source/google_pubsub/source/reader.rs
index 8241e1657c496..1573bcfb759fd 100644
--- a/src/connector/src/source/google_pubsub/source/reader.rs
+++ b/src/connector/src/source/google_pubsub/source/reader.rs
@@ -19,7 +19,7 @@ use futures_async_stream::try_stream;
 use google_cloud_pubsub::client::Client;
 use google_cloud_pubsub::subscription::{SeekTo, Subscription};
 use risingwave_common::bail;
-use tonic_0_9::Code;
+use tonic::Code;
 
 use super::TaggedReceivedMessage;
 use crate::parser::ParserConfig;
diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml
index 80ca5885a6491..7893c3086d776 100644
--- a/src/workspace-hack/Cargo.toml
+++ b/src/workspace-hack/Cargo.toml
@@ -62,8 +62,7 @@ hashbrown-5ef9efb8ec2df382 = { package = "hashbrown", version = "0.12", features
 hmac = { version = "0.12", default-features = false, features = ["reset"] }
 hyper = { version = "0.14", features = ["full"] }
 indexmap = { version = "1", default-features = false, features = ["serde", "std"] }
-itertools-93f6ce9d446188ac = { package = "itertools", version = "0.10" }
-itertools-a6292c17cd707f01 = { package = "itertools", version = "0.11" }
+itertools = { version = "0.11" }
 jni = { version = "0.21", features = ["invocation"] }
 lazy_static = { version = "1", default-features = false, features = ["spin_no_std"] }
 lexical-core = { version = "0.8", features = ["format"] }
@@ -95,8 +94,7 @@ phf_shared = { version = "0.11", features = ["uncased"] }
 postgres-types = { version = "0.2", default-features = false, features = ["derive", "with-chrono-0_4", "with-serde_json-1"] }
 proc-macro2 = { version = "1", features = ["span-locations"] }
 prometheus = { version = "0.13", features = ["process"] }
-prost-5ef9efb8ec2df382 = { package = "prost", version = "0.12", features = ["no-recursion-limit"] }
-prost-a6292c17cd707f01 = { package = "prost", version = "0.11" }
+prost = { version = "0.12", features = ["no-recursion-limit"] }
 prost-types = { version = "0.12" }
 quote = { version = "1" }
 rand = { version = "0.8", features = ["small_rng"] }
@@ -135,8 +133,7 @@ tokio-stream = { git = "https://github.com/madsim-rs/tokio.git", rev = "fe39bb8e
 tokio-util = { version = "0.7", features = ["codec", "io"] }
 toml_datetime = { version = "0.6", default-features = false, features = ["serde"] }
 toml_edit = { version = "0.19", features = ["serde"] }
-tonic-274715c4dabd11b0 = { package = "tonic", version = "0.9", features = ["gzip", "tls"] }
-tonic-93f6ce9d446188ac = { package = "tonic", version = "0.10", features = ["gzip", "tls-webpki-roots"] }
+tonic = { version = "0.10", features = ["gzip", "tls-webpki-roots"] }
 tower = { version = "0.4", features = ["balance", "buffer", "filter", "limit", "load-shed", "timeout", "util"] }
 tracing = { version = "0.1", features = ["log"] }
 tracing-core = { version = "0.1" }
@@ -161,8 +158,7 @@ fixedbitset = { version = "0.4" }
 frunk_core = { version = "0.4", default-features = false, features = ["std"] }
 getrandom = { git = "https://github.com/madsim-rs/getrandom.git", rev = "e79a7ae", default-features = false, features = ["std"] }
 hashbrown-582f2526e08bb6a0 = { package = "hashbrown", version = "0.14", features = ["nightly", "raw"] }
-itertools-93f6ce9d446188ac = { package = "itertools", version = "0.10" }
-itertools-a6292c17cd707f01 = { package = "itertools", version = "0.11" }
+itertools = { version = "0.11" }
 lazy_static = { version = "1", default-features = false, features = ["spin_no_std"] }
 libc = { version = "0.2", features = ["extra_traits"] }
 log = { version = "0.4", default-features = false, features = ["kv_unstable", "std"] }
@@ -174,8 +170,7 @@ petgraph = { version = "0.6" }
 phf = { version = "0.11", features = ["uncased"] }
 phf_shared = { version = "0.11", features = ["uncased"] }
 proc-macro2 = { version = "1", features = ["span-locations"] }
-prost-5ef9efb8ec2df382 = { package = "prost", version = "0.12", features = ["no-recursion-limit"] }
-prost-a6292c17cd707f01 = { package = "prost", version = "0.11" }
+prost = { version = "0.12", features = ["no-recursion-limit"] }
 prost-types = { version = "0.12" }
 quote = { version = "1" }
 rand = { version = "0.8", features = ["small_rng"] }