feat: add v1

.github/.OwlBot.yaml

@@ -18,9 +18,6 @@ docker:
 deep-remove-regex:
   - /owl-bot-staging
 
-deep-preserve-regex:
-  - /owl-bot-staging/v1
-
 deep-copy-regex:
   - source: /google/cloud/metastore/(v.*)/.*-py/(.*)
     dest: /owl-bot-staging/$1/$2

docs/index.rst

@@ -3,7 +3,15 @@
 .. include:: multiprocessing.rst
 
 This package includes clients for multiple versions of the Dataproc Metastore
-API. By default, you will get ``v1beta``, the latest version.
+API. By default, you will get ``v1``, the latest version.
+
+v1 API Reference
+--------------------
+.. toctree::
+    :maxdepth: 2
+
+    metastore_v1/services
+    metastore_v1/types
 
 v1beta API Reference
 --------------------

docs/metastore_v1/dataproc_metastore.rst

@@ -0,0 +1,10 @@
+DataprocMetastore
+-----------------------------------
+
+.. automodule:: google.cloud.metastore_v1.services.dataproc_metastore
+    :members:
+    :inherited-members:
+
+.. automodule:: google.cloud.metastore_v1.services.dataproc_metastore.pagers
+    :members:
+    :inherited-members:

docs/metastore_v1/services.rst

@@ -0,0 +1,6 @@
+Services for Google Cloud Metastore v1 API
+==========================================
+.. toctree::
+    :maxdepth: 2
+
+    dataproc_metastore

docs/metastore_v1/types.rst

@@ -0,0 +1,7 @@
+Types for Google Cloud Metastore v1 API
+=======================================
+
+.. automodule:: google.cloud.metastore_v1.types
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/metastore_v1alpha/dataproc_metastore.rst

@@ -5,7 +5,6 @@ DataprocMetastore
     :members:
     :inherited-members:
 
-
 .. automodule:: google.cloud.metastore_v1alpha.services.dataproc_metastore.pagers
     :members:
     :inherited-members:

docs/metastore_v1beta/dataproc_metastore.rst

@@ -5,7 +5,6 @@ DataprocMetastore
     :members:
     :inherited-members:
 
-
 .. automodule:: google.cloud.metastore_v1beta.services.dataproc_metastore.pagers
     :members:
     :inherited-members:

google/cloud/metastore/__init__.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-
 # Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,65 +14,49 @@
 # limitations under the License.
 #
 
