Add 'options_' argument to clients' 'get_iam_policy'; pin black version (via synth). (googleapis#8655)

yoshi-automation · tseaver · commit d426e6444000 · 2019-07-12T12:54:46.000-04:00
diff --git a/iot/google/cloud/iot_v1/gapic/device_manager_client.py b/iot/google/cloud/iot_v1/gapic/device_manager_client.py
@@ -38,6 +38,7 @@
 from google.cloud.iot_v1.proto import device_manager_pb2_grpc
 from google.cloud.iot_v1.proto import resources_pb2
 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 empty_pb2
 from google.protobuf import field_mask_pb2
@@ -1410,6 +1411,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,
@@ -1431,6 +1433,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.iot_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.iot_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.
@@ -1461,7 +1468,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/iot/google/cloud/iot_v1/types.py b/iot/google/cloud/iot_v1/types.py
@@ -23,6 +23,7 @@
 from google.cloud.iot_v1.proto import device_manager_pb2
 from google.cloud.iot_v1.proto import resources_pb2
 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 any_pb2
 from google.protobuf import empty_pb2
@@ -34,6 +35,7 @@
 
 _shared_modules = [
     iam_policy_pb2,
+    options_pb2,
     policy_pb2,
     any_pb2,
     empty_pb2,
diff --git a/iot/noxfile.py b/iot/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/iot/synth.metadata b/iot/synth.metadata
@@ -1,19 +1,19 @@
 {
-  "updateTime": "2019-06-28T12:25:43.889463Z",
+  "updateTime": "2019-07-12T12:24:41.528205Z",
   "sources": [
     {
       "generator": {
         "name": "artman",
-        "version": "0.29.2",
-        "dockerImage": "googleapis/artman@sha256:45263333b058a4b3c26a8b7680a2710f43eae3d250f791a6cb66423991dcb2df"
+        "version": "0.29.4",
+        "dockerImage": "googleapis/artman@sha256:63f21e83cb92680b7001dc381069e962c9e6dee314fd8365ac554c07c89221fb"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "84c8ad4e52f8eec8f08a60636cfa597b86969b5c",
-        "internalRef": "255474859"
+        "sha": "47bd0c2ba33c28dd624a65dad382e02bb61d1618",
+        "internalRef": "257690259"
       }
     },
     {

Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,19 @@`
`1`	`1`	`{`
`2`		`- "updateTime": "2019-06-28T12:25:43.889463Z",`
	`2`	`+ "updateTime": "2019-07-12T12:24:41.528205Z",`
`3`	`3`	`"sources": [`
`4`	`4`	`{`
`5`	`5`	`"generator": {`
`6`	`6`	`"name": "artman",`
`7`		`- "version": "0.29.2",`
`8`		`- "dockerImage": "googleapis/artman@sha256:45263333b058a4b3c26a8b7680a2710f43eae3d250f791a6cb66423991dcb2df"`
	`7`	`+ "version": "0.29.4",`
	`8`	`+ "dockerImage": "googleapis/artman@sha256:63f21e83cb92680b7001dc381069e962c9e6dee314fd8365ac554c07c89221fb"`
`9`	`9`	`}`
`10`	`10`	`},`
`11`	`11`	`{`
`12`	`12`	`"git": {`
`13`	`13`	`"name": "googleapis",`
`14`	`14`	`"remote": "https://github.com/googleapis/googleapis.git",`
`15`		`- "sha": "84c8ad4e52f8eec8f08a60636cfa597b86969b5c",`
`16`		`- "internalRef": "255474859"`
	`15`	`+ "sha": "47bd0c2ba33c28dd624a65dad382e02bb61d1618",`
	`16`	`+ "internalRef": "257690259"`
`17`	`17`	`}`
`18`	`18`	`},`
`19`	`19`	`{`