diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 12edee7..237a647 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:452901c74a22f9b9a3bd02bce780b8e8805c97270d424684bff809ce5be8c2a2
+  digest: sha256:6244cdf9848ec661b48e5b626123ee9f6f8eb80adc9d42d7cd3c243d4ddaea79
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 7092a13..e97d89e 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -12,7 +12,7 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@v4
       with:
-        python-version: "3.10"
+        python-version: "3.9"
     - name: Install nox
       run: |
         python -m pip install --upgrade setuptools pip wheel
@@ -28,7 +28,7 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@v4
       with:
-        python-version: "3.10"
+        python-version: "3.9"
     - name: Install nox
       run: |
         python -m pip install --upgrade setuptools pip wheel
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index d2aee5b..16d5a9e 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -12,7 +12,7 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@v4
       with:
-        python-version: "3.10"
+        python-version: "3.8"
     - name: Install nox
       run: |
         python -m pip install --upgrade setuptools pip wheel
diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
index 87ade4d..23000c0 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittest.yml
@@ -41,7 +41,7 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@v4
       with:
-        python-version: "3.10"
+        python-version: "3.8"
     - name: Install coverage
       run: |
         python -m pip install --upgrade setuptools pip wheel
diff --git a/.kokoro/docker/docs/Dockerfile b/.kokoro/docker/docs/Dockerfile
index 238b87b..7323c42 100644
--- a/.kokoro/docker/docs/Dockerfile
+++ b/.kokoro/docker/docs/Dockerfile
@@ -60,16 +60,16 @@ RUN apt-get update \
   && rm -rf /var/lib/apt/lists/* \
   && rm -f /var/cache/apt/archives/*.deb
 
-###################### Install python 3.8.11
+###################### Install python 3.9.13
 
-# Download python 3.8.11
-RUN wget https://www.python.org/ftp/python/3.8.11/Python-3.8.11.tgz
+# Download python 3.9.13
+RUN wget https://www.python.org/ftp/python/3.9.13/Python-3.9.13.tgz
 
 # Extract files
-RUN tar -xvf Python-3.8.11.tgz
+RUN tar -xvf Python-3.9.13.tgz
 
-# Install python 3.8.11
-RUN ./Python-3.8.11/configure --enable-optimizations
+# Install python 3.9.11
+RUN ./Python-3.9.13/configure --enable-optimizations
 RUN make altinstall
 
 ###################### Install pip
diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt
index 31425f1..12bfbf4 100644
--- a/.kokoro/requirements.txt
+++ b/.kokoro/requirements.txt
@@ -94,9 +94,9 @@ charset-normalizer==2.1.1 \
     --hash=sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845 \
     --hash=sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f
     # via requests
-click==8.0.4 \
-    --hash=sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1 \
-    --hash=sha256:8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb
+click==8.1.3 \
+    --hash=sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e \
+    --hash=sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48
     # via
     #   gcp-docuploader
     #   gcp-releasetool
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 4c313f9..dd8fde7 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "1.4.0"
+  ".": "1.5.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8c1235..b3dca78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [1.5.0](https://github.com/googleapis/python-api-gateway/compare/v1.4.0...v1.5.0) (2022-11-16)
+
+
+### Features
+
+* Add typing to proto.Message based class attributes ([7b87c92](https://github.com/googleapis/python-api-gateway/commit/7b87c9272f1af4207db884415de3d75e83ab6c44))
+
+
+### Documentation
+
+* **samples:** Snippetgen handling of repeated enum field ([7b87c92](https://github.com/googleapis/python-api-gateway/commit/7b87c9272f1af4207db884415de3d75e83ab6c44))
+
 ## [1.4.0](https://github.com/googleapis/python-api-gateway/compare/v1.3.3...v1.4.0) (2022-11-07)
 
 
diff --git a/docs/apigateway_v1/types.rst b/docs/apigateway_v1/types.rst
index 132f1b0..40b79de 100644
--- a/docs/apigateway_v1/types.rst
+++ b/docs/apigateway_v1/types.rst
@@ -3,5 +3,4 @@ Types for Google Cloud Apigateway v1 API
 
 .. automodule:: google.cloud.apigateway_v1.types
     :members:
-    :undoc-members:
     :show-inheritance:
diff --git a/google/cloud/apigateway/gapic_version.py b/google/cloud/apigateway/gapic_version.py
index 18c65df..997edc1 100644
--- a/google/cloud/apigateway/gapic_version.py
+++ b/google/cloud/apigateway/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.4.0"  # {x-release-please-version}
+__version__ = "1.5.0"  # {x-release-please-version}
diff --git a/google/cloud/apigateway_v1/services/api_gateway_service/async_client.py b/google/cloud/apigateway_v1/services/api_gateway_service/async_client.py
index ef3abb1..56b82c1 100644
--- a/google/cloud/apigateway_v1/services/api_gateway_service/async_client.py
+++ b/google/cloud/apigateway_v1/services/api_gateway_service/async_client.py
@@ -16,7 +16,17 @@
 from collections import OrderedDict
 import functools
 import re
-from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union
+from typing import (
+    Dict,
+    Mapping,
+    MutableMapping,
+    MutableSequence,
+    Optional,
+    Sequence,
+    Tuple,
+    Type,
+    Union,
+)
 
 from google.api_core import exceptions as core_exceptions
 from google.api_core import gapic_v1
@@ -181,9 +191,9 @@ def transport(self) -> ApiGatewayServiceTransport:
     def __init__(
         self,
         *,
-        credentials: ga_credentials.Credentials = None,
+        credentials: Optional[ga_credentials.Credentials] = None,
         transport: Union[str, ApiGatewayServiceTransport] = "grpc_asyncio",
-        client_options: ClientOptions = None,
+        client_options: Optional[ClientOptions] = None,
         client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
     ) -> None:
         """Instantiates the api gateway service client.
@@ -227,11 +237,11 @@ def __init__(
 
     async def list_gateways(
         self,
-        request: Union[apigateway.ListGatewaysRequest, dict] = None,
+        request: Optional[Union[apigateway.ListGatewaysRequest, dict]] = None,
         *,
-        parent: str = None,
+        parent: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> pagers.ListGatewaysAsyncPager:
         r"""Lists Gateways in a given project and location.
@@ -264,7 +274,7 @@ async def sample_list_gateways():
                     print(response)
 
         Args:
-            request (Union[google.cloud.apigateway_v1.types.ListGatewaysRequest, dict]):
+            request (Optional[Union[google.cloud.apigateway_v1.types.ListGatewaysRequest, dict]]):
                 The request object. Request message for
                 ApiGatewayService.ListGateways
             parent (:class:`str`):
@@ -342,11 +352,11 @@ async def sample_list_gateways():
 
     async def get_gateway(
         self,
-        request: Union[apigateway.GetGatewayRequest, dict] = None,
+        request: Optional[Union[apigateway.GetGatewayRequest, dict]] = None,
         *,
-        name: str = None,
+        name: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> apigateway.Gateway:
         r"""Gets details of a single Gateway.
@@ -378,7 +388,7 @@ async def sample_get_gateway():
                 print(response)
 
         Args:
-            request (Union[google.cloud.apigateway_v1.types.GetGatewayRequest, dict]):
+            request (Optional[Union[google.cloud.apigateway_v1.types.GetGatewayRequest, dict]]):
                 The request object. Request message for
                 ApiGatewayService.GetGateway
             name (:class:`str`):
@@ -448,13 +458,13 @@ async def sample_get_gateway():
 
     async def create_gateway(
         self,
-        request: Union[apigateway.CreateGatewayRequest, dict] = None,
+        request: Optional[Union[apigateway.CreateGatewayRequest, dict]] = None,
         *,
-        parent: str = None,
-        gateway: apigateway.Gateway = None,
-        gateway_id: str = None,
+        parent: Optional[str] = None,
+        gateway: Optional[apigateway.Gateway] = None,
+        gateway_id: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation_async.AsyncOperation:
         r"""Creates a new Gateway in a given project and
@@ -496,7 +506,7 @@ async def sample_create_gateway():
                 print(response)
 
         Args:
-            request (Union[google.cloud.apigateway_v1.types.CreateGatewayRequest, dict]):
+            request (Optional[Union[google.cloud.apigateway_v1.types.CreateGatewayRequest, dict]]):
                 The request object. Request message for
                 ApiGatewayService.CreateGateway
             parent (:class:`str`):
@@ -601,12 +611,12 @@ async def sample_create_gateway():
 
     async def update_gateway(
         self,
-        request: Union[apigateway.UpdateGatewayRequest, dict] = None,
+        request: Optional[Union[apigateway.UpdateGatewayRequest, dict]] = None,
         *,
-        gateway: apigateway.Gateway = None,
-        update_mask: field_mask_pb2.FieldMask = None,
+        gateway: Optional[apigateway.Gateway] = None,
+        update_mask: Optional[field_mask_pb2.FieldMask] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation_async.AsyncOperation:
         r"""Updates the parameters of a single Gateway.
@@ -645,7 +655,7 @@ async def sample_update_gateway():
                 print(response)
 
         Args:
-            request (Union[google.cloud.apigateway_v1.types.UpdateGatewayRequest, dict]):
+            request (Optional[Union[google.cloud.apigateway_v1.types.UpdateGatewayRequest, dict]]):
                 The request object. Request message for
                 ApiGatewayService.UpdateGateway
             gateway (:class:`google.cloud.apigateway_v1.types.Gateway`):
@@ -746,11 +756,11 @@ async def sample_update_gateway():
 
     async def delete_gateway(
         self,
-        request: Union[apigateway.DeleteGatewayRequest, dict] = None,
+        request: Optional[Union[apigateway.DeleteGatewayRequest, dict]] = None,
         *,
-        name: str = None,
+        name: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation_async.AsyncOperation:
         r"""Deletes a single Gateway.
@@ -786,7 +796,7 @@ async def sample_delete_gateway():
                 print(response)
 
         Args:
-            request (Union[google.cloud.apigateway_v1.types.DeleteGatewayRequest, dict]):
+            request (Optional[Union[google.cloud.apigateway_v1.types.DeleteGatewayRequest, dict]]):
                 The request object. Request message for
                 ApiGatewayService.DeleteGateway
             name (:class:`str`):
@@ -880,11 +890,11 @@ async def sample_delete_gateway():
 
     async def list_apis(
         self,
-        request: Union[apigateway.ListApisRequest, dict] = None,
+        request: Optional[Union[apigateway.ListApisRequest, dict]] = None,
         *,
-        parent: str = None,
+        parent: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> pagers.ListApisAsyncPager:
         r"""Lists Apis in a given project and location.
@@ -917,7 +927,7 @@ async def sample_list_apis():
                     print(response)
 
         Args:
-            request (Union[google.cloud.apigateway_v1.types.ListApisRequest, dict]):
+            request (Optional[Union[google.cloud.apigateway_v1.types.ListApisRequest, dict]]):
                 The request object. Request message for
                 ApiGatewayService.ListApis
             parent (:class:`str`):
@@ -995,11 +1005,11 @@ async def sample_list_apis():
 
     async def get_api(
         self,
-        request: Union[apigateway.GetApiRequest, dict] = None,
+        request: Optional[Union[apigateway.GetApiRequest, dict]] = None,
         *,
-        name: str = None,
+        name: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> apigateway.Api:
         r"""Gets details of a single Api.
@@ -1031,7 +1041,7 @@ async def sample_get_api():
                 print(response)
 
         Args:
-            request (Union[google.cloud.apigateway_v1.types.GetApiRequest, dict]):
+            request (Optional[Union[google.cloud.apigateway_v1.types.GetApiRequest, dict]]):
                 The request object. Request message for
                 ApiGatewayService.GetApi
             name (:class:`str`):
@@ -1097,13 +1107,13 @@ async def sample_get_api():
 
     async def create_api(
         self,
-        request: Union[apigateway.CreateApiRequest, dict] = None,
+        request: Optional[Union[apigateway.CreateApiRequest, dict]] = None,
         *,
-        parent: str = None,
-        api: apigateway.Api = None,
-        api_id: str = None,
+        parent: Optional[str] = None,
+        api: Optional[apigateway.Api] = None,
+        api_id: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation_async.AsyncOperation:
         r"""Creates a new Api in a given project and location.
@@ -1140,7 +1150,7 @@ async def sample_create_api():
                 print(response)
 
         Args:
-            request (Union[google.cloud.apigateway_v1.types.CreateApiRequest, dict]):
+            request (Optional[Union[google.cloud.apigateway_v1.types.CreateApiRequest, dict]]):
                 The request object. Request message for
                 ApiGatewayService.CreateApi
             parent (:class:`str`):
@@ -1244,12 +1254,12 @@ async def sample_create_api():
 
     async def update_api(
         self,
-        request: Union[apigateway.UpdateApiRequest, dict] = None,
+        request: Optional[Union[apigateway.UpdateApiRequest, dict]] = None,
         *,
-        api: apigateway.Api = None,
-        update_mask: field_mask_pb2.FieldMask = None,
+        api: Optional[apigateway.Api] = None,
+        update_mask: Optional[field_mask_pb2.FieldMask] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation_async.AsyncOperation:
         r"""Updates the parameters of a single Api.
@@ -1284,7 +1294,7 @@ async def sample_update_api():
                 print(response)
 
         Args:
-            request (Union[google.cloud.apigateway_v1.types.UpdateApiRequest, dict]):
+            request (Optional[Union[google.cloud.apigateway_v1.types.UpdateApiRequest, dict]]):
                 The request object. Request message for
                 ApiGatewayService.UpdateApi
             api (:class:`google.cloud.apigateway_v1.types.Api`):
@@ -1382,11 +1392,11 @@ async def sample_update_api():
 
     async def delete_api(
         self,
-        request: Union[apigateway.DeleteApiRequest, dict] = None,
+        request: Optional[Union[apigateway.DeleteApiRequest, dict]] = None,
         *,
-        name: str = None,
+        name: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation_async.AsyncOperation:
         r"""Deletes a single Api.
@@ -1422,7 +1432,7 @@ async def sample_delete_api():
                 print(response)
 
         Args:
-            request (Union[google.cloud.apigateway_v1.types.DeleteApiRequest, dict]):
+            request (Optional[Union[google.cloud.apigateway_v1.types.DeleteApiRequest, dict]]):
                 The request object. Request message for
                 ApiGatewayService.DeleteApi
             name (:class:`str`):
@@ -1516,11 +1526,11 @@ async def sample_delete_api():
 
     async def list_api_configs(
         self,
-        request: Union[apigateway.ListApiConfigsRequest, dict] = None,
+        request: Optional[Union[apigateway.ListApiConfigsRequest, dict]] = None,
         *,
-        parent: str = None,
+        parent: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> pagers.ListApiConfigsAsyncPager:
         r"""Lists ApiConfigs in a given project and location.
@@ -1553,7 +1563,7 @@ async def sample_list_api_configs():
                     print(response)
 
         Args:
-            request (Union[google.cloud.apigateway_v1.types.ListApiConfigsRequest, dict]):
+            request (Optional[Union[google.cloud.apigateway_v1.types.ListApiConfigsRequest, dict]]):
                 The request object. Request message for
                 ApiGatewayService.ListApiConfigs
             parent (:class:`str`):
@@ -1631,11 +1641,11 @@ async def sample_list_api_configs():
 
     async def get_api_config(
         self,
-        request: Union[apigateway.GetApiConfigRequest, dict] = None,
+        request: Optional[Union[apigateway.GetApiConfigRequest, dict]] = None,
         *,
-        name: str = None,
+        name: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> apigateway.ApiConfig:
         r"""Gets details of a single ApiConfig.
@@ -1667,7 +1677,7 @@ async def sample_get_api_config():
                 print(response)
 
         Args:
-            request (Union[google.cloud.apigateway_v1.types.GetApiConfigRequest, dict]):
+            request (Optional[Union[google.cloud.apigateway_v1.types.GetApiConfigRequest, dict]]):
                 The request object. Request message for
                 ApiGatewayService.GetApiConfig
             name (:class:`str`):
@@ -1734,13 +1744,13 @@ async def sample_get_api_config():
 
     async def create_api_config(
         self,
-        request: Union[apigateway.CreateApiConfigRequest, dict] = None,
+        request: Optional[Union[apigateway.CreateApiConfigRequest, dict]] = None,
         *,
-        parent: str = None,
-        api_config: apigateway.ApiConfig = None,
-        api_config_id: str = None,
+        parent: Optional[str] = None,
+        api_config: Optional[apigateway.ApiConfig] = None,
+        api_config_id: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation_async.AsyncOperation:
         r"""Creates a new ApiConfig in a given project and
@@ -1778,7 +1788,7 @@ async def sample_create_api_config():
                 print(response)
 
         Args:
-            request (Union[google.cloud.apigateway_v1.types.CreateApiConfigRequest, dict]):
+            request (Optional[Union[google.cloud.apigateway_v1.types.CreateApiConfigRequest, dict]]):
                 The request object. Request message for
                 ApiGatewayService.CreateApiConfig
             parent (:class:`str`):
@@ -1881,12 +1891,12 @@ async def sample_create_api_config():
 
     async def update_api_config(
         self,
-        request: Union[apigateway.UpdateApiConfigRequest, dict] = None,
+        request: Optional[Union[apigateway.UpdateApiConfigRequest, dict]] = None,
         *,
-        api_config: apigateway.ApiConfig = None,
-        update_mask: field_mask_pb2.FieldMask = None,
+        api_config: Optional[apigateway.ApiConfig] = None,
+        update_mask: Optional[field_mask_pb2.FieldMask] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation_async.AsyncOperation:
         r"""Updates the parameters of a single ApiConfig.
@@ -1921,7 +1931,7 @@ async def sample_update_api_config():
                 print(response)
 
         Args:
-            request (Union[google.cloud.apigateway_v1.types.UpdateApiConfigRequest, dict]):
+            request (Optional[Union[google.cloud.apigateway_v1.types.UpdateApiConfigRequest, dict]]):
                 The request object. Request message for
                 ApiGatewayService.UpdateApiConfig
             api_config (:class:`google.cloud.apigateway_v1.types.ApiConfig`):
@@ -2020,11 +2030,11 @@ async def sample_update_api_config():
 
     async def delete_api_config(
         self,
-        request: Union[apigateway.DeleteApiConfigRequest, dict] = None,
+        request: Optional[Union[apigateway.DeleteApiConfigRequest, dict]] = None,
         *,
-        name: str = None,
+        name: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation_async.AsyncOperation:
         r"""Deletes a single ApiConfig.
@@ -2060,7 +2070,7 @@ async def sample_delete_api_config():
                 print(response)
 
         Args:
-            request (Union[google.cloud.apigateway_v1.types.DeleteApiConfigRequest, dict]):
+            request (Optional[Union[google.cloud.apigateway_v1.types.DeleteApiConfigRequest, dict]]):
                 The request object. Request message for
                 ApiGatewayService.DeleteApiConfig
             name (:class:`str`):
diff --git a/google/cloud/apigateway_v1/services/api_gateway_service/client.py b/google/cloud/apigateway_v1/services/api_gateway_service/client.py
index 9c3c280..dc63bdd 100644
--- a/google/cloud/apigateway_v1/services/api_gateway_service/client.py
+++ b/google/cloud/apigateway_v1/services/api_gateway_service/client.py
@@ -16,7 +16,18 @@
 from collections import OrderedDict
 import os
 import re
-from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union, cast
+from typing import (
+    Dict,
+    Mapping,
+    MutableMapping,
+    MutableSequence,
+    Optional,
+    Sequence,
+    Tuple,
+    Type,
+    Union,
+    cast,
+)
 
 from google.api_core import client_options as client_options_lib
 from google.api_core import exceptions as core_exceptions
@@ -64,7 +75,7 @@ class ApiGatewayServiceClientMeta(type):
 
     def get_transport_class(
         cls,
-        label: str = None,
+        label: Optional[str] = None,
     ) -> Type[ApiGatewayServiceTransport]:
         """Returns an appropriate transport class.
 
@@ -434,7 +445,7 @@ def __init__(
         self,
         *,
         credentials: Optional[ga_credentials.Credentials] = None,
-        transport: Union[str, ApiGatewayServiceTransport, None] = None,
+        transport: Optional[Union[str, ApiGatewayServiceTransport]] = None,
         client_options: Optional[Union[client_options_lib.ClientOptions, dict]] = None,
         client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
     ) -> None:
@@ -532,11 +543,11 @@ def __init__(
 
     def list_gateways(
         self,
-        request: Union[apigateway.ListGatewaysRequest, dict] = None,
+        request: Optional[Union[apigateway.ListGatewaysRequest, dict]] = None,
         *,
-        parent: str = None,
+        parent: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> pagers.ListGatewaysPager:
         r"""Lists Gateways in a given project and location.
@@ -647,11 +658,11 @@ def sample_list_gateways():
 
     def get_gateway(
         self,
-        request: Union[apigateway.GetGatewayRequest, dict] = None,
+        request: Optional[Union[apigateway.GetGatewayRequest, dict]] = None,
         *,
-        name: str = None,
+        name: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> apigateway.Gateway:
         r"""Gets details of a single Gateway.
@@ -753,13 +764,13 @@ def sample_get_gateway():
 
     def create_gateway(
         self,
-        request: Union[apigateway.CreateGatewayRequest, dict] = None,
+        request: Optional[Union[apigateway.CreateGatewayRequest, dict]] = None,
         *,
-        parent: str = None,
-        gateway: apigateway.Gateway = None,
-        gateway_id: str = None,
+        parent: Optional[str] = None,
+        gateway: Optional[apigateway.Gateway] = None,
+        gateway_id: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation.Operation:
         r"""Creates a new Gateway in a given project and
@@ -896,12 +907,12 @@ def sample_create_gateway():
 
     def update_gateway(
         self,
-        request: Union[apigateway.UpdateGatewayRequest, dict] = None,
+        request: Optional[Union[apigateway.UpdateGatewayRequest, dict]] = None,
         *,
-        gateway: apigateway.Gateway = None,
-        update_mask: field_mask_pb2.FieldMask = None,
+        gateway: Optional[apigateway.Gateway] = None,
+        update_mask: Optional[field_mask_pb2.FieldMask] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation.Operation:
         r"""Updates the parameters of a single Gateway.
@@ -1031,11 +1042,11 @@ def sample_update_gateway():
 
     def delete_gateway(
         self,
-        request: Union[apigateway.DeleteGatewayRequest, dict] = None,
+        request: Optional[Union[apigateway.DeleteGatewayRequest, dict]] = None,
         *,
-        name: str = None,
+        name: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation.Operation:
         r"""Deletes a single Gateway.
@@ -1155,11 +1166,11 @@ def sample_delete_gateway():
 
     def list_apis(
         self,
-        request: Union[apigateway.ListApisRequest, dict] = None,
+        request: Optional[Union[apigateway.ListApisRequest, dict]] = None,
         *,
-        parent: str = None,
+        parent: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> pagers.ListApisPager:
         r"""Lists Apis in a given project and location.
@@ -1270,11 +1281,11 @@ def sample_list_apis():
 
     def get_api(
         self,
-        request: Union[apigateway.GetApiRequest, dict] = None,
+        request: Optional[Union[apigateway.GetApiRequest, dict]] = None,
         *,
-        name: str = None,
+        name: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> apigateway.Api:
         r"""Gets details of a single Api.
@@ -1372,13 +1383,13 @@ def sample_get_api():
 
     def create_api(
         self,
-        request: Union[apigateway.CreateApiRequest, dict] = None,
+        request: Optional[Union[apigateway.CreateApiRequest, dict]] = None,
         *,
-        parent: str = None,
-        api: apigateway.Api = None,
-        api_id: str = None,
+        parent: Optional[str] = None,
+        api: Optional[apigateway.Api] = None,
+        api_id: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation.Operation:
         r"""Creates a new Api in a given project and location.
@@ -1509,12 +1520,12 @@ def sample_create_api():
 
     def update_api(
         self,
-        request: Union[apigateway.UpdateApiRequest, dict] = None,
+        request: Optional[Union[apigateway.UpdateApiRequest, dict]] = None,
         *,
-        api: apigateway.Api = None,
-        update_mask: field_mask_pb2.FieldMask = None,
+        api: Optional[apigateway.Api] = None,
+        update_mask: Optional[field_mask_pb2.FieldMask] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation.Operation:
         r"""Updates the parameters of a single Api.
@@ -1637,11 +1648,11 @@ def sample_update_api():
 
     def delete_api(
         self,
-        request: Union[apigateway.DeleteApiRequest, dict] = None,
+        request: Optional[Union[apigateway.DeleteApiRequest, dict]] = None,
         *,
-        name: str = None,
+        name: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation.Operation:
         r"""Deletes a single Api.
@@ -1761,11 +1772,11 @@ def sample_delete_api():
 
     def list_api_configs(
         self,
-        request: Union[apigateway.ListApiConfigsRequest, dict] = None,
+        request: Optional[Union[apigateway.ListApiConfigsRequest, dict]] = None,
         *,
-        parent: str = None,
+        parent: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> pagers.ListApiConfigsPager:
         r"""Lists ApiConfigs in a given project and location.
@@ -1876,11 +1887,11 @@ def sample_list_api_configs():
 
     def get_api_config(
         self,
-        request: Union[apigateway.GetApiConfigRequest, dict] = None,
+        request: Optional[Union[apigateway.GetApiConfigRequest, dict]] = None,
         *,
-        name: str = None,
+        name: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> apigateway.ApiConfig:
         r"""Gets details of a single ApiConfig.
@@ -1979,13 +1990,13 @@ def sample_get_api_config():
 
     def create_api_config(
         self,
-        request: Union[apigateway.CreateApiConfigRequest, dict] = None,
+        request: Optional[Union[apigateway.CreateApiConfigRequest, dict]] = None,
         *,
-        parent: str = None,
-        api_config: apigateway.ApiConfig = None,
-        api_config_id: str = None,
+        parent: Optional[str] = None,
+        api_config: Optional[apigateway.ApiConfig] = None,
+        api_config_id: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation.Operation:
         r"""Creates a new ApiConfig in a given project and
@@ -2116,12 +2127,12 @@ def sample_create_api_config():
 
     def update_api_config(
         self,
-        request: Union[apigateway.UpdateApiConfigRequest, dict] = None,
+        request: Optional[Union[apigateway.UpdateApiConfigRequest, dict]] = None,
         *,
-        api_config: apigateway.ApiConfig = None,
-        update_mask: field_mask_pb2.FieldMask = None,
+        api_config: Optional[apigateway.ApiConfig] = None,
+        update_mask: Optional[field_mask_pb2.FieldMask] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation.Operation:
         r"""Updates the parameters of a single ApiConfig.
@@ -2245,11 +2256,11 @@ def sample_update_api_config():
 
     def delete_api_config(
         self,
-        request: Union[apigateway.DeleteApiConfigRequest, dict] = None,
+        request: Optional[Union[apigateway.DeleteApiConfigRequest, dict]] = None,
         *,
-        name: str = None,
+        name: Optional[str] = None,
         retry: OptionalRetry = gapic_v1.method.DEFAULT,
-        timeout: float = None,
+        timeout: Optional[float] = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> operation.Operation:
         r"""Deletes a single ApiConfig.
diff --git a/google/cloud/apigateway_v1/services/api_gateway_service/transports/base.py b/google/cloud/apigateway_v1/services/api_gateway_service/transports/base.py
index 3e05a2f..d6181fc 100644
--- a/google/cloud/apigateway_v1/services/api_gateway_service/transports/base.py
+++ b/google/cloud/apigateway_v1/services/api_gateway_service/transports/base.py
@@ -49,7 +49,7 @@ def __init__(
         self,
         *,
         host: str = DEFAULT_HOST,
-        credentials: ga_credentials.Credentials = None,
+        credentials: Optional[ga_credentials.Credentials] = None,
         credentials_file: Optional[str] = None,
         scopes: Optional[Sequence[str]] = None,
         quota_project_id: Optional[str] = None,
diff --git a/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc.py b/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc.py
index 7dc4767..430d5c0 100644
--- a/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc.py
+++ b/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc.py
@@ -48,14 +48,14 @@ def __init__(
         self,
         *,
         host: str = "apigateway.googleapis.com",
-        credentials: ga_credentials.Credentials = None,
-        credentials_file: str = None,
-        scopes: Sequence[str] = None,
-        channel: grpc.Channel = None,
-        api_mtls_endpoint: str = None,
-        client_cert_source: Callable[[], Tuple[bytes, bytes]] = None,
-        ssl_channel_credentials: grpc.ChannelCredentials = None,
-        client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None,
+        credentials: Optional[ga_credentials.Credentials] = None,
+        credentials_file: Optional[str] = None,
+        scopes: Optional[Sequence[str]] = None,
+        channel: Optional[grpc.Channel] = None,
+        api_mtls_endpoint: Optional[str] = None,
+        client_cert_source: Optional[Callable[[], Tuple[bytes, bytes]]] = None,
+        ssl_channel_credentials: Optional[grpc.ChannelCredentials] = None,
+        client_cert_source_for_mtls: Optional[Callable[[], Tuple[bytes, bytes]]] = None,
         quota_project_id: Optional[str] = None,
         client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
         always_use_jwt_access: Optional[bool] = False,
@@ -183,8 +183,8 @@ def __init__(
     def create_channel(
         cls,
         host: str = "apigateway.googleapis.com",
-        credentials: ga_credentials.Credentials = None,
-        credentials_file: str = None,
+        credentials: Optional[ga_credentials.Credentials] = None,
+        credentials_file: Optional[str] = None,
         scopes: Optional[Sequence[str]] = None,
         quota_project_id: Optional[str] = None,
         **kwargs,
diff --git a/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc_asyncio.py b/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc_asyncio.py
index a9fd5d6..750a8f7 100644
--- a/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc_asyncio.py
+++ b/google/cloud/apigateway_v1/services/api_gateway_service/transports/grpc_asyncio.py
@@ -50,7 +50,7 @@ class ApiGatewayServiceGrpcAsyncIOTransport(ApiGatewayServiceTransport):
     def create_channel(
         cls,
         host: str = "apigateway.googleapis.com",
-        credentials: ga_credentials.Credentials = None,
+        credentials: Optional[ga_credentials.Credentials] = None,
         credentials_file: Optional[str] = None,
         scopes: Optional[Sequence[str]] = None,
         quota_project_id: Optional[str] = None,
@@ -93,15 +93,15 @@ def __init__(
         self,
         *,
         host: str = "apigateway.googleapis.com",
-        credentials: ga_credentials.Credentials = None,
+        credentials: Optional[ga_credentials.Credentials] = None,
         credentials_file: Optional[str] = None,
         scopes: Optional[Sequence[str]] = None,
-        channel: aio.Channel = None,
-        api_mtls_endpoint: str = None,
-        client_cert_source: Callable[[], Tuple[bytes, bytes]] = None,
-        ssl_channel_credentials: grpc.ChannelCredentials = None,
-        client_cert_source_for_mtls: Callable[[], Tuple[bytes, bytes]] = None,
-        quota_project_id=None,
+        channel: Optional[aio.Channel] = None,
+        api_mtls_endpoint: Optional[str] = None,
+        client_cert_source: Optional[Callable[[], Tuple[bytes, bytes]]] = None,
+        ssl_channel_credentials: Optional[grpc.ChannelCredentials] = None,
+        client_cert_source_for_mtls: Optional[Callable[[], Tuple[bytes, bytes]]] = None,
+        quota_project_id: Optional[str] = None,
         client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
         always_use_jwt_access: Optional[bool] = False,
         api_audience: Optional[str] = None,
diff --git a/google/cloud/apigateway_v1/types/apigateway.py b/google/cloud/apigateway_v1/types/apigateway.py
index f6306ff..2a22f87 100644
--- a/google/cloud/apigateway_v1/types/apigateway.py
+++ b/google/cloud/apigateway_v1/types/apigateway.py
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+from typing import MutableMapping, MutableSequence
+
 from google.protobuf import field_mask_pb2  # type: ignore
 from google.protobuf import timestamp_pb2  # type: ignore
 import proto  # type: ignore
@@ -58,7 +60,7 @@ class Api(proto.Message):
             Output only. Created time.
         update_time (google.protobuf.timestamp_pb2.Timestamp):
             Output only. Updated time.
-        labels (Mapping[str, str]):
+        labels (MutableMapping[str, str]):
             Optional. Resource labels to represent
             user-provided metadata. Refer to cloud
             documentation on labels for more details.
@@ -85,34 +87,34 @@ class State(proto.Enum):
         DELETING = 4
         UPDATING = 5
 
-    name = proto.Field(
+    name: str = proto.Field(
         proto.STRING,
         number=1,
     )
-    create_time = proto.Field(
+    create_time: timestamp_pb2.Timestamp = proto.Field(
         proto.MESSAGE,
         number=2,
         message=timestamp_pb2.Timestamp,
     )
-    update_time = proto.Field(
+    update_time: timestamp_pb2.Timestamp = proto.Field(
         proto.MESSAGE,
         number=3,
         message=timestamp_pb2.Timestamp,
     )
-    labels = proto.MapField(
+    labels: MutableMapping[str, str] = proto.MapField(
         proto.STRING,
         proto.STRING,
         number=4,
     )
-    display_name = proto.Field(
+    display_name: str = proto.Field(
         proto.STRING,
         number=5,
     )
-    managed_service = proto.Field(
+    managed_service: str = proto.Field(
         proto.STRING,
         number=7,
     )
-    state = proto.Field(
+    state: State = proto.Field(
         proto.ENUM,
         number=12,
         enum=State,
@@ -131,7 +133,7 @@ class ApiConfig(proto.Message):
             Output only. Created time.
         update_time (google.protobuf.timestamp_pb2.Timestamp):
             Output only. Updated time.
-        labels (Mapping[str, str]):
+        labels (MutableMapping[str, str]):
             Optional. Resource labels to represent
             user-provided metadata. Refer to cloud
             documentation on labels for more details.
@@ -153,14 +155,14 @@ class ApiConfig(proto.Message):
             https://cloud.google.com/service-infrastructure/docs/glossary#config).
         state (google.cloud.apigateway_v1.types.ApiConfig.State):
             Output only. State of the API Config.
-        openapi_documents (Sequence[google.cloud.apigateway_v1.types.ApiConfig.OpenApiDocument]):
+        openapi_documents (MutableSequence[google.cloud.apigateway_v1.types.ApiConfig.OpenApiDocument]):
             Optional. OpenAPI specification documents. If specified,
             grpc_services and managed_service_configs must not be
             included.
-        grpc_services (Sequence[google.cloud.apigateway_v1.types.ApiConfig.GrpcServiceDefinition]):
+        grpc_services (MutableSequence[google.cloud.apigateway_v1.types.ApiConfig.GrpcServiceDefinition]):
             Optional. gRPC service definition files. If specified,
             openapi_documents must not be included.
-        managed_service_configs (Sequence[google.cloud.apigateway_v1.types.ApiConfig.File]):
+        managed_service_configs (MutableSequence[google.cloud.apigateway_v1.types.ApiConfig.File]):
             Optional. Service Configuration files. At least one must be
             included when using gRPC service definitions. See
             https://cloud.google.com/endpoints/docs/grpc/grpc-service-config#service_configuration_overview
@@ -198,11 +200,11 @@ class File(proto.Message):
                 The bytes that constitute the file.
         """
 
-        path = proto.Field(
+        path: str = proto.Field(
             proto.STRING,
             number=1,
         )
-        contents = proto.Field(
+        contents: bytes = proto.Field(
             proto.BYTES,
             number=2,
         )
@@ -215,7 +217,7 @@ class OpenApiDocument(proto.Message):
                 The OpenAPI Specification document file.
         """
 
-        document = proto.Field(
+        document: "ApiConfig.File" = proto.Field(
             proto.MESSAGE,
             number=1,
             message="ApiConfig.File",
@@ -234,71 +236,71 @@ class GrpcServiceDefinition(proto.Message):
 
                 $ protoc --include_imports --include_source_info test.proto
                 -o out.pb
-            source (Sequence[google.cloud.apigateway_v1.types.ApiConfig.File]):
+            source (MutableSequence[google.cloud.apigateway_v1.types.ApiConfig.File]):
                 Optional. Uncompiled proto files associated with the
                 descriptor set, used for display purposes (server-side
                 compilation is not supported). These should match the inputs
                 to 'protoc' command used to generate file_descriptor_set.
         """
 
-        file_descriptor_set = proto.Field(
+        file_descriptor_set: "ApiConfig.File" = proto.Field(
             proto.MESSAGE,
             number=1,
             message="ApiConfig.File",
         )
-        source = proto.RepeatedField(
+        source: MutableSequence["ApiConfig.File"] = proto.RepeatedField(
             proto.MESSAGE,
             number=2,
             message="ApiConfig.File",
         )
 
-    name = proto.Field(
+    name: str = proto.Field(
         proto.STRING,
         number=1,
     )
-    create_time = proto.Field(
+    create_time: timestamp_pb2.Timestamp = proto.Field(
         proto.MESSAGE,
         number=2,
         message=timestamp_pb2.Timestamp,
     )
-    update_time = proto.Field(
+    update_time: timestamp_pb2.Timestamp = proto.Field(
         proto.MESSAGE,
         number=3,
         message=timestamp_pb2.Timestamp,
     )
-    labels = proto.MapField(
+    labels: MutableMapping[str, str] = proto.MapField(
         proto.STRING,
         proto.STRING,
         number=4,
     )
-    display_name = proto.Field(
+    display_name: str = proto.Field(
         proto.STRING,
         number=5,
     )
-    gateway_service_account = proto.Field(
+    gateway_service_account: str = proto.Field(
         proto.STRING,
         number=14,
     )
-    service_config_id = proto.Field(
+    service_config_id: str = proto.Field(
         proto.STRING,
         number=12,
     )
-    state = proto.Field(
+    state: State = proto.Field(
         proto.ENUM,
         number=8,
         enum=State,
     )
-    openapi_documents = proto.RepeatedField(
+    openapi_documents: MutableSequence[OpenApiDocument] = proto.RepeatedField(
         proto.MESSAGE,
         number=9,
         message=OpenApiDocument,
     )
-    grpc_services = proto.RepeatedField(
+    grpc_services: MutableSequence[GrpcServiceDefinition] = proto.RepeatedField(
         proto.MESSAGE,
         number=10,
         message=GrpcServiceDefinition,
     )
-    managed_service_configs = proto.RepeatedField(
+    managed_service_configs: MutableSequence[File] = proto.RepeatedField(
         proto.MESSAGE,
         number=11,
         message=File,
@@ -319,7 +321,7 @@ class Gateway(proto.Message):
             Output only. Created time.
         update_time (google.protobuf.timestamp_pb2.Timestamp):
             Output only. Updated time.
-        labels (Mapping[str, str]):
+        labels (MutableMapping[str, str]):
             Optional. Resource labels to represent
             user-provided metadata. Refer to cloud
             documentation on labels for more details.
@@ -347,39 +349,39 @@ class State(proto.Enum):
         DELETING = 4
         UPDATING = 5
 
-    name = proto.Field(
+    name: str = proto.Field(
         proto.STRING,
         number=1,
     )
-    create_time = proto.Field(
+    create_time: timestamp_pb2.Timestamp = proto.Field(
         proto.MESSAGE,
         number=2,
         message=timestamp_pb2.Timestamp,
     )
-    update_time = proto.Field(
+    update_time: timestamp_pb2.Timestamp = proto.Field(
         proto.MESSAGE,
         number=3,
         message=timestamp_pb2.Timestamp,
     )
-    labels = proto.MapField(
+    labels: MutableMapping[str, str] = proto.MapField(
         proto.STRING,
         proto.STRING,
         number=4,
     )
-    display_name = proto.Field(
+    display_name: str = proto.Field(
         proto.STRING,
         number=5,
     )
-    api_config = proto.Field(
+    api_config: str = proto.Field(
         proto.STRING,
         number=6,
     )
-    state = proto.Field(
+    state: State = proto.Field(
         proto.ENUM,
         number=7,
         enum=State,
     )
-    default_hostname = proto.Field(
+    default_hostname: str = proto.Field(
         proto.STRING,
         number=9,
     )
@@ -402,23 +404,23 @@ class ListGatewaysRequest(proto.Message):
             Order by parameters.
     """
 
-    parent = proto.Field(
+    parent: str = proto.Field(
         proto.STRING,
         number=1,
     )
-    page_size = proto.Field(
+    page_size: int = proto.Field(
         proto.INT32,
         number=2,
     )
-    page_token = proto.Field(
+    page_token: str = proto.Field(
         proto.STRING,
         number=3,
     )
-    filter = proto.Field(
+    filter: str = proto.Field(
         proto.STRING,
         number=4,
     )
-    order_by = proto.Field(
+    order_by: str = proto.Field(
         proto.STRING,
         number=5,
     )
@@ -428,11 +430,11 @@ class ListGatewaysResponse(proto.Message):
     r"""Response message for ApiGatewayService.ListGateways
 
     Attributes:
-        gateways (Sequence[google.cloud.apigateway_v1.types.Gateway]):
+        gateways (MutableSequence[google.cloud.apigateway_v1.types.Gateway]):
             Gateways.
         next_page_token (str):
             Next page token.
-        unreachable_locations (Sequence[str]):
+        unreachable_locations (MutableSequence[str]):
             Locations that could not be reached.
     """
 
@@ -440,16 +442,16 @@ class ListGatewaysResponse(proto.Message):
     def raw_page(self):
         return self
 
-    gateways = proto.RepeatedField(
+    gateways: MutableSequence["Gateway"] = proto.RepeatedField(
         proto.MESSAGE,
         number=1,
         message="Gateway",
     )
-    next_page_token = proto.Field(
+    next_page_token: str = proto.Field(
         proto.STRING,
         number=2,
     )
-    unreachable_locations = proto.RepeatedField(
+    unreachable_locations: MutableSequence[str] = proto.RepeatedField(
         proto.STRING,
         number=3,
     )
@@ -464,7 +466,7 @@ class GetGatewayRequest(proto.Message):
             ``projects/*/locations/*/gateways/*``
     """
 
-    name = proto.Field(
+    name: str = proto.Field(
         proto.STRING,
         number=1,
     )
@@ -485,15 +487,15 @@ class CreateGatewayRequest(proto.Message):
             Required. Gateway resource.
     """
 
-    parent = proto.Field(
+    parent: str = proto.Field(
         proto.STRING,
         number=1,
     )
-    gateway_id = proto.Field(
+    gateway_id: str = proto.Field(
         proto.STRING,
         number=2,
     )
-    gateway = proto.Field(
+    gateway: "Gateway" = proto.Field(
         proto.MESSAGE,
         number=3,
         message="Gateway",
@@ -515,12 +517,12 @@ class UpdateGatewayRequest(proto.Message):
             Required. Gateway resource.
     """
 
-    update_mask = proto.Field(
+    update_mask: field_mask_pb2.FieldMask = proto.Field(
         proto.MESSAGE,
         number=1,
         message=field_mask_pb2.FieldMask,
     )
-    gateway = proto.Field(
+    gateway: "Gateway" = proto.Field(
         proto.MESSAGE,
         number=2,
         message="Gateway",
@@ -536,7 +538,7 @@ class DeleteGatewayRequest(proto.Message):
             ``projects/*/locations/*/gateways/*``
     """
 
-    name = proto.Field(
+    name: str = proto.Field(
         proto.STRING,
         number=1,
     )
@@ -559,23 +561,23 @@ class ListApisRequest(proto.Message):
             Order by parameters.
     """
 
-    parent = proto.Field(
+    parent: str = proto.Field(
         proto.STRING,
         number=1,
     )
-    page_size = proto.Field(
+    page_size: int = proto.Field(
         proto.INT32,
         number=2,
     )
-    page_token = proto.Field(
+    page_token: str = proto.Field(
         proto.STRING,
         number=3,
     )
-    filter = proto.Field(
+    filter: str = proto.Field(
         proto.STRING,
         number=4,
     )
-    order_by = proto.Field(
+    order_by: str = proto.Field(
         proto.STRING,
         number=5,
     )
@@ -585,11 +587,11 @@ class ListApisResponse(proto.Message):
     r"""Response message for ApiGatewayService.ListApis
 
     Attributes:
-        apis (Sequence[google.cloud.apigateway_v1.types.Api]):
+        apis (MutableSequence[google.cloud.apigateway_v1.types.Api]):
             APIs.
         next_page_token (str):
             Next page token.
-        unreachable_locations (Sequence[str]):
+        unreachable_locations (MutableSequence[str]):
             Locations that could not be reached.
     """
 
@@ -597,16 +599,16 @@ class ListApisResponse(proto.Message):
     def raw_page(self):
         return self
 
-    apis = proto.RepeatedField(
+    apis: MutableSequence["Api"] = proto.RepeatedField(
         proto.MESSAGE,
         number=1,
         message="Api",
     )
-    next_page_token = proto.Field(
+    next_page_token: str = proto.Field(
         proto.STRING,
         number=2,
     )
-    unreachable_locations = proto.RepeatedField(
+    unreachable_locations: MutableSequence[str] = proto.RepeatedField(
         proto.STRING,
         number=3,
     )
@@ -621,7 +623,7 @@ class GetApiRequest(proto.Message):
             ``projects/*/locations/global/apis/*``
     """
 
-    name = proto.Field(
+    name: str = proto.Field(
         proto.STRING,
         number=1,
     )
@@ -642,15 +644,15 @@ class CreateApiRequest(proto.Message):
             Required. API resource.
     """
 
-    parent = proto.Field(
+    parent: str = proto.Field(
         proto.STRING,
         number=1,
     )
-    api_id = proto.Field(
+    api_id: str = proto.Field(
         proto.STRING,
         number=2,
     )
-    api = proto.Field(
+    api: "Api" = proto.Field(
         proto.MESSAGE,
         number=3,
         message="Api",
@@ -672,12 +674,12 @@ class UpdateApiRequest(proto.Message):
             Required. API resource.
     """
 
-    update_mask = proto.Field(
+    update_mask: field_mask_pb2.FieldMask = proto.Field(
         proto.MESSAGE,
         number=1,
         message=field_mask_pb2.FieldMask,
     )
-    api = proto.Field(
+    api: "Api" = proto.Field(
         proto.MESSAGE,
         number=2,
         message="Api",
@@ -693,7 +695,7 @@ class DeleteApiRequest(proto.Message):
             ``projects/*/locations/global/apis/*``
     """
 
-    name = proto.Field(
+    name: str = proto.Field(
         proto.STRING,
         number=1,
     )
@@ -716,23 +718,23 @@ class ListApiConfigsRequest(proto.Message):
             Order by parameters.
     """
 
-    parent = proto.Field(
+    parent: str = proto.Field(
         proto.STRING,
         number=1,
     )
-    page_size = proto.Field(
+    page_size: int = proto.Field(
         proto.INT32,
         number=2,
     )
-    page_token = proto.Field(
+    page_token: str = proto.Field(
         proto.STRING,
         number=3,
     )
-    filter = proto.Field(
+    filter: str = proto.Field(
         proto.STRING,
         number=4,
     )
-    order_by = proto.Field(
+    order_by: str = proto.Field(
         proto.STRING,
         number=5,
     )
@@ -742,11 +744,11 @@ class ListApiConfigsResponse(proto.Message):
     r"""Response message for ApiGatewayService.ListApiConfigs
 
     Attributes:
-        api_configs (Sequence[google.cloud.apigateway_v1.types.ApiConfig]):
+        api_configs (MutableSequence[google.cloud.apigateway_v1.types.ApiConfig]):
             API Configs.
         next_page_token (str):
             Next page token.
-        unreachable_locations (Sequence[str]):
+        unreachable_locations (MutableSequence[str]):
             Locations that could not be reached.
     """
 
@@ -754,16 +756,16 @@ class ListApiConfigsResponse(proto.Message):
     def raw_page(self):
         return self
 
-    api_configs = proto.RepeatedField(
+    api_configs: MutableSequence["ApiConfig"] = proto.RepeatedField(
         proto.MESSAGE,
         number=1,
         message="ApiConfig",
     )
-    next_page_token = proto.Field(
+    next_page_token: str = proto.Field(
         proto.STRING,
         number=2,
     )
-    unreachable_locations = proto.RepeatedField(
+    unreachable_locations: MutableSequence[str] = proto.RepeatedField(
         proto.STRING,
         number=3,
     )
@@ -789,11 +791,11 @@ class ConfigView(proto.Enum):
         BASIC = 1
         FULL = 2
 
-    name = proto.Field(
+    name: str = proto.Field(
         proto.STRING,
         number=1,
     )
-    view = proto.Field(
+    view: ConfigView = proto.Field(
         proto.ENUM,
         number=3,
         enum=ConfigView,
@@ -815,15 +817,15 @@ class CreateApiConfigRequest(proto.Message):
             Required. API resource.
     """
 
-    parent = proto.Field(
+    parent: str = proto.Field(
         proto.STRING,
         number=1,
     )
-    api_config_id = proto.Field(
+    api_config_id: str = proto.Field(
         proto.STRING,
         number=2,
     )
-    api_config = proto.Field(
+    api_config: "ApiConfig" = proto.Field(
         proto.MESSAGE,
         number=3,
         message="ApiConfig",
@@ -845,12 +847,12 @@ class UpdateApiConfigRequest(proto.Message):
             Required. API Config resource.
     """
 
-    update_mask = proto.Field(
+    update_mask: field_mask_pb2.FieldMask = proto.Field(
         proto.MESSAGE,
         number=1,
         message=field_mask_pb2.FieldMask,
     )
-    api_config = proto.Field(
+    api_config: "ApiConfig" = proto.Field(
         proto.MESSAGE,
         number=2,
         message="ApiConfig",
@@ -866,7 +868,7 @@ class DeleteApiConfigRequest(proto.Message):
             ``projects/*/locations/global/apis/*/configs/*``
     """
 
-    name = proto.Field(
+    name: str = proto.Field(
         proto.STRING,
         number=1,
     )
@@ -900,7 +902,7 @@ class OperationMetadata(proto.Message):
         api_version (str):
             Output only. API version used to start the
             operation.
-        diagnostics (Sequence[google.cloud.apigateway_v1.types.OperationMetadata.Diagnostic]):
+        diagnostics (MutableSequence[google.cloud.apigateway_v1.types.OperationMetadata.Diagnostic]):
             Output only. Diagnostics generated during
             processing of configuration source files.
     """
@@ -915,46 +917,46 @@ class Diagnostic(proto.Message):
                 The diagnostic message.
         """
 
-        location = proto.Field(
+        location: str = proto.Field(
             proto.STRING,
             number=1,
         )
-        message = proto.Field(
+        message: str = proto.Field(
             proto.STRING,
             number=2,
         )
 
-    create_time = proto.Field(
+    create_time: timestamp_pb2.Timestamp = proto.Field(
         proto.MESSAGE,
         number=1,
         message=timestamp_pb2.Timestamp,
     )
-    end_time = proto.Field(
+    end_time: timestamp_pb2.Timestamp = proto.Field(
         proto.MESSAGE,
         number=2,
         message=timestamp_pb2.Timestamp,
     )
-    target = proto.Field(
+    target: str = proto.Field(
         proto.STRING,
         number=3,
     )
-    verb = proto.Field(
+    verb: str = proto.Field(
         proto.STRING,
         number=4,
     )
-    status_message = proto.Field(
+    status_message: str = proto.Field(
         proto.STRING,
         number=5,
     )
-    requested_cancellation = proto.Field(
+    requested_cancellation: bool = proto.Field(
         proto.BOOL,
         number=6,
     )
-    api_version = proto.Field(
+    api_version: str = proto.Field(
         proto.STRING,
         number=7,
     )
-    diagnostics = proto.RepeatedField(
+    diagnostics: MutableSequence[Diagnostic] = proto.RepeatedField(
         proto.MESSAGE,
         number=8,
         message=Diagnostic,
diff --git a/noxfile.py b/noxfile.py
index 29d0200..d8440c0 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -273,7 +273,7 @@ def cover(session):
     session.run("coverage", "erase")
 
 
-@nox.session(python=DEFAULT_PYTHON_VERSION)
+@nox.session(python="3.9")
 def docs(session):
     """Build the docs for this library."""
 
@@ -299,7 +299,7 @@ def docs(session):
     )
 
 
-@nox.session(python=DEFAULT_PYTHON_VERSION)
+@nox.session(python="3.9")
 def docfx(session):
     """Build the docfx yaml files for this library."""
 
diff --git a/release-please-config.json b/release-please-config.json
index a76aaeb..37ce9f2 100644
--- a/release-please-config.json
+++ b/release-please-config.json
@@ -7,7 +7,7 @@
         "google/cloud/apigateway/gapic_version.py",
         {
           "type": "json",
-          "path": "samples/generated_samples/snippet_metadata_apigateway_v1.json",
+          "path": "samples/generated_samples/snippet_metadata_google.cloud.apigateway.v1.json",
           "jsonpath": "$.clientLibrary.version"
         }
       ]
diff --git a/samples/generated_samples/snippet_metadata_apigateway_v1.json b/samples/generated_samples/snippet_metadata_google.cloud.apigateway.v1.json
similarity index 99%
rename from samples/generated_samples/snippet_metadata_apigateway_v1.json
rename to samples/generated_samples/snippet_metadata_google.cloud.apigateway.v1.json
index d64250b..9739e3d 100644
--- a/samples/generated_samples/snippet_metadata_apigateway_v1.json
+++ b/samples/generated_samples/snippet_metadata_google.cloud.apigateway.v1.json
@@ -7,7 +7,8 @@
       }
     ],
     "language": "PYTHON",
-    "name": "google-cloud-api-gateway"
+    "name": "google-cloud-api-gateway",
+    "version": "1.5.0"
   },
   "snippets": [
     {
diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt
index aca9f2d..6f3158c 100644
--- a/testing/constraints-3.7.txt
+++ b/testing/constraints-3.7.txt
@@ -4,8 +4,6 @@
 # Pin the version to the lower bound.
 # e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0dev",
 # Then this file should have google-cloud-foo==1.14.0
-# This file is intentionally left empty to test the
-# latest versions of dependencies.
 google-api-core==1.33.2
 proto-plus==1.22.0
 protobuf==3.19.5