diff --git a/polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageIntegration.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageIntegration.java index 21249c992..97bbc8a2d 100644 --- a/polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageIntegration.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageIntegration.java @@ -61,15 +61,6 @@ public abstract EnumMap getSubscopedCreds( @NotNull Set allowedReadLocations, @NotNull Set allowedWriteLocations); - /** - * Describe the configuration for the current storage integration. - * - * @param storageConfigInfo the configuration info provided by the user. - * @return an enum map - */ - public abstract EnumMap - descPolarisStorageConfiguration(@NotNull PolarisStorageConfigurationInfo storageConfigInfo); - /** * Validate access for the provided operation actions and locations. * diff --git a/polaris-core/src/main/java/org/apache/polaris/core/storage/aws/AwsCredentialsStorageIntegration.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/aws/AwsCredentialsStorageIntegration.java index 32e028d0b..1714f67c2 100644 --- a/polaris-core/src/main/java/org/apache/polaris/core/storage/aws/AwsCredentialsStorageIntegration.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/aws/AwsCredentialsStorageIntegration.java @@ -27,7 +27,6 @@ import org.apache.polaris.core.PolarisDiagnostics; import org.apache.polaris.core.storage.InMemoryStorageIntegration; import org.apache.polaris.core.storage.PolarisCredentialProperty; -import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo; import org.apache.polaris.core.storage.StorageUtil; import org.jetbrains.annotations.NotNull; import software.amazon.awssdk.policybuilder.iam.IamConditionOperator; @@ -187,11 +186,4 @@ private String getArnPrefixFor(String roleArn) { } return path; } - - // FIXME - we don't need this method in the interface - @Override - public EnumMap - descPolarisStorageConfiguration(@NotNull PolarisStorageConfigurationInfo storageConfigInfo) { - return null; - } } diff --git a/polaris-core/src/main/java/org/apache/polaris/core/storage/azure/AzureCredentialsStorageIntegration.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/azure/AzureCredentialsStorageIntegration.java index ce7ca5b0e..86888c413 100644 --- a/polaris-core/src/main/java/org/apache/polaris/core/storage/azure/AzureCredentialsStorageIntegration.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/azure/AzureCredentialsStorageIntegration.java @@ -47,7 +47,6 @@ import org.apache.polaris.core.PolarisDiagnostics; import org.apache.polaris.core.storage.InMemoryStorageIntegration; import org.apache.polaris.core.storage.PolarisCredentialProperty; -import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -273,10 +272,4 @@ private AccessToken getAccessToken(String tenantId) { } return accessToken; } - - @Override - public EnumMap - descPolarisStorageConfiguration(@NotNull PolarisStorageConfigurationInfo storageConfigInfo) { - return null; - } } diff --git a/polaris-core/src/main/java/org/apache/polaris/core/storage/gcp/GcpCredentialsStorageIntegration.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/gcp/GcpCredentialsStorageIntegration.java index 305690923..5e0d7e045 100644 --- a/polaris-core/src/main/java/org/apache/polaris/core/storage/gcp/GcpCredentialsStorageIntegration.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/gcp/GcpCredentialsStorageIntegration.java @@ -39,7 +39,6 @@ import org.apache.polaris.core.PolarisDiagnostics; import org.apache.polaris.core.storage.InMemoryStorageIntegration; import org.apache.polaris.core.storage.PolarisCredentialProperty; -import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo; import org.apache.polaris.core.storage.PolarisStorageIntegration; import org.apache.polaris.core.storage.StorageUtil; import org.jetbrains.annotations.NotNull; @@ -207,10 +206,4 @@ public static CredentialAccessBoundary generateAccessBoundaryRules( private static String bucketResource(String bucket) { return "//storage.googleapis.com/projects/_/buckets/" + bucket; } - - @Override - public EnumMap - descPolarisStorageConfiguration(@NotNull PolarisStorageConfigurationInfo storageConfigInfo) { - return null; - } } diff --git a/polaris-core/src/test/java/org/apache/polaris/core/storage/InMemoryStorageIntegrationTest.java b/polaris-core/src/test/java/org/apache/polaris/core/storage/InMemoryStorageIntegrationTest.java index 1039f83a1..14656e35e 100644 --- a/polaris-core/src/test/java/org/apache/polaris/core/storage/InMemoryStorageIntegrationTest.java +++ b/polaris-core/src/test/java/org/apache/polaris/core/storage/InMemoryStorageIntegrationTest.java @@ -197,12 +197,5 @@ public EnumMap getSubscopedCreds( @NotNull Set allowedWriteLocations) { return null; } - - @Override - public EnumMap - descPolarisStorageConfiguration( - @NotNull PolarisStorageConfigurationInfo storageConfigInfo) { - return null; - } } } diff --git a/polaris-service/src/main/java/org/apache/polaris/service/storage/PolarisStorageIntegrationProviderImpl.java b/polaris-service/src/main/java/org/apache/polaris/service/storage/PolarisStorageIntegrationProviderImpl.java index 579ef0333..b3252a299 100644 --- a/polaris-service/src/main/java/org/apache/polaris/service/storage/PolarisStorageIntegrationProviderImpl.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/storage/PolarisStorageIntegrationProviderImpl.java @@ -90,13 +90,6 @@ public EnumMap getSubscopedCreds( return new EnumMap<>(PolarisCredentialProperty.class); } - @Override - public EnumMap - descPolarisStorageConfiguration( - @NotNull PolarisStorageConfigurationInfo storageConfigInfo) { - return new EnumMap<>(PolarisStorageConfigurationInfo.DescribeProperty.class); - } - @Override public @NotNull Map> validateAccessToLocations(