From 4a38b626a624e1a1cc366447bd4a98c464911197 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Wed, 3 Jul 2019 05:29:54 -0700 Subject: [PATCH] [CHANGE ME] Re-generated kms to pick up changes in the API or client library generator. --- .../kms_v1/gapic/key_management_service_client.py | 11 ++++++++++- kms/noxfile.py | 6 +++--- kms/synth.metadata | 10 +++++----- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/kms/google/cloud/kms_v1/gapic/key_management_service_client.py b/kms/google/cloud/kms_v1/gapic/key_management_service_client.py index a5b8d0a82127..c5c63d737d2a 100644 --- a/kms/google/cloud/kms_v1/gapic/key_management_service_client.py +++ b/kms/google/cloud/kms_v1/gapic/key_management_service_client.py @@ -39,6 +39,7 @@ from google.cloud.kms_v1.proto import service_pb2 from google.cloud.kms_v1.proto import service_pb2_grpc from google.iam.v1 import iam_policy_pb2 +from google.iam.v1 import options_pb2 from google.iam.v1 import policy_pb2 from google.protobuf import field_mask_pb2 @@ -2361,6 +2362,7 @@ def set_iam_policy( def get_iam_policy( self, resource, + options_=None, retry=google.api_core.gapic_v1.method.DEFAULT, timeout=google.api_core.gapic_v1.method.DEFAULT, metadata=None, @@ -2381,6 +2383,11 @@ def get_iam_policy( Args: resource (str): REQUIRED: The resource for which the policy is being requested. See the operation documentation for the appropriate value for this field. + options_ (Union[dict, ~google.cloud.kms_v1.types.GetPolicyOptions]): OPTIONAL: A ``GetPolicyOptions`` object for specifying options to + ``GetIamPolicy``. This field is only used by Cloud IAM. + + If a dict is provided, it must be of the same form as the protobuf + message :class:`~google.cloud.kms_v1.types.GetPolicyOptions` retry (Optional[google.api_core.retry.Retry]): A retry object used to retry requests. If ``None`` is specified, requests will not be retried. @@ -2411,7 +2418,9 @@ def get_iam_policy( client_info=self._client_info, ) - request = iam_policy_pb2.GetIamPolicyRequest(resource=resource) + request = iam_policy_pb2.GetIamPolicyRequest( + resource=resource, options=options_ + ) if metadata is None: metadata = [] metadata = list(metadata) diff --git a/kms/noxfile.py b/kms/noxfile.py index f6257317fccd..a2eefbb6765f 100644 --- a/kms/noxfile.py +++ b/kms/noxfile.py @@ -24,7 +24,7 @@ LOCAL_DEPS = (os.path.join("..", "api_core"), os.path.join("..", "core")) - +BLACK_VERSION = "black==19.3b0" BLACK_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"] if os.path.exists("samples"): @@ -38,7 +38,7 @@ def lint(session): Returns a failure if the linters find linting errors or sufficiently serious code quality issues. """ - session.install("flake8", "black", *LOCAL_DEPS) + session.install("flake8", BLACK_VERSION, *LOCAL_DEPS) session.run("black", "--check", *BLACK_PATHS) session.run("flake8", "google", "tests") @@ -53,7 +53,7 @@ def blacken(session): That run uses an image that doesn't have 3.6 installed. Before updating this check the state of the `gcp_ubuntu_config` we use for that Kokoro run. """ - session.install("black") + session.install(BLACK_VERSION) session.run("black", *BLACK_PATHS) diff --git a/kms/synth.metadata b/kms/synth.metadata index 73c5ed8c11d1..20d9541dca1b 100644 --- a/kms/synth.metadata +++ b/kms/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-06-28T12:27:15.106812Z", + "updateTime": "2019-07-03T12:29:54.040791Z", "sources": [ { "generator": { "name": "artman", - "version": "0.29.2", - "dockerImage": "googleapis/artman@sha256:45263333b058a4b3c26a8b7680a2710f43eae3d250f791a6cb66423991dcb2df" + "version": "0.29.3", + "dockerImage": "googleapis/artman@sha256:8900f94a81adaab0238965aa8a7b3648791f4f3a95ee65adc6a56cfcc3753101" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "84c8ad4e52f8eec8f08a60636cfa597b86969b5c", - "internalRef": "255474859" + "sha": "69916b6ffbb7717fa009033351777d0c9909fb79", + "internalRef": "256241904" } }, {