From bd2a89f51a6afbc5059687025ea1a79eded5c29f Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 27 Jan 2026 19:38:37 -0500 Subject: [PATCH 1/4] cleanup: remove unused crates These crates were used to reserve crate names at crates.io. We have no plans to publish new versions, nor do we plan to update them. Meanwhile, we need to constantly skip them in our tools. If we need the directories again they are easy enough to create in a test branch or a temporary directory. --- .gcb/scripts/docs-rs.sh | 5 +++-- .gcb/scripts/workspace-minimal-versions.sh | 2 +- Cargo.lock | 8 -------- Cargo.toml | 4 ---- librarian.yaml | 4 +--- src/base/Cargo.toml | 24 ---------------------- src/base/README.md | 4 ---- src/base/src/main.rs | 17 --------------- src/root/Cargo.toml | 24 ---------------------- src/root/README.md | 8 -------- src/root/src/main.rs | 17 --------------- tools/cmd/docfx/main.go | 2 +- 12 files changed, 6 insertions(+), 113 deletions(-) delete mode 100644 src/base/Cargo.toml delete mode 100644 src/base/README.md delete mode 100644 src/base/src/main.rs delete mode 100644 src/root/Cargo.toml delete mode 100644 src/root/README.md delete mode 100644 src/root/src/main.rs diff --git a/.gcb/scripts/docs-rs.sh b/.gcb/scripts/docs-rs.sh index ef5bef6f80..a5ac8834fc 100755 --- a/.gcb/scripts/docs-rs.sh +++ b/.gcb/scripts/docs-rs.sh @@ -21,9 +21,10 @@ cargo install --locked cargo-workspaces cargo version rustup show active-toolchain -v -packages=($(cargo workspaces plan 2>/dev/null | head -20)) +mapfile -t all_packages < <(cargo workspaces plan 2>/dev/null') +packages=("${all_packages[@]:0:20}") if [[ "${TRIGGER_NAME:-}" == "gcb-pm-*" ]]; then - packages=($(cargo workspaces plan 2>/dev/null | grep -v gcp-sdk)) + packages=("${all_packages[@]}") fi for package in "${packages[@]}"; do diff --git a/.gcb/scripts/workspace-minimal-versions.sh b/.gcb/scripts/workspace-minimal-versions.sh index 15b65e84b6..9378cac3a0 100755 --- a/.gcb/scripts/workspace-minimal-versions.sh +++ b/.gcb/scripts/workspace-minimal-versions.sh @@ -22,7 +22,7 @@ rustup show active-toolchain -v set -e echo "Prepare workspace to run minimal version tool." cargo run --release --package minimal-version-helper prepare -for PKG in $(cargo workspaces plan | grep -v gcp-sdk); do +for PKG in $(cargo workspaces plan 2>/dev/null); do cargo minimal-versions check -p ${PKG} --all-features done echo "==== DONE ====" diff --git a/Cargo.lock b/Cargo.lock index bd8b42cc69..e3796a1221 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -880,10 +880,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "gcp-sdk" -version = "0.0.0" - [[package]] name = "generic-array" version = "0.14.9" @@ -1561,10 +1557,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "google-cloud-base" -version = "0.0.0" - [[package]] name = "google-cloud-beyondcorp-appconnections-v1" version = "1.5.0" diff --git a/Cargo.toml b/Cargo.toml index 6c1a62310a..db781e8bb6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,6 @@ resolver = "2" default-members = [ "guide/samples", "src/auth", - "src/base", "src/bigquery", "src/bigtable", "src/datastore", @@ -27,7 +26,6 @@ default-members = [ "src/gax-internal", "src/lro", "src/pubsub", - "src/root", "src/spanner", "src/storage", "src/wkt", @@ -46,7 +44,6 @@ default-members = [ members = [ "guide/samples", "src/auth", - "src/base", "src/bigquery", "src/bigtable", "src/datastore", @@ -266,7 +263,6 @@ members = [ "src/lro", "src/pubsub", "src/pubsub/examples", - "src/root", "src/spanner", "src/storage", "src/storage/benchmarks/random", diff --git a/librarian.yaml b/librarian.yaml index 3f94733c0a..9c46fb998c 100644 --- a/librarian.yaml +++ b/librarian.yaml @@ -413,9 +413,7 @@ libraries: - name: google-cloud-baremetalsolution-v2 version: 1.4.0 copyright_year: "2025" - - name: google-cloud-base - copyright_year: "2025" - output: src/base + veneer: true - name: google-cloud-beyondcorp-appconnections-v1 version: 1.5.0 diff --git a/src/base/Cargo.toml b/src/base/Cargo.toml deleted file mode 100644 index cd7dadd542..0000000000 --- a/src/base/Cargo.toml +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -[package] -name = "google-cloud-base" -version = "0.0.0" -description = "Google Cloud Client Libraries for Rust" -edition.workspace = true -authors.workspace = true -license.workspace = true -repository.workspace = true -keywords.workspace = true -categories.workspace = true diff --git a/src/base/README.md b/src/base/README.md deleted file mode 100644 index 77e9444b6a..0000000000 --- a/src/base/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# Google Cloud Client Libraries for Rust - -The Client Libraries for Rust are under active development. We are creating -placeholder crates so we can reference them in our code and tooling. diff --git a/src/base/src/main.rs b/src/base/src/main.rs deleted file mode 100644 index 8a2c5850da..0000000000 --- a/src/base/src/main.rs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2024 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -fn main() { - println!("Coming Soon: Google Cloud Client Libraries for Rust") -} diff --git a/src/root/Cargo.toml b/src/root/Cargo.toml deleted file mode 100644 index 72c0b9ac21..0000000000 --- a/src/root/Cargo.toml +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -[package] -name = "gcp-sdk" -version = "0.0.0" -description = "Google Cloud Client Libraries for Rust" -edition.workspace = true -authors.workspace = true -license.workspace = true -repository.workspace = true -keywords.workspace = true -categories.workspace = true diff --git a/src/root/README.md b/src/root/README.md deleted file mode 100644 index 849f06c3b3..0000000000 --- a/src/root/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# Google Cloud Client Libraries for Rust - -[Root crate] for all Google Cloud SDK crates. - -The Client Libraries for Rust are under active development. We are creating -placeholder crates so we can reference them in our code and tooling. - -[root crate]: https://rust-lang.github.io/rfcs/3243-packages-as-optional-namespaces.html diff --git a/src/root/src/main.rs b/src/root/src/main.rs deleted file mode 100644 index 8a2c5850da..0000000000 --- a/src/root/src/main.rs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2024 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -fn main() { - println!("Coming Soon: Google Cloud Client Libraries for Rust") -} diff --git a/tools/cmd/docfx/main.go b/tools/cmd/docfx/main.go index cda42f5cc8..5bea44c624 100644 --- a/tools/cmd/docfx/main.go +++ b/tools/cmd/docfx/main.go @@ -42,7 +42,7 @@ import ( ) // crateDenyList enumerates the crates which do not get documents at cloud.google.com -var crateDenyList = []string{"gcp-sdk", "google-cloud-base", "google-cloud-gax-internal"} +var crateDenyList = []string{"google-cloud-gax-internal"} func main() { out := flag.String("out", "docfx", "Output directory within project-root (default docfx)") From 6c98435550e493e774cdf6e1b9e0d8f93d5f7220 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 27 Jan 2026 22:28:56 -0500 Subject: [PATCH 2/4] Fix typo in build script --- .gcb/scripts/docs-rs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gcb/scripts/docs-rs.sh b/.gcb/scripts/docs-rs.sh index a5ac8834fc..a8bfd5481f 100755 --- a/.gcb/scripts/docs-rs.sh +++ b/.gcb/scripts/docs-rs.sh @@ -21,7 +21,7 @@ cargo install --locked cargo-workspaces cargo version rustup show active-toolchain -v -mapfile -t all_packages < <(cargo workspaces plan 2>/dev/null') +mapfile -t all_packages < <(cargo workspaces plan 2>/dev/null) packages=("${all_packages[@]:0:20}") if [[ "${TRIGGER_NAME:-}" == "gcb-pm-*" ]]; then packages=("${all_packages[@]}") From 5a13b96f7efa6712f2ba6aaf6b8c32c29020674a Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 27 Jan 2026 22:30:07 -0500 Subject: [PATCH 3/4] Fix formatting --- librarian.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/librarian.yaml b/librarian.yaml index 9c46fb998c..9764d647ce 100644 --- a/librarian.yaml +++ b/librarian.yaml @@ -413,7 +413,6 @@ libraries: - name: google-cloud-baremetalsolution-v2 version: 1.4.0 copyright_year: "2025" - veneer: true - name: google-cloud-beyondcorp-appconnections-v1 version: 1.5.0 From c51bf93750055f72930972bcb7901ce0912dd465 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 27 Jan 2026 22:48:01 -0500 Subject: [PATCH 4/4] Argh, missed a line when removing google-cloud-base --- librarian.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/librarian.yaml b/librarian.yaml index 9764d647ce..7f0cc6d3f8 100644 --- a/librarian.yaml +++ b/librarian.yaml @@ -413,7 +413,6 @@ libraries: - name: google-cloud-baremetalsolution-v2 version: 1.4.0 copyright_year: "2025" - veneer: true - name: google-cloud-beyondcorp-appconnections-v1 version: 1.5.0 copyright_year: "2025"