feat: added EndpointLocation (v1, v1beta, v1alpha) (#11763)

BEGIN_COMMIT_OVERRIDE feat: added EndpointLocation (v1, v1beta, v1alpha) END_COMMIT_OVERRIDE - [ ] Regenerate this pull request now. PiperOrigin-RevId: 568664317 Source-Link: googleapis/googleapis@9b6656e Source-Link: googleapis/googleapis-gen@1cdc6ea Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWRhdGFwcm9jLW1ldGFzdG9yZS8uT3dsQm90LnlhbWwiLCJoIjoiMWNkYzZlYTRiMDY4ZWU5NzlmMjIxNDNlMWFmMzk5MTlkYzRiMTlkOSJ9 --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: ohmayr <omairnaveed@ymail.com>
googleapis · Sep 29, 2023 · b254665 · b254665
1 parent bfc25b7
commit b254665
Show file tree

Hide file tree

Showing 15 changed files with 106 additions and 43 deletions.
diff --git a/packages/google-cloud-dataproc-metastore/CONTRIBUTING.rst b/packages/google-cloud-dataproc-metastore/CONTRIBUTING.rst
@@ -143,12 +143,12 @@ Running System Tests
    $ nox -s system
 
    # Run a single system test
-   $ nox -s system- -- -k <name of test>
+   $ nox -s system-3.11 -- -k <name of test>
 
 
   .. note::
 
-      System tests are only configured to run under Python.
+      System tests are only configured to run under Python 3.8, 3.9, 3.10 and 3.11.
       For expediency, we do not run them in older versions of Python 3.
 
   This alone will not run the tests. You'll need to change some local

diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore/gapic_version.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.12.1"  # {x-release-please-version}
+__version__ = "0.0.0"  # {x-release-please-version}
diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/gapic_version.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.12.1"  # {x-release-please-version}
+__version__ = "0.0.0"  # {x-release-please-version}
diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/types/metastore.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1/types/metastore.py
@@ -579,6 +579,8 @@ class AuxiliaryVersionConfig(proto.Message):
 class NetworkConfig(proto.Message):
     r"""Network configuration for the Dataproc Metastore service.
 
+    Next available ID: 4
+
     Attributes:
         consumers (MutableSequence[google.cloud.metastore_v1.types.NetworkConfig.Consumer]):
             Immutable. The consumer-side network
@@ -589,6 +591,7 @@ class NetworkConfig(proto.Message):
     class Consumer(proto.Message):
         r"""Contains information of the customer's network
         configurations.
+        Next available ID: 5
 
 
         .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
@@ -609,6 +612,9 @@ class Consumer(proto.Message):
             endpoint_uri (str):
                 Output only. The URI of the endpoint used to
                 access the metastore service.
+            endpoint_location (str):
+                Output only. The location of the endpoint URI. Format:
+                ``projects/{project}/locations/{location}``.
         """
 
         subnetwork: str = proto.Field(
@@ -620,6 +626,10 @@ class Consumer(proto.Message):
             proto.STRING,
             number=3,
         )
+        endpoint_location: str = proto.Field(
+            proto.STRING,
+            number=4,
+        )
 
     consumers: MutableSequence[Consumer] = proto.RepeatedField(
         proto.MESSAGE,

diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/gapic_version.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.12.1"  # {x-release-please-version}
+__version__ = "0.0.0"  # {x-release-please-version}
diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/types/metastore.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1alpha/types/metastore.py
@@ -672,6 +672,8 @@ class AuxiliaryVersionConfig(proto.Message):
 class NetworkConfig(proto.Message):
     r"""Network configuration for the Dataproc Metastore service.
 
+    Next available ID: 4
+
     Attributes:
         consumers (MutableSequence[google.cloud.metastore_v1alpha.types.NetworkConfig.Consumer]):
             Immutable. The consumer-side network
@@ -686,6 +688,7 @@ class NetworkConfig(proto.Message):
     class Consumer(proto.Message):
         r"""Contains information of the customer's network
         configurations.
+        Next available ID: 5
 
 
         .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
@@ -706,6 +709,9 @@ class Consumer(proto.Message):
             endpoint_uri (str):
                 Output only. The URI of the endpoint used to
                 access the metastore service.
+            endpoint_location (str):
+                Output only. The location of the endpoint URI. Format:
+                ``projects/{project}/locations/{location}``.
         """
 
         subnetwork: str = proto.Field(
@@ -717,6 +723,10 @@ class Consumer(proto.Message):
             proto.STRING,
             number=3,
         )
+        endpoint_location: str = proto.Field(
+            proto.STRING,
+            number=4,
+        )
 
     consumers: MutableSequence[Consumer] = proto.RepeatedField(
         proto.MESSAGE,

diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/gapic_version.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/gapic_version.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "1.12.1"  # {x-release-please-version}
+__version__ = "0.0.0"  # {x-release-please-version}
diff --git a/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/types/metastore.py b/packages/google-cloud-dataproc-metastore/google/cloud/metastore_v1beta/types/metastore.py
@@ -672,6 +672,8 @@ class AuxiliaryVersionConfig(proto.Message):
 class NetworkConfig(proto.Message):
     r"""Network configuration for the Dataproc Metastore service.
 
+    Next available ID: 4
+
     Attributes:
         consumers (MutableSequence[google.cloud.metastore_v1beta.types.NetworkConfig.Consumer]):
             Immutable. The consumer-side network
@@ -686,6 +688,7 @@ class NetworkConfig(proto.Message):
     class Consumer(proto.Message):
         r"""Contains information of the customer's network
         configurations.
+        Next available ID: 5
 
 
         .. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
@@ -706,6 +709,9 @@ class Consumer(proto.Message):
             endpoint_uri (str):
                 Output only. The URI of the endpoint used to
                 access the metastore service.
+            endpoint_location (str):
+                Output only. The location of the endpoint URI. Format:
+                ``projects/{project}/locations/{location}``.
         """
 
         subnetwork: str = proto.Field(
@@ -717,6 +723,10 @@ class Consumer(proto.Message):
             proto.STRING,
             number=3,
         )
+        endpoint_location: str = proto.Field(
+            proto.STRING,
+            number=4,
+        )
 
     consumers: MutableSequence[Consumer] = proto.RepeatedField(
         proto.MESSAGE,

diff --git a/packages/google-cloud-dataproc-metastore/noxfile.py b/packages/google-cloud-dataproc-metastore/noxfile.py
@@ -46,7 +46,7 @@
 UNIT_TEST_EXTRAS = []
 UNIT_TEST_EXTRAS_BY_PYTHON = {}
 
-SYSTEM_TEST_PYTHON_VERSIONS = []
+SYSTEM_TEST_PYTHON_VERSIONS = ["3.8", "3.9", "3.10", "3.11"]
 SYSTEM_TEST_STANDARD_DEPENDENCIES = [
     "mock",
     "pytest",
@@ -405,24 +405,3 @@ def prerelease_deps(session):
     session.run("python", "-c", "import google.auth; print(google.auth.__version__)")
 
     session.run("py.test", "tests/unit")
-
-    system_test_path = os.path.join("tests", "system.py")
-    system_test_folder_path = os.path.join("tests", "system")
-
-    # Only run system tests if found.
-    if os.path.exists(system_test_path):
-        session.run(
-            "py.test",
-            "--verbose",
-            f"--junitxml=system_{session.python}_sponge_log.xml",
-            system_test_path,
-            *session.posargs,
-        )
-    if os.path.exists(system_test_folder_path):
-        session.run(
-            "py.test",
-            "--verbose",
-            f"--junitxml=system_{session.python}_sponge_log.xml",
-            system_test_folder_path,
-            *session.posargs,
-        )
diff --git a/...aproc-metastore/samples/generated_samples/snippet_metadata_google.cloud.metastore.v1.json b/...aproc-metastore/samples/generated_samples/snippet_metadata_google.cloud.metastore.v1.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-dataproc-metastore",
-    "version": "1.12.1"
+    "version": "0.1.0"
   },
   "snippets": [
     {

diff --git a/...-metastore/samples/generated_samples/snippet_metadata_google.cloud.metastore.v1alpha.json b/...-metastore/samples/generated_samples/snippet_metadata_google.cloud.metastore.v1alpha.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-dataproc-metastore",
-    "version": "1.12.1"
+    "version": "0.1.0"
   },
   "snippets": [
     {

diff --git a/...c-metastore/samples/generated_samples/snippet_metadata_google.cloud.metastore.v1beta.json b/...c-metastore/samples/generated_samples/snippet_metadata_google.cloud.metastore.v1beta.json
@@ -8,7 +8,7 @@
     ],
     "language": "PYTHON",
     "name": "google-cloud-dataproc-metastore",
-    "version": "1.12.1"
+    "version": "0.1.0"
   },
   "snippets": [
     {

diff --git a/.../google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1/test_dataproc_metastore.py b/.../google-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1/test_dataproc_metastore.py
@@ -6109,7 +6109,11 @@ def test_create_service_rest(request_type):
         "encryption_config": {"kms_key": "kms_key_value"},
         "network_config": {
             "consumers": [
-                {"subnetwork": "subnetwork_value", "endpoint_uri": "endpoint_uri_value"}
+                {
+                    "subnetwork": "subnetwork_value",
+                    "endpoint_uri": "endpoint_uri_value",
+                    "endpoint_location": "endpoint_location_value",
+                }
             ]
         },
         "database_type": 1,
@@ -6372,7 +6376,11 @@ def test_create_service_rest_bad_request(
         "encryption_config": {"kms_key": "kms_key_value"},
         "network_config": {
             "consumers": [
-                {"subnetwork": "subnetwork_value", "endpoint_uri": "endpoint_uri_value"}
+                {
+                    "subnetwork": "subnetwork_value",
+                    "endpoint_uri": "endpoint_uri_value",
+                    "endpoint_location": "endpoint_location_value",
+                }
             ]
         },
         "database_type": 1,
@@ -6532,7 +6540,11 @@ def test_update_service_rest(request_type):
         "encryption_config": {"kms_key": "kms_key_value"},
         "network_config": {
             "consumers": [
-                {"subnetwork": "subnetwork_value", "endpoint_uri": "endpoint_uri_value"}
+                {
+                    "subnetwork": "subnetwork_value",
+                    "endpoint_uri": "endpoint_uri_value",
+                    "endpoint_location": "endpoint_location_value",
+                }
             ]
         },
         "database_type": 1,
@@ -6778,7 +6790,11 @@ def test_update_service_rest_bad_request(
         "encryption_config": {"kms_key": "kms_key_value"},
         "network_config": {
             "consumers": [
-                {"subnetwork": "subnetwork_value", "endpoint_uri": "endpoint_uri_value"}
+                {
+                    "subnetwork": "subnetwork_value",
+                    "endpoint_uri": "endpoint_uri_value",
+                    "endpoint_location": "endpoint_location_value",
+                }
             ]
         },
         "database_type": 1,
@@ -9611,6 +9627,7 @@ def test_create_backup_rest(request_type):
                     {
                         "subnetwork": "subnetwork_value",
                         "endpoint_uri": "endpoint_uri_value",
+                        "endpoint_location": "endpoint_location_value",
                     }
                 ]
             },
@@ -9886,6 +9903,7 @@ def test_create_backup_rest_bad_request(
                     {
                         "subnetwork": "subnetwork_value",
                         "endpoint_uri": "endpoint_uri_value",
+                        "endpoint_location": "endpoint_location_value",
                     }
                 ]
             },

diff --git a/...le-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1alpha/test_dataproc_metastore.py b/...le-cloud-dataproc-metastore/tests/unit/gapic/metastore_v1alpha/test_dataproc_metastore.py
@@ -6275,7 +6275,11 @@ def test_create_service_rest(request_type):
         "encryption_config": {"kms_key": "kms_key_value"},
         "network_config": {
             "consumers": [
-                {"subnetwork": "subnetwork_value", "endpoint_uri": "endpoint_uri_value"}
+                {
+                    "subnetwork": "subnetwork_value",
+                    "endpoint_uri": "endpoint_uri_value",
+                    "endpoint_location": "endpoint_location_value",
+                }
             ],
             "custom_routes_enabled": True,
         },
@@ -6543,7 +6547,11 @@ def test_create_service_rest_bad_request(
         "encryption_config": {"kms_key": "kms_key_value"},
         "network_config": {
             "consumers": [
-                {"subnetwork": "subnetwork_value", "endpoint_uri": "endpoint_uri_value"}
+                {
+                    "subnetwork": "subnetwork_value",
+                    "endpoint_uri": "endpoint_uri_value",
+                    "endpoint_location": "endpoint_location_value",
+                }
             ],
             "custom_routes_enabled": True,
         },
@@ -6709,7 +6717,11 @@ def test_update_service_rest(request_type):
         "encryption_config": {"kms_key": "kms_key_value"},
         "network_config": {
             "consumers": [
-                {"subnetwork": "subnetwork_value", "endpoint_uri": "endpoint_uri_value"}
+                {
+                    "subnetwork": "subnetwork_value",
+                    "endpoint_uri": "endpoint_uri_value",
+                    "endpoint_location": "endpoint_location_value",
+                }
             ],
             "custom_routes_enabled": True,
         },
@@ -6960,7 +6972,11 @@ def test_update_service_rest_bad_request(
         "encryption_config": {"kms_key": "kms_key_value"},
         "network_config": {
             "consumers": [
-                {"subnetwork": "subnetwork_value", "endpoint_uri": "endpoint_uri_value"}
+                {
+                    "subnetwork": "subnetwork_value",
+                    "endpoint_uri": "endpoint_uri_value",
+                    "endpoint_location": "endpoint_location_value",
+                }
             ],
             "custom_routes_enabled": True,
         },
@@ -9799,6 +9815,7 @@ def test_create_backup_rest(request_type):
                     {
                         "subnetwork": "subnetwork_value",
                         "endpoint_uri": "endpoint_uri_value",
+                        "endpoint_location": "endpoint_location_value",
                     }
                 ],
                 "custom_routes_enabled": True,
@@ -10079,6 +10096,7 @@ def test_create_backup_rest_bad_request(
                     {
                         "subnetwork": "subnetwork_value",
                         "endpoint_uri": "endpoint_uri_value",
+                        "endpoint_location": "endpoint_location_value",
                     }
                 ],
                 "custom_routes_enabled": True,