This is an automated email from the ASF dual-hosted git repository. jark pushed a commit to branch ci-azure-fs in repository https://gitbox.apache.org/repos/asf/fluss.git
commit b94cdbf889d4f4c24cf8f3568b177e455d7bfaba Author: Jark Wu <[email protected]> AuthorDate: Tue Jan 27 14:40:24 2026 +0800 use fluss-fs-hadoop-shaded --- fluss-filesystems/fluss-fs-azure/pom.xml | 136 +-------------------- .../azure/token/AzureDelegationTokenProvider.java | 6 +- .../apache/fluss/fs/azure/AzureFileSystemTest.java | 5 +- 3 files changed, 11 insertions(+), 136 deletions(-) diff --git a/fluss-filesystems/fluss-fs-azure/pom.xml b/fluss-filesystems/fluss-fs-azure/pom.xml index 7ccc5da2f..13084da2e 100644 --- a/fluss-filesystems/fluss-fs-azure/pom.xml +++ b/fluss-filesystems/fluss-fs-azure/pom.xml @@ -52,137 +52,10 @@ <version>${project.version}</version> </dependency> - <!-- Hadoop's file system abstraction (bundled) --> <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - <version>${fs.hadoopshaded.version}</version> - <exclusions> - <exclusion> - <groupId>jdk.tools</groupId> - <artifactId>jdk.tools</artifactId> - </exclusion> - <exclusion> - <groupId>com.jcraft</groupId> - <artifactId>jsch</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-servlet</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-json</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-server</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.avro</groupId> - <artifactId>avro</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.kerby</groupId> - <artifactId>kerb-simplekdc</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.curator</groupId> - <artifactId>curator-client</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.curator</groupId> - <artifactId>curator-framework</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.curator</groupId> - <artifactId>curator-recipes</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - </exclusion> - <exclusion> - <groupId>commons-net</groupId> - <artifactId>commons-net</artifactId> - </exclusion> - <exclusion> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - </exclusion> - <exclusion> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </exclusion> - <exclusion> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - </exclusion> - <exclusion> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.commons</groupId> - <artifactId>commons-math3</artifactId> - </exclusion> - <exclusion> - <groupId>com.nimbusds</groupId> - <artifactId>nimbus-jose-jwt</artifactId> - </exclusion> - <exclusion> - <groupId>net.minidev</groupId> - <artifactId>json-smart</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.reload4j</groupId> - <artifactId>reload4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-reload4j</artifactId> - </exclusion> - </exclusions> + <groupId>org.apache.fluss</groupId> + <artifactId>fluss-fs-hadoop-shaded</artifactId> + <version>${project.version}</version> </dependency> <dependency> @@ -195,7 +68,7 @@ <artifactId>azure</artifactId> </exclusion> <exclusion> - <!-- provided by paimon-hadoop-shaded --> + <!-- provided by fluss-fs-hadoop-shaded --> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> </exclusion> @@ -207,7 +80,6 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-reload4j</artifactId> </exclusion> - </exclusions> </dependency> <dependency> diff --git a/fluss-filesystems/fluss-fs-azure/src/main/java/org/apache/fluss/fs/azure/token/AzureDelegationTokenProvider.java b/fluss-filesystems/fluss-fs-azure/src/main/java/org/apache/fluss/fs/azure/token/AzureDelegationTokenProvider.java index 6c5b46507..fd47595e1 100644 --- a/fluss-filesystems/fluss-fs-azure/src/main/java/org/apache/fluss/fs/azure/token/AzureDelegationTokenProvider.java +++ b/fluss-filesystems/fluss-fs-azure/src/main/java/org/apache/fluss/fs/azure/token/AzureDelegationTokenProvider.java @@ -18,6 +18,7 @@ package org.apache.fluss.fs.azure.token; import org.apache.fluss.config.Configuration; +import org.apache.fluss.exception.FlussRuntimeException; import org.apache.fluss.fs.token.CredentialsJsonSerde; import org.apache.fluss.fs.token.ObtainedSecurityToken; @@ -26,7 +27,6 @@ import org.apache.hadoop.fs.azurebfs.oauth2.AzureADToken; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -78,8 +78,8 @@ public class AzureDelegationTokenProvider { toJson(azureADToken), azureADToken.getExpiry().getTime(), additionInfos); - } catch (IOException e) { - throw new RuntimeException(e); + } catch (Exception e) { + throw new FlussRuntimeException("Failed to obtain session credentials token", e); } } diff --git a/fluss-filesystems/fluss-fs-azure/src/test/java/org/apache/fluss/fs/azure/AzureFileSystemTest.java b/fluss-filesystems/fluss-fs-azure/src/test/java/org/apache/fluss/fs/azure/AzureFileSystemTest.java index aeda50aa9..399478275 100644 --- a/fluss-filesystems/fluss-fs-azure/src/test/java/org/apache/fluss/fs/azure/AzureFileSystemTest.java +++ b/fluss-filesystems/fluss-fs-azure/src/test/java/org/apache/fluss/fs/azure/AzureFileSystemTest.java @@ -18,6 +18,7 @@ package org.apache.fluss.fs.azure; import org.apache.fluss.config.Configuration; +import org.apache.fluss.exception.FlussRuntimeException; import org.apache.hadoop.fs.LocalFileSystem; import org.junit.jupiter.api.Test; @@ -33,7 +34,9 @@ public class AzureFileSystemTest { Configuration conf = new Configuration(); AzureFileSystem fs = new AzureFileSystem("abfs", new LocalFileSystem(), conf); - assertThatThrownBy(fs::obtainSecurityToken).isInstanceOf(RuntimeException.class); + assertThatThrownBy(fs::obtainSecurityToken) + .isInstanceOf(FlussRuntimeException.class) + .hasMessageContaining("Failed to obtain session credentials token"); } @Test