-from google.cloud.metastore_v1beta.services.dataproc_metastore.async_client import (
-    DataprocMetastoreAsyncClient,
-)
-from google.cloud.metastore_v1beta.services.dataproc_metastore.client import (
+from google.cloud.metastore_v1.services.dataproc_metastore.client import (
     DataprocMetastoreClient,
 )
-from google.cloud.metastore_v1beta.types.metastore import Backup
-from google.cloud.metastore_v1beta.types.metastore import CreateBackupRequest
-from google.cloud.metastore_v1beta.types.metastore import CreateMetadataImportRequest
-from google.cloud.metastore_v1beta.types.metastore import CreateServiceRequest
-from google.cloud.metastore_v1beta.types.metastore import DataCatalogConfig
-from google.cloud.metastore_v1beta.types.metastore import DatabaseDumpSpec
-from google.cloud.metastore_v1beta.types.metastore import DeleteBackupRequest
-from google.cloud.metastore_v1beta.types.metastore import DeleteServiceRequest
-from google.cloud.metastore_v1beta.types.metastore import ExportMetadataRequest
-from google.cloud.metastore_v1beta.types.metastore import GetBackupRequest
-from google.cloud.metastore_v1beta.types.metastore import GetMetadataImportRequest
-from google.cloud.metastore_v1beta.types.metastore import GetServiceRequest
-from google.cloud.metastore_v1beta.types.metastore import HiveMetastoreConfig
-from google.cloud.metastore_v1beta.types.metastore import KerberosConfig
-from google.cloud.metastore_v1beta.types.metastore import ListBackupsRequest
-from google.cloud.metastore_v1beta.types.metastore import ListBackupsResponse
-from google.cloud.metastore_v1beta.types.metastore import ListMetadataImportsRequest
-from google.cloud.metastore_v1beta.types.metastore import ListMetadataImportsResponse
-from google.cloud.metastore_v1beta.types.metastore import ListServicesRequest
-from google.cloud.metastore_v1beta.types.metastore import ListServicesResponse
-from google.cloud.metastore_v1beta.types.metastore import LocationMetadata
-from google.cloud.metastore_v1beta.types.metastore import MaintenanceWindow
-from google.cloud.metastore_v1beta.types.metastore import MetadataExport
-from google.cloud.metastore_v1beta.types.metastore import MetadataImport
-from google.cloud.metastore_v1beta.types.metastore import MetadataIntegration
-from google.cloud.metastore_v1beta.types.metastore import MetadataManagementActivity
-from google.cloud.metastore_v1beta.types.metastore import OperationMetadata
-from google.cloud.metastore_v1beta.types.metastore import Restore
-from google.cloud.metastore_v1beta.types.metastore import RestoreServiceRequest
-from google.cloud.metastore_v1beta.types.metastore import Secret
-from google.cloud.metastore_v1beta.types.metastore import Service
-from google.cloud.metastore_v1beta.types.metastore import UpdateMetadataImportRequest
-from google.cloud.metastore_v1beta.types.metastore import UpdateServiceRequest
+from google.cloud.metastore_v1.services.dataproc_metastore.async_client import (
+    DataprocMetastoreAsyncClient,
+)
+
+from google.cloud.metastore_v1.types.metastore import CreateMetadataImportRequest
+from google.cloud.metastore_v1.types.metastore import CreateServiceRequest
+from google.cloud.metastore_v1.types.metastore import DatabaseDumpSpec
+from google.cloud.metastore_v1.types.metastore import DeleteServiceRequest
+from google.cloud.metastore_v1.types.metastore import ExportMetadataRequest
+from google.cloud.metastore_v1.types.metastore import GetMetadataImportRequest
+from google.cloud.metastore_v1.types.metastore import GetServiceRequest
+from google.cloud.metastore_v1.types.metastore import HiveMetastoreConfig
+from google.cloud.metastore_v1.types.metastore import KerberosConfig
+from google.cloud.metastore_v1.types.metastore import ListMetadataImportsRequest
+from google.cloud.metastore_v1.types.metastore import ListMetadataImportsResponse
+from google.cloud.metastore_v1.types.metastore import ListServicesRequest
+from google.cloud.metastore_v1.types.metastore import ListServicesResponse
+from google.cloud.metastore_v1.types.metastore import LocationMetadata
+from google.cloud.metastore_v1.types.metastore import MaintenanceWindow
+from google.cloud.metastore_v1.types.metastore import MetadataExport
+from google.cloud.metastore_v1.types.metastore import MetadataImport
+from google.cloud.metastore_v1.types.metastore import MetadataManagementActivity
+from google.cloud.metastore_v1.types.metastore import OperationMetadata
+from google.cloud.metastore_v1.types.metastore import Secret
+from google.cloud.metastore_v1.types.metastore import Service
+from google.cloud.metastore_v1.types.metastore import UpdateMetadataImportRequest
+from google.cloud.metastore_v1.types.metastore import UpdateServiceRequest
 
 __all__ = (
-    "Backup",
-    "CreateBackupRequest",
+    "DataprocMetastoreClient",
+    "DataprocMetastoreAsyncClient",
     "CreateMetadataImportRequest",
     "CreateServiceRequest",
-    "DataCatalogConfig",
     "DatabaseDumpSpec",
-    "DataprocMetastoreAsyncClient",
-    "DataprocMetastoreClient",
-    "DeleteBackupRequest",
     "DeleteServiceRequest",
     "ExportMetadataRequest",
-    "GetBackupRequest",
     "GetMetadataImportRequest",
     "GetServiceRequest",
     "HiveMetastoreConfig",
     "KerberosConfig",
-    "ListBackupsRequest",
-    "ListBackupsResponse",
     "ListMetadataImportsRequest",
     "ListMetadataImportsResponse",
     "ListServicesRequest",
@@ -82,11 +65,8 @@
     "MaintenanceWindow",
     "MetadataExport",
     "MetadataImport",
-    "MetadataIntegration",
     "MetadataManagementActivity",
     "OperationMetadata",
-    "Restore",
-    "RestoreServiceRequest",
     "Secret",
     "Service",
     "UpdateMetadataImportRequest",

google/cloud/metastore/py.typed

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

google/cloud/metastore_v1/__init__.py

@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+# Copyright 2020 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 .services.dataproc_metastore import DataprocMetastoreClient
+from .services.dataproc_metastore import DataprocMetastoreAsyncClient
+
+from .types.metastore import CreateMetadataImportRequest
+from .types.metastore import CreateServiceRequest
+from .types.metastore import DatabaseDumpSpec
+from .types.metastore import DeleteServiceRequest
+from .types.metastore import ExportMetadataRequest
+from .types.metastore import GetMetadataImportRequest
+from .types.metastore import GetServiceRequest
+from .types.metastore import HiveMetastoreConfig
+from .types.metastore import KerberosConfig
+from .types.metastore import ListMetadataImportsRequest
+from .types.metastore import ListMetadataImportsResponse
+from .types.metastore import ListServicesRequest
+from .types.metastore import ListServicesResponse
+from .types.metastore import LocationMetadata
+from .types.metastore import MaintenanceWindow
+from .types.metastore import MetadataExport
+from .types.metastore import MetadataImport
+from .types.metastore import MetadataManagementActivity
+from .types.metastore import OperationMetadata
+from .types.metastore import Secret
+from .types.metastore import Service
+from .types.metastore import UpdateMetadataImportRequest
+from .types.metastore import UpdateServiceRequest
+
+__all__ = (
+    "DataprocMetastoreAsyncClient",
+    "CreateMetadataImportRequest",
+    "CreateServiceRequest",
+    "DatabaseDumpSpec",
+    "DataprocMetastoreClient",
+    "DeleteServiceRequest",
+    "ExportMetadataRequest",
+    "GetMetadataImportRequest",
+    "GetServiceRequest",
+    "HiveMetastoreConfig",
+    "KerberosConfig",
+    "ListMetadataImportsRequest",
+    "ListMetadataImportsResponse",
+    "ListServicesRequest",
+    "ListServicesResponse",
+    "LocationMetadata",
+    "MaintenanceWindow",
+    "MetadataExport",
+    "MetadataImport",
+    "MetadataManagementActivity",
+    "OperationMetadata",
+    "Secret",
+    "Service",
+    "UpdateMetadataImportRequest",
+    "UpdateServiceRequest",
+)

google/cloud/metastore_v1/gapic_metadata.json

@@ -0,0 +1,123 @@
+ {
+  "comment": "This file maps proto services/RPCs to the corresponding library clients/methods",
+  "language": "python",
+  "libraryPackage": "google.cloud.metastore_v1",
+  "protoPackage": "google.cloud.metastore.v1",
+  "schema": "1.0",
+  "services": {
+    "DataprocMetastore": {
+      "clients": {
+        "grpc": {
+          "libraryClient": "DataprocMetastoreClient",
+          "rpcs": {
+            "CreateMetadataImport": {
+              "methods": [
+                "create_metadata_import"
+              ]
+            },
+            "CreateService": {
+              "methods": [
+                "create_service"
+              ]
+            },
+            "DeleteService": {
+              "methods": [
+                "delete_service"
+              ]
+            },
+            "ExportMetadata": {
+              "methods": [
+                "export_metadata"
+              ]
+            },
+            "GetMetadataImport": {
+              "methods": [
+                "get_metadata_import"
+              ]
+            },
+            "GetService": {
+              "methods": [
+                "get_service"
+              ]
+            },
+            "ListMetadataImports": {
+              "methods": [
+                "list_metadata_imports"
+              ]
+            },
+            "ListServices": {
+              "methods": [
+                "list_services"
+              ]
+            },
+            "UpdateMetadataImport": {
+              "methods": [
+                "update_metadata_import"
+              ]
+            },
+            "UpdateService": {
+              "methods": [
+                "update_service"
+              ]
+            }
+          }
+        },
+        "grpc-async": {
+          "libraryClient": "DataprocMetastoreAsyncClient",
+          "rpcs": {
+            "CreateMetadataImport": {
+              "methods": [
+                "create_metadata_import"
+              ]
+            },
+            "CreateService": {
+              "methods": [
+                "create_service"
+              ]
+            },
+            "DeleteService": {
+              "methods": [
+                "delete_service"
+              ]
+            },
+            "ExportMetadata": {
+              "methods": [
+                "export_metadata"
+              ]
+            },
+            "GetMetadataImport": {
+              "methods": [
+                "get_metadata_import"
+              ]
+            },
+            "GetService": {
+              "methods": [
+                "get_service"
+              ]
+            },
+            "ListMetadataImports": {
+              "methods": [
+                "list_metadata_imports"
+              ]
+            },
+            "ListServices": {
+              "methods": [
+                "list_services"
+              ]
+            },
+            "UpdateMetadataImport": {
+              "methods": [
+                "update_metadata_import"
+              ]
+            },
+            "UpdateService": {
+              "methods": [
+                "update_service"
+              ]
+            }
+          }
+        }
+      }
+    }
+  }
+}

google/cloud/metastore_v1/py.typed

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