diff --git a/google/cloud/network_services_v1/services/network_services/async_client.py b/google/cloud/network_services_v1/services/network_services/async_client.py index 0cc1bf8..c768838 100644 --- a/google/cloud/network_services_v1/services/network_services/async_client.py +++ b/google/cloud/network_services_v1/services/network_services/async_client.py @@ -200,7 +200,7 @@ def get_mtls_endpoint_and_cert_source( The API endpoint is determined in the following order: (1) if `client_options.api_endpoint` if provided, use the provided one. (2) if `GOOGLE_API_USE_CLIENT_CERTIFICATE` environment variable is "always", use the - default mTLS endpoint; if the environment variabel is "never", use the default API + default mTLS endpoint; if the environment variable is "never", use the default API endpoint; otherwise if client cert source exists, use the default mTLS endpoint, otherwise use the default API endpoint. diff --git a/google/cloud/network_services_v1/services/network_services/client.py b/google/cloud/network_services_v1/services/network_services/client.py index bdb2d05..22a6ad0 100644 --- a/google/cloud/network_services_v1/services/network_services/client.py +++ b/google/cloud/network_services_v1/services/network_services/client.py @@ -562,7 +562,7 @@ def get_mtls_endpoint_and_cert_source( The API endpoint is determined in the following order: (1) if `client_options.api_endpoint` if provided, use the provided one. (2) if `GOOGLE_API_USE_CLIENT_CERTIFICATE` environment variable is "always", use the - default mTLS endpoint; if the environment variabel is "never", use the default API + default mTLS endpoint; if the environment variable is "never", use the default API endpoint; otherwise if client cert source exists, use the default mTLS endpoint, otherwise use the default API endpoint. diff --git a/google/cloud/network_services_v1/types/grpc_route.py b/google/cloud/network_services_v1/types/grpc_route.py index 3ecf85c..202b808 100644 --- a/google/cloud/network_services_v1/types/grpc_route.py +++ b/google/cloud/network_services_v1/types/grpc_route.py @@ -122,6 +122,8 @@ class GrpcRoute(proto.Message): class MethodMatch(proto.Message): r"""Specifies a match against a method. + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: type_ (google.cloud.network_services_v1.types.GrpcRoute.MethodMatch.Type): Optional. Specifies how to match against the @@ -205,6 +207,9 @@ class RouteMatch(proto.Message): r"""Criteria for matching traffic. A RouteMatch will be considered to match when all supplied fields match. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: method (google.cloud.network_services_v1.types.GrpcRoute.MethodMatch): Optional. A gRPC method to match against. If @@ -282,6 +287,9 @@ class FaultInjectionPolicy(proto.Message): service. Similarly requests from clients can be aborted by for a percentage of requests. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: delay (google.cloud.network_services_v1.types.GrpcRoute.FaultInjectionPolicy.Delay): The specification for injecting delay to @@ -299,6 +307,9 @@ class Delay(proto.Message): r"""Specification of how client requests are delayed as part of fault injection before being sent to a destination. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: fixed_delay (google.protobuf.duration_pb2.Duration): Specify a fixed delay before forwarding the @@ -329,6 +340,9 @@ class Abort(proto.Message): r"""Specification of how client requests are aborted as part of fault injection before being sent to a destination. + + .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields + Attributes: http_status (int): The HTTP status code used to abort the diff --git a/samples/generated_samples/snippet_metadata_google.cloud.networkservices.v1.json b/samples/generated_samples/snippet_metadata_google.cloud.networkservices.v1.json index e2d6823..e3ddce6 100644 --- a/samples/generated_samples/snippet_metadata_google.cloud.networkservices.v1.json +++ b/samples/generated_samples/snippet_metadata_google.cloud.networkservices.v1.json @@ -8,7 +8,7 @@ ], "language": "PYTHON", "name": "google-cloud-network-services", - "version": "0.3.0" + "version": "0.1.0" }, "snippets": [ { diff --git a/setup.py b/setup.py index 6f9d098..6c4e33e 100644 --- a/setup.py +++ b/setup.py @@ -40,6 +40,7 @@ dependencies = [ "google-api-core[grpc] >= 1.34.0, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*,!=2.8.*,!=2.9.*,!=2.10.*", "proto-plus >= 1.22.0, <2.0.0dev", + "proto-plus >= 1.22.2, <2.0.0dev; python_version>='3.11'", "protobuf>=3.19.5,<5.0.0dev,!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5", "grpc-google-iam-v1 >= 0.12.4, < 1.0.0dev", ] @@ -80,6 +81,7 @@ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Operating System :: OS Independent", "Topic :: Internet", ], diff --git a/testing/constraints-3.12.txt b/testing/constraints-3.12.txt new file mode 100644 index 0000000..ad3f0fa --- /dev/null +++ b/testing/constraints-3.12.txt @@ -0,0 +1,7 @@ +# -*- coding: utf-8 -*- +# This constraints file is required for unit tests. +# List all library dependencies and extras in this file. +google-api-core +proto-plus +protobuf +grpc-google-iam-v1