Skip to content

Commit 455b8b3

Browse files
Revert setCatalogType(INTERNAL) test changes
1 parent 40cadfe commit 455b8b3

File tree

5 files changed

+4
-17
lines changed

5 files changed

+4
-17
lines changed

runtime/service/src/test/java/org/apache/polaris/service/quarkus/admin/PolarisAdminServiceAuthzTest.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,7 @@ public void testCreateCatalogSufficientPrivileges() {
132132
adminService.grantPrivilegeOnRootContainerToPrincipalRole(
133133
PRINCIPAL_ROLE2, PolarisPrivilege.CATALOG_DROP))
134134
.isTrue();
135-
final CatalogEntity newCatalog =
136-
new CatalogEntity.Builder().setName("new_catalog").setCatalogType("INTERNAL").build();
135+
final CatalogEntity newCatalog = new CatalogEntity.Builder().setName("new_catalog").build();
137136
final CreateCatalogRequest createRequest = new CreateCatalogRequest(newCatalog.asCatalog());
138137

139138
doTestSufficientPrivileges(
@@ -152,8 +151,7 @@ public void testCreateCatalogSufficientPrivileges() {
152151

153152
@Test
154153
public void testCreateCatalogInsufficientPrivileges() {
155-
final CatalogEntity newCatalog =
156-
new CatalogEntity.Builder().setName("new_catalog").setCatalogType("INTERNAL").build();
154+
final CatalogEntity newCatalog = new CatalogEntity.Builder().setName("new_catalog").build();
157155
final CreateCatalogRequest createRequest = new CreateCatalogRequest(newCatalog.asCatalog());
158156

159157
doTestInsufficientPrivileges(
@@ -289,8 +287,7 @@ public void testDeleteCatalogSufficientPrivileges() {
289287
adminService.grantPrivilegeOnRootContainerToPrincipalRole(
290288
PRINCIPAL_ROLE2, PolarisPrivilege.CATALOG_CREATE))
291289
.isTrue();
292-
final CatalogEntity newCatalog =
293-
new CatalogEntity.Builder().setName("new_catalog").setCatalogType("INTERNAL").build();
290+
final CatalogEntity newCatalog = new CatalogEntity.Builder().setName("new_catalog").build();
294291
final CreateCatalogRequest createRequest = new CreateCatalogRequest(newCatalog.asCatalog());
295292
adminService.createCatalog(createRequest);
296293

@@ -310,8 +307,7 @@ public void testDeleteCatalogSufficientPrivileges() {
310307

311308
@Test
312309
public void testDeleteCatalogInsufficientPrivileges() {
313-
final CatalogEntity newCatalog =
314-
new CatalogEntity.Builder().setName("new_catalog").setCatalogType("INTERNAL").build();
310+
final CatalogEntity newCatalog = new CatalogEntity.Builder().setName("new_catalog").build();
315311
final CreateCatalogRequest createRequest = new CreateCatalogRequest(newCatalog.asCatalog());
316312
adminService.createCatalog(createRequest);
317313

runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/IcebergCatalogTest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,6 @@ public void before(TestInfo testInfo) {
345345
new CreateCatalogRequest(
346346
new CatalogEntity.Builder()
347347
.setName(CATALOG_NAME)
348-
.setCatalogType("INTERNAL")
349348
.setDefaultBaseLocation(storageLocation)
350349
.setReplaceNewLocationPrefixWithCatalogDefault("file:")
351350
.addProperty(
@@ -1358,7 +1357,6 @@ public void testUpdateNotificationCreateTableWithLocalFilePrefix() {
13581357
new CatalogEntity.Builder()
13591358
.setDefaultBaseLocation("file://")
13601359
.setName(catalogWithoutStorage)
1361-
.setCatalogType("INTERNAL")
13621360
.build()
13631361
.asCatalog()));
13641362

@@ -1424,7 +1422,6 @@ public void testUpdateNotificationCreateTableWithHttpPrefix() {
14241422
new CatalogEntity.Builder()
14251423
.setDefaultBaseLocation("http://maliciousdomain.com")
14261424
.setName(catalogName)
1427-
.setCatalogType("INTERNAL")
14281425
.build()
14291426
.asCatalog()));
14301427

@@ -1954,7 +1951,6 @@ public void testDropTableWithPurgeDisabled() {
19541951
new CreateCatalogRequest(
19551952
new CatalogEntity.Builder()
19561953
.setName(noPurgeCatalogName)
1957-
.setCatalogType("INTERNAL")
19581954
.setDefaultBaseLocation(storageLocation)
19591955
.setReplaceNewLocationPrefixWithCatalogDefault("file:")
19601956
.addProperty(
@@ -2272,7 +2268,6 @@ public void createCatalogWithReservedProperty() {
22722268
new CatalogEntity.Builder()
22732269
.setDefaultBaseLocation("file://")
22742270
.setName("createCatalogWithReservedProperty")
2275-
.setCatalogType("INTERNAL")
22762271
.setProperties(ImmutableMap.of("polaris.reserved", "true"))
22772272
.build()
22782273
.asCatalog()));
@@ -2288,7 +2283,6 @@ public void updateCatalogWithReservedProperty() {
22882283
new CatalogEntity.Builder()
22892284
.setDefaultBaseLocation("file://")
22902285
.setName("updateCatalogWithReservedProperty")
2291-
.setCatalogType("INTERNAL")
22922286
.setProperties(ImmutableMap.of("a", "b"))
22932287
.build()
22942288
.asCatalog()));

runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/IcebergCatalogViewTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ public void before(TestInfo testInfo) {
217217
new CreateCatalogRequest(
218218
new CatalogEntity.Builder()
219219
.setName(CATALOG_NAME)
220-
.setCatalogType("INTERNAL")
221220
.addProperty(
222221
FeatureConfiguration.ALLOW_EXTERNAL_TABLE_LOCATION.catalogConfig(), "true")
223222
.addProperty(

runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolarisGenericTableCatalogTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ public void before(TestInfo testInfo) {
224224
new CreateCatalogRequest(
225225
new CatalogEntity.Builder()
226226
.setName(CATALOG_NAME)
227-
.setCatalogType("INTERNAL")
228227
.setDefaultBaseLocation(storageLocation)
229228
.setReplaceNewLocationPrefixWithCatalogDefault("file:")
230229
.addProperty(

runtime/service/src/test/java/org/apache/polaris/service/quarkus/catalog/PolicyCatalogTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,6 @@ public void before(TestInfo testInfo) {
252252
new CreateCatalogRequest(
253253
new CatalogEntity.Builder()
254254
.setName(CATALOG_NAME)
255-
.setCatalogType("INTERNAL")
256255
.setDefaultBaseLocation(storageLocation)
257256
.setReplaceNewLocationPrefixWithCatalogDefault("file:")
258257
.addProperty(

0 commit comments

Comments
 (0)