Handle / in branch name (#25)

jenkinsci · Aug 18, 2021 · cb8b768 · cb8b768
1 parent 9bc4e01
commit cb8b768
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/com/microsoft/jenkins/artifactmanager/AzureArtifactManager.java b/src/main/java/com/microsoft/jenkins/artifactmanager/AzureArtifactManager.java
@@ -106,7 +106,7 @@ private void checkConfig(String containerName, String prefix) {
     @Override
     public void onLoad(Run<?, ?> aBuild) {
         this.defaultKey = String.format(Constants.BUILD_PREFIX_FORMAT, aBuild.getParent().getFullName(),
-                aBuild.getNumber());
+                aBuild.getNumber()).replace("%2F", "/");
     }
 
     @Override

diff --git a/src/main/java/com/microsoft/jenkins/artifactmanager/AzureBlobVirtualFile.java b/src/main/java/com/microsoft/jenkins/artifactmanager/AzureBlobVirtualFile.java
@@ -36,6 +36,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -106,6 +107,7 @@ public <V> V run(Callable<V, IOException> callable) throws IOException {
         Map<String, CachedMetadata> saved = new HashMap<>();
         try {
             StorageAccountInfo accountInfo = Utils.getStorageAccount(build.getParent());
+            Objects.requireNonNull(this.container, "Container must not be null");
             BlobContainerClient blobContainerReference = Utils.getBlobContainerReference(accountInfo, this.container,
                     false);
             ListBlobsOptions listBlobsOptions = new ListBlobsOptions()