Skip to content

Conversation

@mpeddada1
Copy link
Collaborator

@mpeddada1 mpeddada1 commented Dec 29, 2025

Removes ClientOptions class. Also removes some deprecated storage Client constructors that use ClientOptions.
Note that the entire client_options.cc haven't been removed yet because:

  1. ApplyPolicies is still being used in client.h
  2. RestEndpoint and IamEndpoint are still used in google/cloud/storage/internal/rest/stub.cc

TODO: Add migration guide.

These will be removed in a follow-up PR.

@product-auto-label product-auto-label bot added the api: storage Issues related to the Cloud Storage API. label Dec 29, 2025
@gemini-code-assist
Copy link

Summary of Changes

Hello @mpeddada1, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request completes the deprecation process for the ClientOptions and ChannelOptions classes within the storage client library. It involves a comprehensive refactoring to migrate all client configuration and credential management to the unified google::cloud::Options class. This change simplifies the API, removes redundant code, and aligns the storage client with the broader google-cloud-cpp library's approach to option management. Some helper functions previously associated with ClientOptions remain in client_options.h for continued use, with their full removal planned for a subsequent PR.

Highlights

  • Removal of Deprecated Classes: The ClientOptions and ChannelOptions classes, previously marked as deprecated, have been entirely removed from the codebase.
  • Migration to Unified Options: All client configurations, including credentials, endpoints, and policy application, now exclusively utilize the more general google::cloud::Options class, streamlining option handling across the library.
  • Deprecated Constructor and Method Removal: Several Client constructors and static factory methods that relied on the old ClientOptions have been removed, simplifying the client's public interface.
  • Refactored Credential Handling: Functions related to OAuth2 credentials (e.g., AuthorizedUserCredentials, ServiceAccountCredentials, GoogleDefaultCredentials) have been updated to directly accept and use google::cloud::Options, eliminating the need for ChannelOptions.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request primarily focuses on removing the deprecated ClientOptions and ChannelOptions classes, transitioning the google::cloud::storage library to use the unified google::cloud::Options system. Key changes include deleting ClientOptions and ChannelOptions definitions and their associated methods and constructors across various client, connection, and credential-related files. The Client::CreateDefaultClient() static method was removed, and client initialization now directly uses google::cloud::Options. Credentials handling, specifically SigningEmail and SignBlobImpl, were updated to retrieve options from connection_->options() instead of connection_->client_options(). Test files were refactored to remove ClientOptions usage and related mocks. Review comments highlighted redundant header includes (google/cloud/storage/client_options.h and google/cloud/options.h) and a compilation error in an integration test due to a Client(Options{}) constructor returning Client instead of StatusOr<Client>, and incorrect pointer usage with UseClient.

Comment on lines +94 to 97
auto client = Client(Options{});
ASSERT_THAT(client, IsOk());
ASSERT_NO_FATAL_FAILURE(
UseClient(*client, bucket_name(), MakeRandomObjectName(), LoremIpsum()));

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

Client(Options{}) returns a Client object, not a StatusOr<Client>. The ASSERT_THAT(client, IsOk()) will not compile. Also, UseClient expects a Client, not a Client*.

  auto client = Client(Options{});
  ASSERT_NO_FATAL_FAILURE(
      UseClient(client, bucket_name(), MakeRandomObjectName(), LoremIpsum()));

#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_CLIENT_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_CLIENT_H

#include "google/cloud/storage/client_options.h"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This include seems unnecessary after the refactoring. The Client class no longer directly uses any types from client_options.h.

#include "google/cloud/internal/rest_options.h"
#include "google/cloud/internal/rest_response.h"
#include "google/cloud/opentelemetry_options.h"
#include "google/cloud/options.h"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The header google/cloud/storage/options.h already includes google/cloud/options.h, so this include is redundant.

#include "google/cloud/storage/options.h"
#include "google/cloud/completion_queue.h"
#include "google/cloud/future.h"
#include "google/cloud/options.h"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The header google/cloud/storage/options.h already includes google/cloud/options.h, so this include is redundant.

#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_GRPC_STUB_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_GRPC_STUB_H

#include "google/cloud/storage/client_options.h"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This include seems unnecessary. The file does not appear to use any symbols from client_options.h.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

api: storage Issues related to the Cloud Storage API.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant