flyrain commented on code in PR #2473:
URL: https://github.com/apache/polaris/pull/2473#discussion_r2309166822
##########
runtime/service/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalog.java:
##########
@@ -1006,51 +1004,27 @@ private void validateLocationsForTableLike(
TableIdentifier identifier,
Set<String> locations,
PolarisResolvedPathWrapper resolvedStorageEntity) {
- Optional<PolarisStorageConfigurationInfo> optStorageConfiguration =
- PolarisStorageConfigurationInfo.forEntityPath(
- realmConfig, resolvedStorageEntity.getRawFullPath());
-
- optStorageConfiguration.ifPresentOrElse(
- storageConfigInfo -> {
- Map<String, Map<PolarisStorageActions,
PolarisStorageIntegration.ValidationResult>>
- validationResults =
-
InMemoryStorageIntegration.validateSubpathsOfAllowedLocations(
- realmConfig, storageConfigInfo,
Set.of(PolarisStorageActions.ALL), locations);
- validationResults
- .values()
- .forEach(
- actionResult ->
- actionResult
- .values()
- .forEach(
- result -> {
- if (!result.isSuccess()) {
- throw new ForbiddenException(
- "Invalid locations '%s' for identifier
'%s': %s",
- locations, identifier,
result.getMessage());
- } else {
- LOGGER.debug(
- "Validated locations '{}' for identifier
'{}'",
- locations,
- identifier);
- }
- }));
- },
- () -> {
- List<String> allowedStorageTypes =
-
realmConfig.getConfig(FeatureConfiguration.SUPPORTED_CATALOG_STORAGE_TYPES);
- if
(!allowedStorageTypes.contains(StorageConfigInfo.StorageTypeEnum.FILE.name())) {
- List<String> invalidLocations =
- locations.stream()
- .filter(location -> location.startsWith("file:") ||
location.startsWith("http"))
- .collect(Collectors.toList());
- if (!invalidLocations.isEmpty()) {
- throw new ForbiddenException(
- "Invalid locations '%s' for identifier '%s': File locations
are not allowed",
- invalidLocations, identifier);
- }
- }
- });
+
+ PolarisStorageConfigurationInfo.forEntityPath(
+ realmConfig, resolvedStorageEntity.getRawFullPath())
+ .ifPresentOrElse(
+ restrictions -> restrictions.validate(realmConfig, identifier,
locations),
+ () -> {
+ List<String> allowedStorageTypes =
+
realmConfig.getConfig(FeatureConfiguration.SUPPORTED_CATALOG_STORAGE_TYPES);
+ if
(!allowedStorageTypes.contains(StorageConfigInfo.StorageTypeEnum.FILE.name())) {
+ List<String> invalidLocations =
+ locations.stream()
+ .filter(
+ location -> location.startsWith("file:") ||
location.startsWith("http"))
+ .collect(Collectors.toList());
+ if (!invalidLocations.isEmpty()) {
+ throw new ForbiddenException(
+ "Invalid locations '%s' for identifier '%s': File
locations are not allowed",
+ invalidLocations, identifier);
+ }
+ }
Review Comment:
This part is unchanged.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
