Update pin for 'grpc-google-iam-v1' to 0.12.3+. (googleapis#8647)

tseaver · web-flow · commit 4031007ebe36 · 2019-07-11T14:40:30.000-04:00
For pubsub / kms, also update the import of the 'IAMPolicy' stub, which is no longer exported from the same location. Supersedes: googleapis#8639 Supersedes: googleapis#8640 Closes: googleapis#8574 Closes: googleapis#8576 Closes: googleapis#8577 Closes: googleapis#8585 Closes: googleapis#8587 Closes: googleapis#8591 Closes: googleapis#8594 Closes: googleapis#8595 Closes: googleapis#8598
diff --git a/asset/setup.py b/asset/setup.py
@@ -30,7 +30,7 @@
 dependencies = [
     "google-api-core[grpc] >= 1.6.0, < 2.0.0dev",
     'enum34; python_version < "3.4"',
-    "grpc-google-iam-v1 >= 0.11.4, < 0.12dev",
+    "grpc-google-iam-v1 >= 0.12.3, < 0.13dev",
 ]
 
 # Setup boilerplate below this line.
diff --git a/bigtable/setup.py b/bigtable/setup.py
@@ -31,7 +31,7 @@
 dependencies = [
     'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
     "google-cloud-core >= 1.0.0, < 2.0dev",
-    'grpc-google-iam-v1 >= 0.11.4, < 0.12dev',
+    "grpc-google-iam-v1 >= 0.12.3, < 0.13dev",
 ]
 extras = {
 }
diff --git a/container/setup.py b/container/setup.py
@@ -30,7 +30,7 @@
 release_status = "Development Status :: 3 - Alpha"
 dependencies = [
     "google-api-core[grpc] >= 1.6.0, < 2.0.0dev",
-    "grpc-google-iam-v1 >= 0.11.4, < 0.12dev",
+    "grpc-google-iam-v1 >= 0.12.3, < 0.13dev",
 ]
 extras = {}
 
diff --git a/containeranalysis/setup.py b/containeranalysis/setup.py
@@ -26,7 +26,7 @@
 release_status = "Development Status :: 3 - Alpha"
 dependencies = [
     "google-api-core[grpc] >= 1.4.1, < 2.0.0dev",
-    "grpc-google-iam-v1 >= 0.11.1, < 0.12dev",
+    "grpc-google-iam-v1 >= 0.12.3, < 0.13dev",
     'enum34; python_version < "3.4"',
     "grafeas",
 ]
diff --git a/datacatalog/setup.py b/datacatalog/setup.py
@@ -29,7 +29,7 @@
 release_status = "Development Status :: 3 - Alpha"
 dependencies = [
     "google-api-core[grpc] >= 1.4.1, < 2.0.0dev",
-    "grpc-google-iam-v1 >= 0.11.4, < 0.12dev",
+    "grpc-google-iam-v1 >= 0.12.3, < 0.13dev",
     'enum34; python_version < "3.4"',
 ]
 
diff --git a/iot/setup.py b/iot/setup.py
@@ -23,7 +23,7 @@
 release_status = "Development Status :: 3 - Alpha"
 dependencies = [
     "google-api-core[grpc] >= 1.6.0, < 2.0.0dev",
-    "grpc-google-iam-v1 >= 0.11.4, < 0.12dev",
+    "grpc-google-iam-v1 >= 0.12.3, < 0.13dev",
     'enum34; python_version < "3.4"',
 ]
 
diff --git a/kms/google/cloud/kms_v1/gapic/transports/key_management_service_grpc_transport.py b/kms/google/cloud/kms_v1/gapic/transports/key_management_service_grpc_transport.py
@@ -18,7 +18,7 @@
 import google.api_core.grpc_helpers
 
 from google.cloud.kms_v1.proto import service_pb2_grpc
-from google.iam.v1 import iam_policy_pb2
+from google.iam.v1 import iam_policy_pb2_grpc as iam_policy_pb2
 
 
 class KeyManagementServiceGrpcTransport(object):
diff --git a/kms/setup.py b/kms/setup.py
@@ -25,7 +25,7 @@
 release_status = "Development Status :: 5 - Production/Stable"
 dependencies = [
     "google-api-core[grpc] >= 1.6.0, < 2.0.0dev",
-    "grpc-google-iam-v1 >= 0.11.4, < 0.12dev",
+    "grpc-google-iam-v1 >= 0.12.3, < 0.13dev",
     'enum34; python_version < "3.4"',
 ]
 
diff --git a/kms/synth.py b/kms/synth.py
@@ -39,6 +39,13 @@
 
 s.move(library, excludes=["README.rst", "setup.py", "nox*.py", "docs/**/*"])
 
+# Temporary fixup for 'grpc-google-iam-vi 0.12.4' (before generation).
+s.replace(
+    "google/cloud/kms_v1/gapic/transports/key_management_service_grpc_transport.py",
+    "from google.iam.v1 import iam_policy_pb2",
+    "from google.iam.v1 import iam_policy_pb2_grpc as iam_policy_pb2",
+)
+
 # ----------------------------------------------------------------------------
 # Add templated files
 # ----------------------------------------------------------------------------
diff --git a/pubsub/google/cloud/pubsub_v1/gapic/transports/publisher_grpc_transport.py b/pubsub/google/cloud/pubsub_v1/gapic/transports/publisher_grpc_transport.py
@@ -18,7 +18,7 @@
 import google.api_core.grpc_helpers
 
 from google.cloud.pubsub_v1.proto import pubsub_pb2_grpc
-from google.iam.v1 import iam_policy_pb2
+from google.iam.v1 import iam_policy_pb2_grpc as iam_policy_pb2
 
 
 class PublisherGrpcTransport(object):
diff --git a/pubsub/google/cloud/pubsub_v1/gapic/transports/subscriber_grpc_transport.py b/pubsub/google/cloud/pubsub_v1/gapic/transports/subscriber_grpc_transport.py
@@ -18,7 +18,7 @@
 import google.api_core.grpc_helpers
 
 from google.cloud.pubsub_v1.proto import pubsub_pb2_grpc
-from google.iam.v1 import iam_policy_pb2
+from google.iam.v1 import iam_policy_pb2_grpc as iam_policy_pb2
 
 
 class SubscriberGrpcTransport(object):
diff --git a/pubsub/setup.py b/pubsub/setup.py
@@ -30,7 +30,7 @@
 release_status = "Development Status :: 4 - Beta"
 dependencies = [
     "google-api-core[grpc] >= 1.12.0, < 2.0.0dev",
-    "grpc-google-iam-v1 >= 0.11.4, < 0.12dev",
+    "grpc-google-iam-v1 >= 0.12.3, < 0.13dev",
     'enum34; python_version < "3.4"',
 ]
 extras = {}
diff --git a/pubsub/synth.py b/pubsub/synth.py
@@ -167,6 +167,13 @@ def _merge_dict(d1, d2):
     """
 )
 
+# Temporary fixup for 'grpc-google-iam-vi 0.12.4' (before generation).
+s.replace(
+    "google/cloud/pubsub_v1/gapic/transports/*_grpc_transport.py",
+    "from google.iam.v1 import iam_policy_pb2",
+    "from google.iam.v1 import iam_policy_pb2_grpc as iam_policy_pb2",
+)
+
 # ----------------------------------------------------------------------------
 # Add templated files
 # ----------------------------------------------------------------------------
diff --git a/securitycenter/setup.py b/securitycenter/setup.py
@@ -25,7 +25,7 @@
 release_status = 'Development Status :: 3 - Alpha'
 dependencies = [
     'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',
-    'grpc-google-iam-v1 >= 0.11.4, < 0.12dev',
+    'grpc-google-iam-v1 >= 0.12.3, < 0.13dev',
     'enum34; python_version < "3.4"',
 ]
 
diff --git a/spanner/setup.py b/spanner/setup.py
@@ -31,7 +31,7 @@
 dependencies = [
     "google-api-core[grpc, grpcgcp] >= 1.4.1, < 2.0.0dev",
     "google-cloud-core >= 1.0.0, < 2.0dev",
-    "grpc-google-iam-v1 >= 0.11.4, < 0.12dev",
+    "grpc-google-iam-v1 >= 0.12.3, < 0.13dev",
 ]
 extras = {}
 
diff --git a/tasks/setup.py b/tasks/setup.py
@@ -25,7 +25,7 @@
 release_status = "Development Status :: 5 - Production/Stable"
 dependencies = [
     "google-api-core[grpc] >= 1.6.0, < 2.0.0dev",
-    "grpc-google-iam-v1 >= 0.11.4, < 0.12dev",
+    "grpc-google-iam-v1 >= 0.12.3, < 0.13dev",
     'enum34; python_version < "3.4"',
 ]
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`dependencies = [`
`31`	`31`	`"google-api-core[grpc] >= 1.6.0, < 2.0.0dev",`
`32`	`32`	`'enum34; python_version < "3.4"',`
`33`		`- "grpc-google-iam-v1 >= 0.11.4, < 0.12dev",`
	`33`	`+ "grpc-google-iam-v1 >= 0.12.3, < 0.13dev",`
`34`	`34`	`]`
`35`	`35`
`36`	`36`	`# Setup boilerplate below this line.`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`dependencies = [`
`32`	`32`	`'google-api-core[grpc] >= 1.6.0, < 2.0.0dev',`
`33`	`33`	`"google-cloud-core >= 1.0.0, < 2.0dev",`
`34`		`- 'grpc-google-iam-v1 >= 0.11.4, < 0.12dev',`
	`34`	`+ "grpc-google-iam-v1 >= 0.12.3, < 0.13dev",`
`35`	`35`	`]`
`36`	`36`	`extras = {`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`release_status = "Development Status :: 3 - Alpha"`
`27`	`27`	`dependencies = [`
`28`	`28`	`"google-api-core[grpc] >= 1.4.1, < 2.0.0dev",`
`29`		`- "grpc-google-iam-v1 >= 0.11.1, < 0.12dev",`
	`29`	`+ "grpc-google-iam-v1 >= 0.12.3, < 0.13dev",`
`30`	`30`	`'enum34; python_version < "3.4"',`
`31`	`31`	`"grafeas",`
`32`	`32`	`]`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`release_status = "Development Status :: 3 - Alpha"`
`30`	`30`	`dependencies = [`
`31`	`31`	`"google-api-core[grpc] >= 1.4.1, < 2.0.0dev",`
`32`		`- "grpc-google-iam-v1 >= 0.11.4, < 0.12dev",`
	`32`	`+ "grpc-google-iam-v1 >= 0.12.3, < 0.13dev",`
`33`	`33`	`'enum34; python_version < "3.4"',`
`34`	`34`	`]`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`release_status = "Development Status :: 3 - Alpha"`
`24`	`24`	`dependencies = [`
`25`	`25`	`"google-api-core[grpc] >= 1.6.0, < 2.0.0dev",`
`26`		`- "grpc-google-iam-v1 >= 0.11.4, < 0.12dev",`
	`26`	`+ "grpc-google-iam-v1 >= 0.12.3, < 0.13dev",`
`27`	`27`	`'enum34; python_version < "3.4"',`
`28`	`28`	`]`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`release_status = "Development Status :: 5 - Production/Stable"`
`26`	`26`	`dependencies = [`
`27`	`27`	`"google-api-core[grpc] >= 1.6.0, < 2.0.0dev",`
`28`		`- "grpc-google-iam-v1 >= 0.11.4, < 0.12dev",`
	`28`	`+ "grpc-google-iam-v1 >= 0.12.3, < 0.13dev",`
`29`	`29`	`'enum34; python_version < "3.4"',`
`30`	`30`	`]`
`31`	`31`