fix: restore grpc-google-iam-v1 dependency when api.has_iam_mixin is True (#1631)

* fix: restore grpc-google-iam-v1 dependency when api.has_iam_mixin is True

* add IAM dependency to eventarc golden files

* address review comments

* clean up

* style

* style

Author: parthea

packages/gapic-generator/gapic/schema/api.py

@@ -489,7 +489,9 @@ def gapic_metadata_json(self, options: Options) -> str:
         return MessageToJson(self.gapic_metadata(options), sort_keys=True)
 
     def requires_package(self, pkg: Tuple[str, ...]) -> bool:
-        return any(
+        pkg_has_iam_mixin = self.has_iam_mixin and \
+            pkg == ('google', 'iam', 'v1')
+        return pkg_has_iam_mixin or any(
             message.ident.package == pkg
             for proto in self.all_protos.values()
             for message in proto.all_messages.values()

packages/gapic-generator/tests/integration/BUILD.bazel

@@ -11,6 +11,11 @@ load(
     "golden_update",
     "integration_test",
 )
+load(
+    "@com_github_grpc_grpc//bazel:python_rules.bzl",
+    "py_proto_library",
+)
+
 load("@rules_proto//proto:defs.bzl", "proto_library")
 
 package(default_visibility = ["//visibility:public"])
@@ -81,6 +86,11 @@ py_test(
     ],
 )
 
+py_proto_library(
+    name = "iam_policy_py_proto",
+    deps = ["@com_google_googleapis//google/iam/v1:iam_policy_proto"],
+)
+
 # Eventarc.
 py_gapic_library(
     name = "eventarc_py_gapic",
@@ -91,7 +101,9 @@ py_gapic_library(
         "python-gapic-name=eventarc",
         "autogen-snippets",
     ],
+    service_yaml = "eventarc_v1.yaml",
     transport = "grpc+rest",
+    deps = [":iam_policy_py_proto"]
 )
 
 py_test(

packages/gapic-generator/tests/integration/eventarc_v1.yaml

@@ -0,0 +1,9 @@
+type: google.api.Service
+config_version: 3
+name: eventarc.googleapis.com
+title: Eventarc API
+
+apis:
+- name: google.cloud.eventarc.v1.Eventarc
+- name: google.cloud.location.Locations
+- name: google.iam.v1.IAMPolicy

packages/gapic-generator/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/services/eventarc/async_client.py

@@ -38,6 +38,9 @@
 from google.cloud.eventarc_v1.types import eventarc
 from google.cloud.eventarc_v1.types import trigger
 from google.cloud.eventarc_v1.types import trigger as gce_trigger
+from google.cloud.location import locations_pb2 # type: ignore
+from google.iam.v1 import iam_policy_pb2  # type: ignore
+from google.iam.v1 import policy_pb2  # type: ignore
 from google.protobuf import field_mask_pb2  # type: ignore
 from google.protobuf import timestamp_pb2  # type: ignore
 from .transports.base import EventarcTransport, DEFAULT_CLIENT_INFO

packages/gapic-generator/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/services/eventarc/client.py

@@ -41,6 +41,9 @@
 from google.cloud.eventarc_v1.types import eventarc
 from google.cloud.eventarc_v1.types import trigger
 from google.cloud.eventarc_v1.types import trigger as gce_trigger
+from google.cloud.location import locations_pb2 # type: ignore
+from google.iam.v1 import iam_policy_pb2  # type: ignore
+from google.iam.v1 import policy_pb2  # type: ignore
 from google.protobuf import field_mask_pb2  # type: ignore
 from google.protobuf import timestamp_pb2  # type: ignore
 from .transports.base import EventarcTransport, DEFAULT_CLIENT_INFO
@@ -1053,6 +1056,9 @@ def __exit__(self, type, value, traceback):
 
 
 
+
+
+
 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(gapic_version=package_version.__version__)
 
 

packages/gapic-generator/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/services/eventarc/transports/base.py

@@ -29,6 +29,9 @@
 
 from google.cloud.eventarc_v1.types import eventarc
 from google.cloud.eventarc_v1.types import trigger
+from google.cloud.location import locations_pb2 # type: ignore
+from google.iam.v1 import iam_policy_pb2  # type: ignore
+from google.iam.v1 import policy_pb2  # type: ignore
 from google.longrunning import operations_pb2  # type: ignore
 
 DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(gapic_version=package_version.__version__)

packages/gapic-generator/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/services/eventarc/transports/grpc.py

@@ -27,6 +27,9 @@
 
 from google.cloud.eventarc_v1.types import eventarc
 from google.cloud.eventarc_v1.types import trigger
+from google.cloud.location import locations_pb2 # type: ignore
+from google.iam.v1 import iam_policy_pb2  # type: ignore
+from google.iam.v1 import policy_pb2  # type: ignore
 from google.longrunning import operations_pb2  # type: ignore
 from .base import EventarcTransport, DEFAULT_CLIENT_INFO
 

packages/gapic-generator/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/services/eventarc/transports/grpc_asyncio.py

@@ -27,6 +27,9 @@
 
 from google.cloud.eventarc_v1.types import eventarc
 from google.cloud.eventarc_v1.types import trigger
+from google.cloud.location import locations_pb2 # type: ignore
+from google.iam.v1 import iam_policy_pb2  # type: ignore
+from google.iam.v1 import policy_pb2  # type: ignore
 from google.longrunning import operations_pb2  # type: ignore
 from .base import EventarcTransport, DEFAULT_CLIENT_INFO
 from .grpc import EventarcGrpcTransport

packages/gapic-generator/tests/integration/goldens/eventarc/google/cloud/eventarc_v1/services/eventarc/transports/rest.py

@@ -28,6 +28,9 @@
 
 from google.protobuf import json_format
 from google.api_core import operations_v1
+from google.iam.v1 import iam_policy_pb2  # type: ignore
+from google.iam.v1 import policy_pb2  # type: ignore
+from google.cloud.location import locations_pb2 # type: ignore
 from requests import __version__ as requests_version
 import dataclasses
 import re

packages/gapic-generator/tests/integration/goldens/eventarc/setup.py

@@ -40,6 +40,7 @@
     "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",
 ]
 url = "https://github.com/googleapis/python-eventarc"