fix(bazel): Re-enable Python µgen integration tests post monolith rule removal (#926)

* fix(bazel): Re-enable Python µgen integration tests post monolith rule removal

* fix: update googleapis hash

* fix: update asset goldens (due to googleapis hash update)

Author: miraleung

.github/workflows/tests.yaml

@@ -344,10 +344,8 @@ jobs:
         env:
           BAZEL_VERSION: 3.5.0
           BAZEL_BINARY: bazel_3.5.0-linux-x86_64.deb
-          # Temporarily disable integration tests due to a circular Bazel rule dependency.
-          # TODO(miraleung): Uncomment these once the monolith is gone from googleapis.
-          #- name: Integration Tests
-          #run: bazel test tests/integration:asset tests/integration:credentials tests/integration:logging tests/integration:redis
+      - name: Integration Tests
+        run: bazel test tests/integration:asset tests/integration:credentials tests/integration:logging tests/integration:redis
 
   style-check:
     runs-on: ubuntu-latest

repositories.bzl

@@ -65,8 +65,8 @@ def gapic_generator_python():
     _maybe(
         http_archive,
         name = "com_google_googleapis",
-        strip_prefix = "googleapis-51fe6432d4076a4c101f561967df4bf1f27818e1",
-        urls = ["https://github.com/googleapis/googleapis/archive/51fe6432d4076a4c101f561967df4bf1f27818e1.zip"],
+        strip_prefix = "googleapis-ffc531383747ebb702dad3db237ef5fdea796363",
+        urls = ["https://github.com/googleapis/googleapis/archive/ffc531383747ebb702dad3db237ef5fdea796363.zip"],
     )
 
 def gapic_generator_register_toolchains():

tests/integration/goldens/asset/google/cloud/asset/__init__.py

@@ -35,6 +35,8 @@
 from google.cloud.asset_v1.types.asset_service import GetFeedRequest
 from google.cloud.asset_v1.types.asset_service import IamPolicyAnalysisOutputConfig
 from google.cloud.asset_v1.types.asset_service import IamPolicyAnalysisQuery
+from google.cloud.asset_v1.types.asset_service import ListAssetsRequest
+from google.cloud.asset_v1.types.asset_service import ListAssetsResponse
 from google.cloud.asset_v1.types.asset_service import ListFeedsRequest
 from google.cloud.asset_v1.types.asset_service import ListFeedsResponse
 from google.cloud.asset_v1.types.asset_service import OutputConfig
@@ -48,6 +50,7 @@
 from google.cloud.asset_v1.types.asset_service import UpdateFeedRequest
 from google.cloud.asset_v1.types.asset_service import ContentType
 from google.cloud.asset_v1.types.assets import Asset
+from google.cloud.asset_v1.types.assets import ConditionEvaluation
 from google.cloud.asset_v1.types.assets import IamPolicyAnalysisResult
 from google.cloud.asset_v1.types.assets import IamPolicyAnalysisState
 from google.cloud.asset_v1.types.assets import IamPolicySearchResult
@@ -76,6 +79,8 @@
     'GetFeedRequest',
     'IamPolicyAnalysisOutputConfig',
     'IamPolicyAnalysisQuery',
+    'ListAssetsRequest',
+    'ListAssetsResponse',
     'ListFeedsRequest',
     'ListFeedsResponse',
     'OutputConfig',
@@ -89,6 +94,7 @@
     'UpdateFeedRequest',
     'ContentType',
     'Asset',
+    'ConditionEvaluation',
     'IamPolicyAnalysisResult',
     'IamPolicyAnalysisState',
     'IamPolicySearchResult',

tests/integration/goldens/asset/google/cloud/asset_v1/__init__.py

@@ -35,6 +35,8 @@
 from .types.asset_service import GetFeedRequest
 from .types.asset_service import IamPolicyAnalysisOutputConfig
 from .types.asset_service import IamPolicyAnalysisQuery
+from .types.asset_service import ListAssetsRequest
+from .types.asset_service import ListAssetsResponse
 from .types.asset_service import ListFeedsRequest
 from .types.asset_service import ListFeedsResponse
 from .types.asset_service import OutputConfig
@@ -48,6 +50,7 @@
 from .types.asset_service import UpdateFeedRequest
 from .types.asset_service import ContentType
 from .types.assets import Asset
+from .types.assets import ConditionEvaluation
 from .types.assets import IamPolicyAnalysisResult
 from .types.assets import IamPolicyAnalysisState
 from .types.assets import IamPolicySearchResult
@@ -67,6 +70,7 @@
 'BatchGetAssetsHistoryRequest',
 'BatchGetAssetsHistoryResponse',
 'BigQueryDestination',
+'ConditionEvaluation',
 'ContentType',
 'CreateFeedRequest',
 'DeleteFeedRequest',
@@ -82,6 +86,8 @@
 'IamPolicyAnalysisResult',
 'IamPolicyAnalysisState',
 'IamPolicySearchResult',
+'ListAssetsRequest',
+'ListAssetsResponse',
 'ListFeedsRequest',
 'ListFeedsResponse',
 'OutputConfig',

tests/integration/goldens/asset/google/cloud/asset_v1/gapic_metadata.json

@@ -45,6 +45,11 @@
                 "get_feed"
               ]
             },
