Merge branch 'main' into owl-bot-copy

googleapis · Nov 16, 2023 · 9b3ea5e · 9b3ea5e
2 parents 2d2a68c + 7740132
commit 9b3ea5e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 17 deletions.
diff --git a/google/cloud/aiplatform/matching_engine/matching_engine_index_endpoint.py b/google/cloud/aiplatform/matching_engine/matching_engine_index_endpoint.py
@@ -445,25 +445,17 @@ def _create(
         Returns:
             MatchingEngineIndexEndpoint - IndexEndpoint resource object
         """
-        # Public
+        # public
         if public_endpoint_enabled:
             gapic_index_endpoint = gca_matching_engine_index_endpoint.IndexEndpoint(
                 display_name=display_name,
                 description=description,
                 public_endpoint_enabled=public_endpoint_enabled,
-                encryption_spec=gca_encryption_spec.EncryptionSpec(
-                    kms_key_name=encryption_spec_key_name
-                ),
             )
         # PSA
         elif network:
             gapic_index_endpoint = gca_matching_engine_index_endpoint.IndexEndpoint(
-                display_name=display_name,
-                description=description,
-                network=network,
-                encryption_spec=gca_encryption_spec.EncryptionSpec(
-                    kms_key_name=encryption_spec_key_name
-                ),
+                display_name=display_name, description=description, network=network
             )
         # PSC
         else:
@@ -474,9 +466,11 @@ def _create(
                     project_allowlist=project_allowlist,
                     enable_private_service_connect=enable_private_service_connect,
                 ),
-                encryption_spec=gca_encryption_spec.EncryptionSpec(
-                    kms_key_name=encryption_spec_key_name
-                ),
+            )
+
+        if encryption_spec_key_name:
+            gapic_index_endpoint.encryption_spec = gca_encryption_spec.EncryptionSpec(
+                kms_key_name=encryption_spec_key_name
             )
 
         if labels:

diff --git a/tests/unit/aiplatform/test_matching_engine_index_endpoint.py b/tests/unit/aiplatform/test_matching_engine_index_endpoint.py
@@ -629,7 +629,6 @@ def test_create_index_endpoint(self, create_index_endpoint_mock, sync):
             network=_TEST_INDEX_ENDPOINT_VPC_NETWORK,
             description=_TEST_INDEX_ENDPOINT_DESCRIPTION,
             labels=_TEST_LABELS,
-            encryption_spec_key_name=_TEST_ENCRYPTION_SPEC_KEY_NAME,
         )
 
         if not sync:
@@ -640,9 +639,6 @@ def test_create_index_endpoint(self, create_index_endpoint_mock, sync):
             network=_TEST_INDEX_ENDPOINT_VPC_NETWORK,
             description=_TEST_INDEX_ENDPOINT_DESCRIPTION,
             labels=_TEST_LABELS,
-            encryption_spec=gca_encryption_spec.EncryptionSpec(
-                kms_key_name=_TEST_ENCRYPTION_SPEC_KEY_NAME
-            ),
         )
         create_index_endpoint_mock.assert_called_once_with(
             parent=_TEST_PARENT,