Skip to content

Update CatalogEntity::Builder to set default CatalogType as INTERNAL #1998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eric-maynard merged 1 commit into from
Jul 7, 2025
Merged

Update CatalogEntity::Builder to set default CatalogType as INTERNAL #1998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions polaris-core/src/main/java/org/apache/polaris/core/entity/CatalogEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,25 +106,25 @@ public Catalog asCatalog() {
CatalogProperties.builder(propertiesMap.get(DEFAULT_BASE_LOCATION_KEY))
.putAll(propertiesMap)
.build();
return catalogType == Catalog.TypeEnum.INTERNAL
? PolarisCatalog.builder()
.setType(Catalog.TypeEnum.INTERNAL)
return catalogType == Catalog.TypeEnum.EXTERNAL

@dimas-b dimas-b Jul 4, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: would it not be easier to fix line 103 instead?

? ExternalCatalog.builder()
.setType(Catalog.TypeEnum.EXTERNAL)
.setName(getName())
.setProperties(catalogProps)
.setCreateTimestamp(getCreateTimestamp())
.setLastUpdateTimestamp(getLastUpdateTimestamp())
.setEntityVersion(getEntityVersion())
.setStorageConfigInfo(getStorageInfo(internalProperties))
.setConnectionConfigInfo(getConnectionInfo(internalProperties))
.build()
: ExternalCatalog.builder()
.setType(Catalog.TypeEnum.EXTERNAL)
: PolarisCatalog.builder()
.setType(Catalog.TypeEnum.INTERNAL)
.setName(getName())
.setProperties(catalogProps)
.setCreateTimestamp(getCreateTimestamp())
.setLastUpdateTimestamp(getLastUpdateTimestamp())
.setEntityVersion(getEntityVersion())
.setStorageConfigInfo(getStorageInfo(internalProperties))
.setConnectionConfigInfo(getConnectionInfo(internalProperties))
.build();
}

Expand Down
68 changes: 68 additions & 0 deletions ...me/service/src/test/java/org/apache/polaris/service/quarkus/entity/CatalogEntityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,4 +266,72 @@ public void testInvalidArn(String roleArn) {
.isInstanceOf(IllegalArgumentException.class)
.hasMessage(expectedMessage);
}

@Test
public void testCatalogTypeDefaultsToInternal() {
String baseLocation = "s3://test-bucket/path";
AwsStorageConfigInfo storageConfigModel =
AwsStorageConfigInfo.builder()
.setRoleArn("arn:aws:iam::012345678901:role/test-role")
.setExternalId("externalId")
.setUserArn("aws::a:user:arn")
.setStorageType(StorageConfigInfo.StorageTypeEnum.S3)
.setAllowedLocations(List.of(baseLocation))
.build();
CatalogEntity catalogEntity =
new CatalogEntity.Builder()
.setName("test-catalog")
.setDefaultBaseLocation(baseLocation)
.setStorageConfigurationInfo(callContext, storageConfigModel, baseLocation)
.build();

Catalog catalog = catalogEntity.asCatalog();
Assertions.assertThat(catalog.getType()).isEqualTo(Catalog.TypeEnum.INTERNAL);
}

@Test
public void testCatalogTypeExternalPreserved() {
String baseLocation = "s3://test-bucket/path";
AwsStorageConfigInfo storageConfigModel =
AwsStorageConfigInfo.builder()
.setRoleArn("arn:aws:iam::012345678901:role/test-role")
.setExternalId("externalId")
.setUserArn("aws::a:user:arn")
.setStorageType(StorageConfigInfo.StorageTypeEnum.S3)
.setAllowedLocations(List.of(baseLocation))
.build();
CatalogEntity catalogEntity =
new CatalogEntity.Builder()
.setName("test-external-catalog")
.setDefaultBaseLocation(baseLocation)
.setCatalogType(Catalog.TypeEnum.EXTERNAL.name())
.setStorageConfigurationInfo(callContext, storageConfigModel, baseLocation)
.build();

Catalog catalog = catalogEntity.asCatalog();
Assertions.assertThat(catalog.getType()).isEqualTo(Catalog.TypeEnum.EXTERNAL);
}

@Test
public void testCatalogTypeInternalExplicitlySet() {
String baseLocation = "s3://test-bucket/path";
AwsStorageConfigInfo storageConfigModel =
AwsStorageConfigInfo.builder()
.setRoleArn("arn:aws:iam::012345678901:role/test-role")
.setExternalId("externalId")
.setUserArn("aws::a:user:arn")
.setStorageType(StorageConfigInfo.StorageTypeEnum.S3)
.setAllowedLocations(List.of(baseLocation))
.build();
CatalogEntity catalogEntity =
new CatalogEntity.Builder()
.setName("test-internal-catalog")
.setDefaultBaseLocation(baseLocation)
.setCatalogType(Catalog.TypeEnum.INTERNAL.name())
.setStorageConfigurationInfo(callContext, storageConfigModel, baseLocation)
.build();

Catalog catalog = catalogEntity.asCatalog();
Assertions.assertThat(catalog.getType()).isEqualTo(Catalog.TypeEnum.INTERNAL);
}
}
Loading