You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by gy...@apache.org on 2023/02/07 11:29:41 UTC

[flink-kubernetes-operator] branch main updated: [FLINK-30845] HttpArtifactFetcher: Fix filename

This is an automated email from the ASF dual-hosted git repository.

gyfora pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-kubernetes-operator.git


The following commit(s) were added to refs/heads/main by this push:
     new f0578a57 [FLINK-30845] HttpArtifactFetcher: Fix filename
f0578a57 is described below

commit f0578a57f6395634b9ad301c7ab7176a45f9c438
Author: FabioWanner <46...@users.noreply.github.com>
AuthorDate: Tue Feb 7 12:29:36 2023 +0100

    [FLINK-30845] HttpArtifactFetcher: Fix filename
---
 .../flink/kubernetes/operator/artifact/HttpArtifactFetcher.java     | 2 +-
 .../flink/kubernetes/operator/artifact/ArtifactManagerTest.java     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/artifact/HttpArtifactFetcher.java b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/artifact/HttpArtifactFetcher.java
index 1894cb4d..c2c6c2db 100644
--- a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/artifact/HttpArtifactFetcher.java
+++ b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/artifact/HttpArtifactFetcher.java
@@ -54,7 +54,7 @@ public class HttpArtifactFetcher implements ArtifactFetcher {
 
         conn.setRequestMethod("GET");
 
-        String fileName = FilenameUtils.getName(url.getFile());
+        String fileName = FilenameUtils.getName(url.getPath());
         File targetFile = new File(targetDir, fileName);
         try (var inputStream = conn.getInputStream()) {
             FileUtils.copyToFile(inputStream, targetFile);
diff --git a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/artifact/ArtifactManagerTest.java b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/artifact/ArtifactManagerTest.java
index 719420cc..422c08b1 100644
--- a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/artifact/ArtifactManagerTest.java
+++ b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/artifact/ArtifactManagerTest.java
@@ -94,12 +94,12 @@ public class ArtifactManagerTest {
         try {
             httpServer = startHttpServer();
             var sourceFile = mockTheJarFile();
-            httpServer.createContext("/download", new DownloadFileHttpHandler(sourceFile));
+            httpServer.createContext("/download/file.jar", new DownloadFileHttpHandler(sourceFile));
 
             var file =
                     artifactManager.fetch(
                             String.format(
-                                    "http://127.0.0.1:%d/download?file=1",
+                                    "http://127.0.0.1:%d/download/file.jar?some=params",
                                     httpServer.getAddress().getPort()),
                             new Configuration()
                                     .set(
@@ -109,7 +109,7 @@ public class ArtifactManagerTest {
                             tempDir.toString());
             Assertions.assertTrue(file.exists());
             Assertions.assertEquals(tempDir.toString(), file.getParent());
-            Assertions.assertEquals("download?file=1", file.getName());
+            Assertions.assertEquals("file.jar", file.getName());
         } finally {
             if (httpServer != null) {
                 httpServer.stop(0);