The Unified and Autonomous Development Platform
Normalize cache key
Robin Shenf0004e505aea
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/CacheSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/job/CacheSpec.javaindex 19108e75f5..bcf6d15e97 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/CacheSpec.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/CacheSpec.java@@ -39,6 +39,10 @@ public class CacheSpec implements Serializable, Validatable {this.key = key;}+ public String getNormalizedKey() {+ return getKey().replaceAll("[^a-zA-Z0-9\\-_\\.]", "-");+ }+@Editable(order=200, description="Specify path to cache. Non-absolute path is considered to be relative to job workspace. "+ "Please note that shell executor only allows non-absolute path here")@Interpolative(variableSuggester="suggestVariables")diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.javaindex 84f35ee221..3fb5c13112 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java@@ -1312,14 +1312,14 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizfor (CacheSpec cacheSpec: jobContext.getCacheSpecs()) {Optional<CacheInstance> result = sortedInstances.stream()- .filter(it->it.getCacheKey().equals(cacheSpec.getKey()))+ .filter(it->it.getCacheKey().equals(cacheSpec.getNormalizedKey())).filter(it->!allAllocated.contains(it.getName())).findFirst();CacheInstance allocation;if (result.isPresent())allocation = result.get();else- allocation = new CacheInstance(UUID.randomUUID().toString(), cacheSpec.getKey());+ allocation = new CacheInstance(UUID.randomUUID().toString(), cacheSpec.getNormalizedKey());allocations.put(allocation, cacheSpec.getPath());jobContext.getAllocatedCaches().add(allocation.getName());allAllocated.add(allocation.getName());