Merge pull request #33 from jenkinsci/jclouds-mock

[JENKINS-50597] Introduce mocking framework and start to resolve network reliability issues
jenkinsci · May 24, 2018 · cb85963 · cb85963
2 parents 333330c + d232998
commit cb85963
Show file tree

Hide file tree

Showing 7 changed files with 875 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -153,6 +153,12 @@
       <version>2.8-rc351.c6608322f479</version> <!-- TODO https://github.com/jenkinsci/workflow-basic-steps-plugin/pull/60 -->
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.kohsuke.metainf-services</groupId>
+      <artifactId>metainf-services</artifactId>
+      <version>1.7</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <dependencyManagement>
     <dependencies>

diff --git a/src/main/java/io/jenkins/plugins/artifact_manager_jclouds/JCloudsArtifactManager.java b/src/main/java/io/jenkins/plugins/artifact_manager_jclouds/JCloudsArtifactManager.java
@@ -64,6 +64,7 @@
 import jenkins.MasterToSlaveFileCallable;
 import jenkins.model.ArtifactManager;
 import jenkins.util.VirtualFile;
+import org.apache.commons.io.IOUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
@@ -333,10 +334,14 @@ private static void uploadFile(Path f, URL url) throws IOException {
             Files.copy(f, out);
         }
         int responseCode = connection.getResponseCode();
+        String urlSafe = url.toString().replaceFirst("[?].+$", "?…");
         if (responseCode < 200 || responseCode >= 300) {
-            throw new IOException(String.format("Failed to upload %s to %s, response: %d %s", f.toAbsolutePath(), url,
-                    responseCode, connection.getResponseMessage()));
+            String diag;
+            try (InputStream err = connection.getErrorStream()) {
+                diag = err != null ? IOUtils.toString(err, connection.getContentEncoding()) : null;
+            }
+            throw new IOException(String.format("Failed to upload %s to %s, response: %d %s, body: %s", f.toAbsolutePath(), urlSafe, responseCode, connection.getResponseMessage(), diag));
         }
-        LOGGER.log(Level.FINE, "Uploaded {0} to {1}: {2}", new Object[] { f.toAbsolutePath(), url, responseCode });
+        LOGGER.log(Level.FINE, "Uploaded {0} to {1}: {2}", new Object[] { f.toAbsolutePath(), urlSafe, responseCode });
     }
 }