feat: add support for google.cloud.api_keys.__version__ (#26)

* chore: update to gapic-generator-python 1.5.0

feat: add support for `google.cloud.<api>.__version__`
PiperOrigin-RevId: 484665853

Source-Link: googleapis/googleapis@8eb249a

Source-Link: https://github.com/googleapis/googleapis-gen/commit/c8aa327b5f478865fc3fd91e3c2768e54e26ad44
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYzhhYTMyN2I1ZjQ3ODg2NWZjM2ZkOTFlM2MyNzY4ZTU0ZTI2YWQ0NCJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* add .release-please-manifest.json with correct version

* regenerate code using templated owlbot.py and setup.py

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: Anthonios Partheniou <partheniou@google.com>

Author: gcf-owl-bot[bot]

.github/release-please.yml

@@ -1,2 +1,3 @@
 releaseType: python
+manifest: true
 handleGHRelease: true

.release-please-manifest.json

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

google/cloud/api_keys/__init__.py

@@ -0,0 +1,69 @@
+# -*- 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.
+#
+from google.cloud.api_keys import gapic_version as package_version
+
+__version__ = package_version.__version__
+
+
+from google.cloud.api_keys_v2.services.api_keys.async_client import ApiKeysAsyncClient
+from google.cloud.api_keys_v2.services.api_keys.client import ApiKeysClient
+from google.cloud.api_keys_v2.types.apikeys import (
+    CreateKeyRequest,
+    DeleteKeyRequest,
+    GetKeyRequest,
+    GetKeyStringRequest,
+    GetKeyStringResponse,
+    ListKeysRequest,
+    ListKeysResponse,
+    LookupKeyRequest,
+    LookupKeyResponse,
+    UndeleteKeyRequest,
+    UpdateKeyRequest,
+)
+from google.cloud.api_keys_v2.types.resources import (
+    AndroidApplication,
+    AndroidKeyRestrictions,
+    ApiTarget,
+    BrowserKeyRestrictions,
+    IosKeyRestrictions,
+    Key,
+    Restrictions,
+    ServerKeyRestrictions,
+)
+
+__all__ = (
+    "ApiKeysClient",
+    "ApiKeysAsyncClient",
+    "CreateKeyRequest",
+    "DeleteKeyRequest",
+    "GetKeyRequest",
+    "GetKeyStringRequest",
+    "GetKeyStringResponse",
+    "ListKeysRequest",
+    "ListKeysResponse",
+    "LookupKeyRequest",
+    "LookupKeyResponse",
+    "UndeleteKeyRequest",
+    "UpdateKeyRequest",
+    "AndroidApplication",
+    "AndroidKeyRestrictions",
+    "ApiTarget",
+    "BrowserKeyRestrictions",
+    "IosKeyRestrictions",
+    "Key",
+    "Restrictions",
+    "ServerKeyRestrictions",
+)

google/cloud/api_keys/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__ = "0.2.2"  # {x-release-please-version}

google/cloud/api_keys/py.typed

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

google/cloud/api_keys_v2/__init__.py

@@ -13,6 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+from google.cloud.api_keys import gapic_version as package_version
+
+__version__ = package_version.__version__
+
 
 from .services.api_keys import ApiKeysAsyncClient, ApiKeysClient
 from .types.apikeys import (

google/cloud/api_keys_v2/services/api_keys/client.py

@@ -16,7 +16,7 @@
 from collections import OrderedDict
 import os
 import re
-from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union
+from typing import Dict, Mapping, 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
@@ -341,7 +341,7 @@ def __init__(
         *,
         credentials: Optional[ga_credentials.Credentials] = None,
         transport: Union[str, ApiKeysTransport, None] = None,
-        client_options: Optional[client_options_lib.ClientOptions] = None,
+        client_options: Optional[Union[client_options_lib.ClientOptions, dict]] = None,
         client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
     ) -> None:
         """Instantiates the api keys client.
@@ -358,7 +358,7 @@ def __init__(
                 NOTE: "rest" transport functionality is currently in a
                 beta state (preview). We welcome your feedback via an
                 issue in this library's source repository.
-            client_options (google.api_core.client_options.ClientOptions): Custom options for the
+            client_options (Optional[Union[google.api_core.client_options.ClientOptions, dict]]): Custom options for the
                 client. It won't take effect if a ``transport`` instance is provided.
                 (1) The ``api_endpoint`` property can be used to override the
                 default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT
@@ -388,6 +388,7 @@ def __init__(
             client_options = client_options_lib.from_dict(client_options)
         if client_options is None:
             client_options = client_options_lib.ClientOptions()
+        client_options = cast(client_options_lib.ClientOptions, client_options)
 
         api_endpoint, client_cert_source_func = self.get_mtls_endpoint_and_cert_source(
             client_options

owlbot.py

@@ -12,7 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import json
 from pathlib import Path
+import shutil
 
 import synthtool as s
 import synthtool.gcp as gcp
@@ -22,25 +24,33 @@
 # Copy the generated client from the owl-bot staging directory
 # ----------------------------------------------------------------------------
 
-default_version = "v2"
+clean_up_generated_samples = True
+
+# Load the default version defined in .repo-metadata.json.
+default_version = json.load(open(".repo-metadata.json", "rt")).get(
+    "default_version"
+)
 
 for library in s.get_staging_dirs(default_version):
-    s.move(library, excludes=["google/cloud/api_keys/", "setup.py"])
+    if clean_up_generated_samples:
+        shutil.rmtree("samples/generated_samples", ignore_errors=True)
+        clean_up_generated_samples = False
+    s.move([library], excludes=["**/gapic_version.py"])
 s.remove_staging_dirs()
 
 # ----------------------------------------------------------------------------
 # Add templated files
 # ----------------------------------------------------------------------------
 
 templated_files = gcp.CommonTemplates().py_library(
+    cov_level=100,
     microgenerator=True,
     versions=gcp.common.detect_versions(path="./google", default_first=True),
 )
-s.move(templated_files, excludes=[".coveragerc"]) # the microgenerator has a good coveragerc file
+s.move(templated_files, excludes=[".coveragerc", ".github/release-please.yml"])
 
 python.py_samples(skip_readmes=True)
 
-
-# run blacken session for all directories which have a noxfile
+# run format session for all directories which have a noxfile
 for noxfile in Path(".").glob("**/noxfile.py"):
     s.shell.run(["nox", "-s", "format"], cwd=noxfile.parent, hide_output=False)

release-please-config.json

@@ -0,0 +1,18 @@
+{
+  "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
+  "packages": {
+    ".": {
+      "release-type": "python",
+      "extra-files": [
+        "google/cloud/api_keys/gapic_version.py"
+      ]
+    }
+  },
+  "release-type": "python",
+  "plugins": [
+    {
+      "type": "sentence-case"
+    }
+  ],
+  "initial-version": "0.1.0"
+}