invalidate asset cache on metadata changes and refresh asset details
This commit is contained in:
+4
@@ -4,12 +4,16 @@ import java.util.*;
|
||||
|
||||
public record PackerAssetCacheEntry(
|
||||
int assetId,
|
||||
String contractFingerprint,
|
||||
List<PackerFileCacheEntry> files) {
|
||||
|
||||
public PackerAssetCacheEntry {
|
||||
if (assetId <= 0) {
|
||||
throw new IllegalArgumentException("assetId must be positive");
|
||||
}
|
||||
contractFingerprint = contractFingerprint == null || contractFingerprint.isBlank()
|
||||
? null
|
||||
: contractFingerprint.trim();
|
||||
files = List.copyOf(Objects.requireNonNull(files, "files"));
|
||||
}
|
||||
|
||||
|
||||
+3
-1
@@ -59,7 +59,7 @@ public final class FileSystemPackerCacheRepository {
|
||||
}
|
||||
validateAssetId(asset.assetId);
|
||||
validateDuplicateRelativePaths(asset.assetId, files);
|
||||
assets.add(new PackerAssetCacheEntry(asset.assetId, files));
|
||||
assets.add(new PackerAssetCacheEntry(asset.assetId, asset.contractFingerprint, files));
|
||||
}
|
||||
}
|
||||
validateDuplicateAssetIds(assets);
|
||||
@@ -84,6 +84,7 @@ public final class FileSystemPackerCacheRepository {
|
||||
document.assets = safeState.assets().stream()
|
||||
.map(asset -> new CacheAssetDocument(
|
||||
asset.assetId(),
|
||||
asset.contractFingerprint(),
|
||||
asset.files().stream()
|
||||
.map(file -> new CacheFileDocument(
|
||||
file.relativePath(),
|
||||
@@ -150,6 +151,7 @@ public final class FileSystemPackerCacheRepository {
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
private record CacheAssetDocument(
|
||||
@JsonProperty("asset_id") int assetId,
|
||||
@JsonProperty("contract_fingerprint") String contractFingerprint,
|
||||
@JsonProperty("files") List<CacheFileDocument> files) {
|
||||
}
|
||||
|
||||
|
||||
+34
@@ -0,0 +1,34 @@
|
||||
package p.packer.repositories;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.security.MessageDigest;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.util.HexFormat;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.TreeMap;
|
||||
|
||||
public final class PackerContractFingerprint {
|
||||
private PackerContractFingerprint() {
|
||||
}
|
||||
|
||||
public static String metadataFingerprint(Map<String, String> metadata) {
|
||||
final var normalized = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
|
||||
Objects.requireNonNull(metadata, "metadata").forEach((key, value) -> {
|
||||
if (key == null || key.isBlank()) {
|
||||
return;
|
||||
}
|
||||
normalized.put(key.trim(), value == null ? "" : value);
|
||||
});
|
||||
final String canonical = normalized.entrySet().stream()
|
||||
.map(entry -> entry.getKey() + "=" + entry.getValue())
|
||||
.reduce((left, right) -> left + "\n" + right)
|
||||
.orElse("");
|
||||
try {
|
||||
return HexFormat.of().formatHex(MessageDigest.getInstance("SHA-256")
|
||||
.digest(canonical.getBytes(StandardCharsets.UTF_8)));
|
||||
} catch (NoSuchAlgorithmException exception) {
|
||||
throw new IllegalStateException("SHA-256 contract fingerprint is unavailable", exception);
|
||||
}
|
||||
}
|
||||
}
|
||||
+18
-1
@@ -25,6 +25,9 @@ public final class PackerRuntimeAssetMaterializer {
|
||||
final Optional<PackerRegistryEntry> safeRegistryEntry = Objects.requireNonNull(registryEntry, "registryEntry");
|
||||
final PackerAssetDeclarationParseResult safeParseResult = Objects.requireNonNull(parseResult, "parseResult");
|
||||
final Optional<PackerAssetCacheEntry> safePriorAssetCache = Objects.requireNonNull(priorAssetCache, "priorAssetCache");
|
||||
final String currentContractFingerprint = safeParseResult.valid()
|
||||
? PackerContractFingerprint.metadataFingerprint(safeParseResult.declaration().outputMetadata())
|
||||
: null;
|
||||
|
||||
if (safeRegistryEntry.isEmpty() || !safeParseResult.valid()) {
|
||||
return new PackerRuntimeAssetMaterialization(
|
||||
@@ -42,7 +45,7 @@ public final class PackerRuntimeAssetMaterializer {
|
||||
final PackerWalkResult walkResult = assetWalker.walk(
|
||||
normalizedAssetRoot,
|
||||
safeParseResult.declaration(),
|
||||
safePriorAssetCache);
|
||||
reusablePriorAssetCache(safePriorAssetCache, currentContractFingerprint));
|
||||
final List<PackerRuntimeWalkFile> buildCandidateFiles = walkResult.probeResults().stream()
|
||||
.map(probeResult -> toRuntimeWalkFile(normalizedAssetRoot, probeResult))
|
||||
.sorted(Comparator.comparing(PackerRuntimeWalkFile::relativePath, String.CASE_INSENSITIVE_ORDER))
|
||||
@@ -63,6 +66,7 @@ public final class PackerRuntimeAssetMaterializer {
|
||||
walkResult.diagnostics());
|
||||
final PackerAssetCacheEntry assetCacheEntry = new PackerAssetCacheEntry(
|
||||
safeRegistryEntry.get().assetId(),
|
||||
currentContractFingerprint,
|
||||
buildCandidateFiles.stream()
|
||||
.map(file -> new PackerFileCacheEntry(
|
||||
file.relativePath(),
|
||||
@@ -75,6 +79,19 @@ public final class PackerRuntimeAssetMaterializer {
|
||||
return new PackerRuntimeAssetMaterialization(runtimeAsset, Optional.of(assetCacheEntry));
|
||||
}
|
||||
|
||||
private Optional<PackerAssetCacheEntry> reusablePriorAssetCache(
|
||||
Optional<PackerAssetCacheEntry> priorAssetCache,
|
||||
String currentContractFingerprint) {
|
||||
if (priorAssetCache.isEmpty()) {
|
||||
return Optional.empty();
|
||||
}
|
||||
final String cachedContractFingerprint = priorAssetCache.get().contractFingerprint();
|
||||
if (cachedContractFingerprint == null || !cachedContractFingerprint.equals(currentContractFingerprint)) {
|
||||
return Optional.empty();
|
||||
}
|
||||
return priorAssetCache;
|
||||
}
|
||||
|
||||
private List<String> listAvailableFiles(Path assetRoot) {
|
||||
try (var paths = Files.list(assetRoot)
|
||||
.filter(Files::isRegularFile)
|
||||
|
||||
Reference in New Issue
Block a user