chore: Update gapic-generator-python to v1.6.1

.github/release-please.yml

@@ -1,5 +1,6 @@
 releaseType: python
 handleGHRelease: true
+manifest: true
 # NOTE: this section is generated by synthtool.languages.python
 # See https://github.com/googleapis/synthtool/blob/master/synthtool/languages/python.py
 branches:

.release-please-manifest.json

@@ -0,0 +1,3 @@
+{
+  ".": "2.9.3"
+}

docs/conf.py

@@ -24,9 +24,9 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 import os
 import shlex
+import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

docs/containeranalysis_v1/types.rst

@@ -3,5 +3,4 @@ Types for Google Cloud Devtools Containeranalysis v1 API
 
 .. automodule:: google.cloud.devtools.containeranalysis_v1.types
     :members:
-    :undoc-members:
     :show-inheritance:

docs/index.rst

@@ -2,7 +2,8 @@
 
 .. include:: multiprocessing.rst
 
-Api Reference
+
+API Reference
 -------------
 .. toctree::
     :maxdepth: 2
@@ -11,22 +12,23 @@ Api Reference
     containeranalysis_v1/types
 
 
-Changelog
-----------
+Migration Guide
+---------------
 
-For all previous ``google-cloud-containeranalysis`` releases:
+See the guide below for instructions on migrating to the latest version.
 
 .. toctree::
     :maxdepth: 2
 
-    changelog
+    UPGRADING
 
-Migration Guide
----------------
 
-See the guide below for instructions on migrating to the 2.x release of this library.
+Changelog
+---------
+
+For a list of all ``google-cloud-containeranalysis`` releases:
 
 .. toctree::
     :maxdepth: 2
 
-    UPGRADING
+    changelog

google/cloud/devtools/containeranalysis/__init__.py

@@ -13,18 +13,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+from google.cloud.devtools.containeranalysis import gapic_version as package_version
+
+__version__ = package_version.__version__
+
 
-from google.cloud.devtools.containeranalysis_v1.services.container_analysis.client import (
-    ContainerAnalysisClient,
-)
 from google.cloud.devtools.containeranalysis_v1.services.container_analysis.async_client import (
     ContainerAnalysisAsyncClient,
 )
