Skip to content

fix: drop usage of distutils #541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Nov 2, 2023
Merged

fix: drop usage of distutils #541

Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e437ed6
fix: drop usage of distutils
parthea Oct 21, 2023
d42b5e7
lint
parthea Oct 21, 2023
3854b0e
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Oct 21, 2023
6a36b80
Merge branch 'drop-usage-of-distutils' of https://github.com/googleap…
gcf-owl-bot[bot] Oct 21, 2023
fde76a3
Merge branch 'main' into drop-usage-of-distutils
bcoe Nov 2, 2023
614150d
address review feedback
parthea Nov 2, 2023
897adf4
lint
parthea Nov 2, 2023
88fe052
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Nov 2, 2023
9cb58a9
Merge branch 'drop-usage-of-distutils' of https://github.com/googleap…
gcf-owl-bot[bot] Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions google/api_core/operations_v1/abstract_operations_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
# limitations under the License.
#
from collections import OrderedDict
from distutils import util
import os
import re
from typing import Dict, Optional, Sequence, Tuple, Type, Union
Expand Down Expand Up @@ -294,13 +293,14 @@ def __init__(
client_options = client_options_lib.ClientOptions()

# Create SSL credentials for mutual TLS if needed.
use_client_cert = bool(
util.strtobool(os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false"))
)

use_client_cert = os.getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false")
Copy link
Contributor

Choose a reason for hiding this comment

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

Might as well us lower() in this assignment so you don't have to repeat it below

(It would be great to cast this to a bool like the previous code was doing, but it seems like too much overhead for the very limited use in a very compact LOC range. The string comparison is OK.)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Fixed in 614150d

if use_client_cert.lower() not in ("true", "false"):
raise ValueError(
"Environment variable `GOOGLE_API_USE_CLIENT_CERTIFICATE` must be either `true` or `false`"
)
client_cert_source_func = None
is_mtls = False
if use_client_cert:
if use_client_cert.lower() == "true":
if client_options.client_cert_source:
is_mtls = True
client_cert_source_func = client_options.client_cert_source
Expand Down