+            "ListAssets": {
+              "methods": [
+                "list_assets"
+              ]
+            },
             "ListFeeds": {
               "methods": [
                 "list_feeds"
@@ -105,6 +110,11 @@
                 "get_feed"
               ]
             },
+            "ListAssets": {
+              "methods": [
+                "list_assets"
+              ]
+            },
             "ListFeeds": {
               "methods": [
                 "list_feeds"

tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/async_client.py

@@ -229,6 +229,95 @@ async def export_assets(self,
         # Done; return the response.
         return response
 
+    async def list_assets(self,
+            request: asset_service.ListAssetsRequest = None,
+            *,
+            parent: str = None,
+            retry: retries.Retry = gapic_v1.method.DEFAULT,
+            timeout: float = None,
+            metadata: Sequence[Tuple[str, str]] = (),
+            ) -> pagers.ListAssetsAsyncPager:
+        r"""Lists assets with time and resource types and returns
+        paged results in response.
+
+        Args:
+            request (:class:`google.cloud.asset_v1.types.ListAssetsRequest`):
+                The request object. ListAssets request.
+            parent (:class:`str`):
+                Required. Name of the organization or project the assets
+                belong to. Format: "organizations/[organization-number]"
+                (such as "organizations/123"), "projects/[project-id]"
+                (such as "projects/my-project-id"), or
+                "projects/[project-number]" (such as "projects/12345").
+
+                This corresponds to the ``parent`` field
+                on the ``request`` instance; if ``request`` is provided, this
+                should not be set.
+            retry (google.api_core.retry.Retry): Designation of what errors, if any,
+                should be retried.
+            timeout (float): The timeout for this request.
+            metadata (Sequence[Tuple[str, str]]): Strings which should be
+                sent along with the request as metadata.
+
+        Returns:
+            google.cloud.asset_v1.services.asset_service.pagers.ListAssetsAsyncPager:
+                ListAssets response.
+                Iterating over this object will yield
+                results and resolve additional pages
+                automatically.
+
+        """
+        # Create or coerce a protobuf request object.
+        # Sanity check: If we got a request object, we should *not* have
+        # gotten any keyword arguments that map to the request.
+        has_flattened_params = any([parent])
+        if request is not None and has_flattened_params:
+            raise ValueError("If the `request` argument is set, then none of "
+                             "the individual field arguments should be set.")
+
+        request = asset_service.ListAssetsRequest(request)
+
+        # If we have keyword arguments corresponding to fields on the
+        # request, apply these.
+        if parent is not None:
+            request.parent = parent
+
+        # Wrap the RPC method; this adds retry and timeout information,
+        # and friendly error handling.
+        rpc = gapic_v1.method_async.wrap_method(
+            self._client._transport.list_assets,
+            default_timeout=None,
+            client_info=DEFAULT_CLIENT_INFO,
+        )
+
+        # Certain fields should be provided within the metadata header;
+        # add these here.
+        metadata = tuple(metadata) + (
+            gapic_v1.routing_header.to_grpc_metadata((
+                ("parent", request.parent),
+            )),
+        )
+
+        # Send the request.
+        response = await rpc(
+            request,
+            retry=retry,
+            timeout=timeout,
+            metadata=metadata,
+        )
+
+        # This method is paged; wrap the response in a pager, which provides
+        # an `__aiter__` convenience method.
+        response = pagers.ListAssetsAsyncPager(
+            method=rpc,
+            request=request,
+            response=response,
+            metadata=metadata,
+        )
+
+        # Done; return the response.
+        return response
+
     async def batch_get_assets_history(self,
             request: asset_service.BatchGetAssetsHistoryRequest = None,
             *,
@@ -732,7 +821,7 @@ async def search_all_resources(self,
                 Required. A scope can be a project, a folder, or an
                 organization. The search is limited to the resources
                 within the ``scope``. The caller must be granted the
-                ```cloudasset.assets.searchAllResources`` <http://cloud.google.com/asset-inventory/docs/access-control#required_permissions>`__
+                ```cloudasset.assets.searchAllResources`` <https://cloud.google.com/asset-inventory/docs/access-control#required_permissions>`__
                 permission on the desired scope.
 
                 The allowed values are:
@@ -748,40 +837,48 @@ async def search_all_resources(self,
                 should not be set.
             query (:class:`str`):
                 Optional. The query statement. See `how to construct a
-                query <http://cloud.google.com/asset-inventory/docs/searching-resources#how_to_construct_a_query>`__
+                query <https://cloud.google.com/asset-inventory/docs/searching-resources#how_to_construct_a_query>`__
                 for more information. If not specified or empty, it will
                 search all the resources within the specified ``scope``.
-                Note that the query string is compared against each
-                Cloud IAM policy binding, including its members, roles,
-                and Cloud IAM conditions. The returned Cloud IAM
-                policies will only contain the bindings that match your
-                query. To learn more about the IAM policy structure, see
-                `IAM policy
-                doc <https://cloud.google.com/iam/docs/policies#structure>`__.
 
                 Examples:
 
                 -  ``name:Important`` to find Cloud resources whose name
                    contains "Important" as a word.
+                -  ``name=Important`` to find the Cloud resource whose
+                   name is exactly "Important".
                 -  ``displayName:Impor*`` to find Cloud resources whose
-                   display name contains "Impor" as a prefix.
-                -  ``description:*por*`` to find Cloud resources whose
-                   description contains "por" as a substring.
+                   display name contains "Impor" as a prefix of any word
+                   in the field.
                 -  ``location:us-west*`` to find Cloud resources whose
-                   location is prefixed with "us-west".
+                   location contains both "us" and "west" as prefixes.
                 -  ``labels:prod`` to find Cloud resources whose labels
                    contain "prod" as a key or value.
                 -  ``labels.env:prod`` to find Cloud resources that have
                    a label "env" and its value is "prod".
                 -  ``labels.env:*`` to find Cloud resources that have a
                    label "env".
+                -  ``kmsKey:key`` to find Cloud resources encrypted with
+                   a customer-managed encryption key whose name contains
+                   the word "key".
+                -  ``state:ACTIVE`` to find Cloud resources whose state
+                   contains "ACTIVE" as a word.
+                -  ``NOT state:ACTIVE`` to find {{gcp_name}} resources
+                   whose state doesn't contain "ACTIVE" as a word.
+                -  ``createTime<1609459200`` to find Cloud resources
+                   that were created before "2021-01-01 00:00:00 UTC".
+                   1609459200 is the epoch timestamp of "2021-01-01
+                   00:00:00 UTC" in seconds.
+                -  ``updateTime>1609459200`` to find Cloud resources
+                   that were updated after "2021-01-01 00:00:00 UTC".
+                   1609459200 is the epoch timestamp of "2021-01-01
+                   00:00:00 UTC" in seconds.
                 -  ``Important`` to find Cloud resources that contain
                    "Important" as a word in any of the searchable
                    fields.
                 -  ``Impor*`` to find Cloud resources that contain
-                   "Impor" as a prefix in any of the searchable fields.
-                -  ``*por*`` to find Cloud resources that contain "por"
-                   as a substring in any of the searchable fields.
+                   "Impor" as a prefix of any word in any of the
+                   searchable fields.
                 -  ``Important location:(us-west1 OR global)`` to find
                    Cloud resources that contain "Important" as a word in
                    any of the searchable fields and are also located in
@@ -796,6 +893,20 @@ async def search_all_resources(self,
                 `searchable asset
                 types <https://cloud.google.com/asset-inventory/docs/supported-asset-types#searchable_asset_types>`__.
 
+                Regular expressions are also supported. For example:
+
+                -  "compute.googleapis.com.*" snapshots resources whose
+                   asset type starts with "compute.googleapis.com".
+                -  ".*Instance" snapshots resources whose asset type
+                   ends with "Instance".
+                -  ".*Instance.*" snapshots resources whose asset type
+                   contains "Instance".
+
+                See `RE2 <https://github.com/google/re2/wiki/Syntax>`__
+                for all supported regular expression syntax. If the
+                regular expression does not match any supported asset
+                type, an INVALID_ARGUMENT error will be returned.
+
                 This corresponds to the ``asset_types`` field
                 on the ``request`` instance; if ``request`` is provided, this
                 should not be set.
@@ -896,7 +1007,7 @@ async def search_all_iam_policies(self,
                 Required. A scope can be a project, a folder, or an
                 organization. The search is limited to the IAM policies
                 within the ``scope``. The caller must be granted the
-                ```cloudasset.assets.searchAllIamPolicies`` <http://cloud.google.com/asset-inventory/docs/access-control#required_permissions>`__
+                ```cloudasset.assets.searchAllIamPolicies`` <https://cloud.google.com/asset-inventory/docs/access-control#required_permissions>`__
                 permission on the desired scope.
 
                 The allowed values are:
@@ -915,34 +1026,54 @@ async def search_all_iam_policies(self,
                 query <https://cloud.google.com/asset-inventory/docs/searching-iam-policies#how_to_construct_a_query>`__
                 for more information. If not specified or empty, it will
                 search all the IAM policies within the specified
-                ``scope``.
+                ``scope``. Note that the query string is compared
+                against each Cloud IAM policy binding, including its
+                members, roles, and Cloud IAM conditions. The returned
+                Cloud IAM policies will only contain the bindings that
+                match your query. To learn more about the IAM policy
+                structure, see `IAM policy
+                doc <https://cloud.google.com/iam/docs/policies#structure>`__.
 
                 Examples:
 
                 -  ``policy:amy@gmail.com`` to find IAM policy bindings
                    that specify user "amy@gmail.com".
                 -  ``policy:roles/compute.admin`` to find IAM policy
                    bindings that specify the Compute Admin role.
+                -  ``policy:comp*`` to find IAM policy bindings that
+                   contain "comp" as a prefix of any word in the
+                   binding.
                 -  ``policy.role.permissions:storage.buckets.update`` to
                    find IAM policy bindings that specify a role
                    containing "storage.buckets.update" permission. Note
                    that if callers don't have ``iam.roles.get`` access
                    to a role's included permissions, policy bindings
                    that specify this role will be dropped from the
                    search results.
+                -  ``policy.role.permissions:upd*`` to find IAM policy
+                   bindings that specify a role containing "upd" as a
+                   prefix of any word in the role permission. Note that
+                   if callers don't have ``iam.roles.get`` access to a
+                   role's included permissions, policy bindings that
+                   specify this role will be dropped from the search
+                   results.
                 -  ``resource:organizations/123456`` to find IAM policy
                    bindings that are set on "organizations/123456".
+                -  ``resource=//cloudresourcemanager.googleapis.com/projects/myproject``
+                   to find IAM policy bindings that are set on the
+                   project named "myproject".
                 -  ``Important`` to find IAM policy bindings that
                    contain "Important" as a word in any of the
                    searchable fields (except for the included
                    permissions).
-                -  ``*por*`` to find IAM policy bindings that contain
-                   "por" as a substring in any of the searchable fields
-                   (except for the included permissions).
                 -  ``resource:(instance1 OR instance2) policy:amy`` to
                    find IAM policy bindings that are set on resources
                    "instance1" or "instance2" and also specify user
                    "amy".
+                -  ``roles:roles/compute.admin`` to find IAM policy
+                   bindings that specify the Compute Admin role.
+                -  ``memberTypes:user`` to find IAM policy bindings that
+                   contain the "user" member type.
 
                 This corresponds to the ``query`` field
                 on the ``request`` instance; if ``request`` is provided, this