-
-from google.cloud.devtools.containeranalysis_v1.types.containeranalysis import (
-    GetVulnerabilityOccurrencesSummaryRequest,
+from google.cloud.devtools.containeranalysis_v1.services.container_analysis.client import (
+    ContainerAnalysisClient,
 )
 from google.cloud.devtools.containeranalysis_v1.types.containeranalysis import (
+    GetVulnerabilityOccurrencesSummaryRequest,
     VulnerabilityOccurrencesSummary,
 )
 

google/cloud/devtools/containeranalysis/gapic_version.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+__version__ = "2.9.3"  # {x-release-please-version}

google/cloud/devtools/containeranalysis/py.typed

@@ -1,2 +1,2 @@
 # Marker file for PEP 561.
-# The google-cloud-devtools-containeranalysis package uses inline types.
+# The google-cloud-containeranalysis package uses inline types.

google/cloud/devtools/containeranalysis_v1/__init__.py

@@ -13,12 +13,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+from google.cloud.devtools.containeranalysis import gapic_version as package_version
 
-from .services.container_analysis import ContainerAnalysisClient
-from .services.container_analysis import ContainerAnalysisAsyncClient
+__version__ = package_version.__version__
 
-from .types.containeranalysis import GetVulnerabilityOccurrencesSummaryRequest
-from .types.containeranalysis import VulnerabilityOccurrencesSummary
+
+from .services.container_analysis import (
+    ContainerAnalysisAsyncClient,
+    ContainerAnalysisClient,
+)
+from .types.containeranalysis import (
+    GetVulnerabilityOccurrencesSummaryRequest,
+    VulnerabilityOccurrencesSummary,
+)
 
 __all__ = (
     "ContainerAnalysisAsyncClient",

google/cloud/devtools/containeranalysis_v1/py.typed

@@ -1,2 +1,2 @@
 # Marker file for PEP 561.
-# The google-cloud-devtools-containeranalysis package uses inline types.
+# The google-cloud-containeranalysis package uses inline types.

google/cloud/devtools/containeranalysis_v1/services/container_analysis/__init__.py

@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from .client import ContainerAnalysisClient
 from .async_client import ContainerAnalysisAsyncClient
+from .client import ContainerAnalysisClient
 
 __all__ = (
     "ContainerAnalysisClient",

google/cloud/devtools/containeranalysis_v1/services/container_analysis/async_client.py

@@ -16,32 +16,42 @@
 from collections import OrderedDict
 import functools
 import re
-from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union
-import pkg_resources
+from typing import (
+    Dict,
+    Mapping,
+    MutableMapping,
+    MutableSequence,
+    Optional,
+    Sequence,
+    Tuple,
+    Type,
+    Union,
+)
 
-from google.api_core.client_options import ClientOptions
 from google.api_core import exceptions as core_exceptions
 from google.api_core import gapic_v1
 from google.api_core import retry as retries
+from google.api_core.client_options import ClientOptions
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.oauth2 import service_account  # type: ignore
+import pkg_resources
 
 try:
     OptionalRetry = Union[retries.Retry, gapic_v1.method._MethodDefault]
 except AttributeError:  # pragma: NO COVER
     OptionalRetry = Union[retries.Retry, object]  # type: ignore
 
-from google.cloud.devtools.containeranalysis_v1.types import containeranalysis
 from google.iam.v1 import iam_policy_pb2  # type: ignore
 from google.iam.v1 import policy_pb2  # type: ignore
-from .transports.base import ContainerAnalysisTransport, DEFAULT_CLIENT_INFO
-from .transports.grpc_asyncio import ContainerAnalysisGrpcAsyncIOTransport
-from .client import ContainerAnalysisClient
-
-
 from grafeas import grafeas_v1
 from grafeas.grafeas_v1.services.grafeas import transports
 
+from google.cloud.devtools.containeranalysis_v1.types import containeranalysis
+
+from .client import ContainerAnalysisClient
+from .transports.base import DEFAULT_CLIENT_INFO, ContainerAnalysisTransport
+from .transports.grpc_asyncio import ContainerAnalysisGrpcAsyncIOTransport
+
 
 class ContainerAnalysisAsyncClient:
     """Retrieves analysis results of Cloud components such as Docker
@@ -176,9 +186,9 @@ def transport(self) -> ContainerAnalysisTransport:
     def __init__(
         self,
         *,
-        credentials: ga_credentials.Credentials = None,
+        credentials: Optional[ga_credentials.Credentials] = None,
         transport: Union[str, ContainerAnalysisTransport] = "grpc_asyncio",
-        client_options: ClientOptions = None,
+        client_options: Optional[ClientOptions] = None,
         client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
     ) -> None:
         """Instantiates the container analysis client.
@@ -236,11 +246,11 @@ def get_grafeas_client(self) -> grafeas_v1.GrafeasClient:
 
     async def set_iam_policy(
         self,
-        request: Union[iam_policy_pb2.SetIamPolicyRequest, dict] = None,
+        request: Optional[Union[iam_policy_pb2.SetIamPolicyRequest, dict]] = None,
         *,
-        resource: str = None,
+        resource: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> policy_pb2.Policy:
         r"""Sets the access control policy on the specified note or
@@ -281,7 +291,7 @@ async def sample_set_iam_policy():
                 print(response)
 
         Args:
-            request (Union[google.iam.v1.iam_policy_pb2.SetIamPolicyRequest, dict]):
+            request (Optional[Union[google.iam.v1.iam_policy_pb2.SetIamPolicyRequest, dict]]):
                 The request object. Request message for `SetIamPolicy`
                 method.
             resource (:class:`str`):
@@ -410,11 +420,11 @@ async def sample_set_iam_policy():
 
     async def get_iam_policy(
         self,
-        request: Union[iam_policy_pb2.GetIamPolicyRequest, dict] = None,
+        request: Optional[Union[iam_policy_pb2.GetIamPolicyRequest, dict]] = None,
         *,
-        resource: str = None,
+        resource: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> policy_pb2.Policy:
         r"""Gets the access control policy for a note or an occurrence
@@ -455,7 +465,7 @@ async def sample_get_iam_policy():
                 print(response)
 
         Args:
-            request (Union[google.iam.v1.iam_policy_pb2.GetIamPolicyRequest, dict]):
+            request (Optional[Union[google.iam.v1.iam_policy_pb2.GetIamPolicyRequest, dict]]):
                 The request object. Request message for `GetIamPolicy`
                 method.
             resource (:class:`str`):
@@ -584,12 +594,12 @@ async def sample_get_iam_policy():
 
     async def test_iam_permissions(
         self,
-        request: Union[iam_policy_pb2.TestIamPermissionsRequest, dict] = None,
+        request: Optional[Union[iam_policy_pb2.TestIamPermissionsRequest, dict]] = None,
         *,
-        resource: str = None,
-        permissions: Sequence[str] = None,
+        resource: Optional[str] = None,
+        permissions: Optional[MutableSequence[str]] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> iam_policy_pb2.TestIamPermissionsResponse:
         r"""Returns the permissions that a caller has on the specified note
@@ -630,7 +640,7 @@ async def sample_test_iam_permissions():
                 print(response)
 
         Args:
-            request (Union[google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest, dict]):
+            request (Optional[Union[google.iam.v1.iam_policy_pb2.TestIamPermissionsRequest, dict]]):
                 The request object. Request message for
                 `TestIamPermissions` method.
             resource (:class:`str`):
@@ -642,7 +652,7 @@ async def sample_test_iam_permissions():
                 This corresponds to the ``resource`` field
                 on the ``request`` instance; if ``request`` is provided, this
                 should not be set.
-            permissions (:class:`Sequence[str]`):
+            permissions (:class:`MutableSequence[str]`):
                 The set of permissions to check for the ``resource``.
                 Permissions with wildcards (such as '*' or 'storage.*')
                 are not allowed. For more information see `IAM
@@ -708,14 +718,14 @@ async def sample_test_iam_permissions():
 
     async def get_vulnerability_occurrences_summary(
         self,
-        request: Union[
-            containeranalysis.GetVulnerabilityOccurrencesSummaryRequest, dict
+        request: Optional[
+            Union[containeranalysis.GetVulnerabilityOccurrencesSummaryRequest, dict]
         ] = None,
         *,
-        parent: str = None,
-        filter: str = None,
+        parent: Optional[str] = None,
+        filter: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> containeranalysis.VulnerabilityOccurrencesSummary:
         r"""Gets a summary of the number and severity of
@@ -748,7 +758,7 @@ async def sample_get_vulnerability_occurrences_summary():
                 print(response)
 
         Args:
-            request (Union[google.cloud.devtools.containeranalysis_v1.types.GetVulnerabilityOccurrencesSummaryRequest, dict]):
+            request (Optional[Union[google.cloud.devtools.containeranalysis_v1.types.GetVulnerabilityOccurrencesSummaryRequest, dict]]):
                 The request object. Request to get a vulnerability
                 summary for some set of occurrences.
             parent (:class:`str`):