add bearer cleanup test for failed catalog create

Author: iting0321

runtime/service/src/test/java/org/apache/polaris/service/admin/PolarisAdminServiceTest.java

@@ -40,6 +40,7 @@
 import org.apache.polaris.core.PolarisCallContext;
 import org.apache.polaris.core.admin.model.AuthenticationParameters;
 import org.apache.polaris.core.admin.model.AwsStorageConfigInfo;
+import org.apache.polaris.core.admin.model.BearerAuthenticationParameters;
 import org.apache.polaris.core.admin.model.Catalog;
 import org.apache.polaris.core.admin.model.CatalogProperties;
 import org.apache.polaris.core.admin.model.ConnectionConfigInfo;
@@ -153,6 +154,23 @@ void testCreateCatalogCleansUpInlineSecretsWhenCatalogAlreadyExists() {
     verify(userSecretsManager).deleteSecret(secretReference);
   }
 
+  @Test
+  void testCreateCatalogCleansUpInlineBearerSecretWhenCatalogAlreadyExists() {
+    SecretReference secretReference =
+        new SecretReference("urn:polaris-secret:test:bearer", Map.of());
+    setupExternalCatalogCreate(
+        secretReference, AuthenticationParameters.AuthenticationTypeEnum.BEARER);
+    when(metaStoreManager.createCatalog(any(), any(), any()))
+        .thenReturn(new CreateCatalogResult(BaseResult.ReturnStatus.ENTITY_ALREADY_EXISTS, null));
+
+    assertThatThrownBy(
+            () ->
+                adminService.createCatalog(new CreateCatalogRequest(createExternalBearerCatalog())))
+        .isInstanceOf(AlreadyExistsException.class);
+
+    verify(userSecretsManager).deleteSecret(secretReference);
+  }
+
   @Test
   void testCreateCatalogCleanupFailureDoesNotHideOriginalFailure() {
     SecretReference secretReference =
@@ -755,14 +773,20 @@ private PolarisEntity createEntity(String name, PolarisEntityType type) {
   }
 
   private void setupExternalCatalogCreate(SecretReference secretReference) {
+    setupExternalCatalogCreate(
+        secretReference, AuthenticationParameters.AuthenticationTypeEnum.OAUTH);
+  }
+
+  private void setupExternalCatalogCreate(
+      SecretReference secretReference, AuthenticationParameters.AuthenticationTypeEnum authType) {
     when(realmConfig.getConfig(FeatureConfiguration.ALLOW_OVERLAPPING_CATALOG_URLS))
         .thenReturn(true);
     when(realmConfig.getConfig(BehaviorChangeConfiguration.STORAGE_CONFIGURATION_MAX_LOCATIONS))
         .thenReturn(-1);
     when(realmConfig.getConfig(FeatureConfiguration.ENABLE_CATALOG_FEDERATION)).thenReturn(true);
     when(realmConfig.getConfig(
             FeatureConfiguration.SUPPORTED_EXTERNAL_CATALOG_AUTHENTICATION_TYPES))
-        .thenReturn(List.of(AuthenticationParameters.AuthenticationTypeEnum.OAUTH.name()));
+        .thenReturn(List.of(authType.name()));
 
     GenerateEntityIdResult idResult = mock(GenerateEntityIdResult.class);
     when(idResult.getId()).thenReturn(2L);
@@ -773,15 +797,17 @@ private void setupExternalCatalogCreate(SecretReference secretReference) {
     when(identityProvider.allocateServiceIdentity(any())).thenReturn(Optional.empty());
   }
 
+  private AwsStorageConfigInfo createAwsStorageConfig() {
+    return AwsStorageConfigInfo.builder()
+        .setRoleArn("arn:aws:iam::123456789012:role/my-role")
+        .setExternalId("externalId")
+        .setUserArn("userArn")
+        .setStorageType(StorageConfigInfo.StorageTypeEnum.S3)
+        .setAllowedLocations(List.of("s3://bucket/path/to/data"))
+        .build();
+  }
+
   private Catalog createExternalOauthCatalog() {
-    AwsStorageConfigInfo awsConfigModel =
-        AwsStorageConfigInfo.builder()
-            .setRoleArn("arn:aws:iam::123456789012:role/my-role")
-            .setExternalId("externalId")
-            .setUserArn("userArn")
-            .setStorageType(StorageConfigInfo.StorageTypeEnum.S3)
-            .setAllowedLocations(List.of("s3://bucket/path/to/data"))
-            .build();
     ConnectionConfigInfo connectionConfigInfo =
         IcebergRestConnectionConfigInfo.builder(
                 ConnectionConfigInfo.ConnectionTypeEnum.ICEBERG_REST)
@@ -800,7 +826,29 @@ private Catalog createExternalOauthCatalog() {
         .setType(Catalog.TypeEnum.EXTERNAL)
         .setName("external-catalog")
         .setProperties(CatalogProperties.builder("s3://bucket/path/to/data").build())
-        .setStorageConfigInfo(awsConfigModel)
+        .setStorageConfigInfo(createAwsStorageConfig())
+        .setConnectionConfigInfo(connectionConfigInfo)
+        .build();
+  }
+
+  private Catalog createExternalBearerCatalog() {
+    ConnectionConfigInfo connectionConfigInfo =
+        IcebergRestConnectionConfigInfo.builder(
+                ConnectionConfigInfo.ConnectionTypeEnum.ICEBERG_REST)
+            .setUri("https://example.com/polaris/api/catalog")
+            .setRemoteCatalogName("remote-catalog")
+            .setAuthenticationParameters(
+                BearerAuthenticationParameters.builder(
+                        AuthenticationParameters.AuthenticationTypeEnum.BEARER)
+                    .setBearerToken("bearer-token")
+                    .build())
+            .build();
+
+    return ExternalCatalog.builder()
+        .setType(Catalog.TypeEnum.EXTERNAL)
+        .setName("external-catalog")
+        .setProperties(CatalogProperties.builder("s3://bucket/path/to/data").build())
+        .setStorageConfigInfo(createAwsStorageConfig())
         .setConnectionConfigInfo(connectionConfigInfo)
         .build();
   }