asset details (WIP)
This commit is contained in:
+4
-1
@@ -1,6 +1,7 @@
|
||||
package p.packer.models;
|
||||
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
@@ -10,7 +11,8 @@ public record PackerFileCacheEntry(
|
||||
long size,
|
||||
long lastModified,
|
||||
String fingerprint,
|
||||
Map<String, Object> metadata) {
|
||||
Map<String, Object> metadata,
|
||||
List<PackerDiagnostic> diagnostics) {
|
||||
|
||||
public PackerFileCacheEntry {
|
||||
relativePath = normalizeRelativePath(relativePath);
|
||||
@@ -23,6 +25,7 @@ public record PackerFileCacheEntry(
|
||||
}
|
||||
fingerprint = normalizeOptional(fingerprint);
|
||||
metadata = Map.copyOf(new LinkedHashMap<>(Objects.requireNonNull(metadata, "metadata")));
|
||||
diagnostics = List.copyOf(Objects.requireNonNull(diagnostics, "diagnostics"));
|
||||
}
|
||||
|
||||
private static String normalizeRelativePath(String relativePath) {
|
||||
|
||||
+51
-3
@@ -7,8 +7,11 @@ import p.packer.PackerWorkspacePaths;
|
||||
import p.packer.exceptions.PackerRegistryException;
|
||||
import p.packer.messages.PackerProjectContext;
|
||||
import p.packer.models.PackerAssetCacheEntry;
|
||||
import p.packer.models.PackerDiagnostic;
|
||||
import p.packer.models.PackerFileCacheEntry;
|
||||
import p.packer.models.PackerWorkspaceCacheState;
|
||||
import p.packer.messages.diagnostics.PackerDiagnosticCategory;
|
||||
import p.packer.messages.diagnostics.PackerDiagnosticSeverity;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
@@ -54,7 +57,8 @@ public final class FileSystemPackerCacheRepository {
|
||||
file.size,
|
||||
file.lastModified,
|
||||
file.fingerprint,
|
||||
file.metadata == null ? Map.of() : file.metadata));
|
||||
file.metadata == null ? Map.of() : file.metadata,
|
||||
loadDiagnostics(file.diagnostics)));
|
||||
}
|
||||
}
|
||||
validateAssetId(asset.assetId);
|
||||
@@ -92,7 +96,8 @@ public final class FileSystemPackerCacheRepository {
|
||||
file.size(),
|
||||
file.lastModified(),
|
||||
file.fingerprint(),
|
||||
file.metadata()))
|
||||
file.metadata(),
|
||||
saveDiagnostics(file.diagnostics())))
|
||||
.toList()))
|
||||
.toList();
|
||||
mapper.writerWithDefaultPrettyPrinter().writeValue(cachePath.toFile(), document);
|
||||
@@ -101,6 +106,39 @@ public final class FileSystemPackerCacheRepository {
|
||||
}
|
||||
}
|
||||
|
||||
private List<PackerDiagnostic> loadDiagnostics(List<CacheDiagnosticDocument> diagnostics) {
|
||||
if (diagnostics == null || diagnostics.isEmpty()) {
|
||||
return List.of();
|
||||
}
|
||||
final List<PackerDiagnostic> loaded = new ArrayList<>();
|
||||
for (CacheDiagnosticDocument diagnostic : diagnostics) {
|
||||
if (diagnostic == null || diagnostic.severity == null || diagnostic.category == null || diagnostic.message == null) {
|
||||
continue;
|
||||
}
|
||||
loaded.add(new PackerDiagnostic(
|
||||
diagnostic.severity,
|
||||
diagnostic.category,
|
||||
diagnostic.message,
|
||||
diagnostic.evidencePath == null || diagnostic.evidencePath.isBlank() ? null : Path.of(diagnostic.evidencePath),
|
||||
diagnostic.blocking));
|
||||
}
|
||||
return List.copyOf(loaded);
|
||||
}
|
||||
|
||||
private List<CacheDiagnosticDocument> saveDiagnostics(List<PackerDiagnostic> diagnostics) {
|
||||
if (diagnostics == null || diagnostics.isEmpty()) {
|
||||
return List.of();
|
||||
}
|
||||
return diagnostics.stream()
|
||||
.map(diagnostic -> new CacheDiagnosticDocument(
|
||||
diagnostic.severity(),
|
||||
diagnostic.category(),
|
||||
diagnostic.message(),
|
||||
diagnostic.evidencePath() == null ? null : diagnostic.evidencePath().toString(),
|
||||
diagnostic.blocking()))
|
||||
.toList();
|
||||
}
|
||||
|
||||
private void validateDuplicateAssetIds(List<PackerAssetCacheEntry> assets) {
|
||||
final Set<Integer> assetIds = new HashSet<>();
|
||||
for (PackerAssetCacheEntry asset : assets) {
|
||||
@@ -162,6 +200,16 @@ public final class FileSystemPackerCacheRepository {
|
||||
@JsonProperty("size") long size,
|
||||
@JsonProperty("last_modified") long lastModified,
|
||||
@JsonProperty("fingerprint") String fingerprint,
|
||||
@JsonProperty("metadata") Map<String, Object> metadata) {
|
||||
@JsonProperty("metadata") Map<String, Object> metadata,
|
||||
@JsonProperty("diagnostics") List<CacheDiagnosticDocument> diagnostics) {
|
||||
}
|
||||
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
private record CacheDiagnosticDocument(
|
||||
@JsonProperty("severity") PackerDiagnosticSeverity severity,
|
||||
@JsonProperty("category") PackerDiagnosticCategory category,
|
||||
@JsonProperty("message") String message,
|
||||
@JsonProperty("evidence_path") String evidencePath,
|
||||
@JsonProperty("blocking") boolean blocking) {
|
||||
}
|
||||
}
|
||||
|
||||
+4
-1
@@ -73,7 +73,10 @@ public abstract class PackerAbstractBankWalker<R> {
|
||||
final var fileProbe = fileProbeMaybe.get();
|
||||
final var cachedEntry = resolvePriorFileCache(assetRoot, fileProbe.path(), priorAssetCache);
|
||||
if (cachedEntry.isPresent() && canReuseMetadata(fileProbe, cachedEntry.get())) {
|
||||
probeResults.add(new PackerProbeResult(fileProbe, cachedEntry.get().metadata(), List.of()));
|
||||
probeResults.add(new PackerProbeResult(
|
||||
fileProbe,
|
||||
cachedEntry.get().metadata(),
|
||||
cachedEntry.get().diagnostics()));
|
||||
continue;
|
||||
}
|
||||
probeResults.add(processFileProbe(fileProbe, requirements));
|
||||
|
||||
+2
-1
@@ -74,7 +74,8 @@ public final class PackerRuntimeAssetMaterializer {
|
||||
file.size(),
|
||||
file.lastModified(),
|
||||
file.fingerprint(),
|
||||
file.metadata()))
|
||||
file.metadata(),
|
||||
file.diagnostics()))
|
||||
.toList());
|
||||
return new PackerRuntimeAssetMaterialization(runtimeAsset, Optional.of(assetCacheEntry));
|
||||
}
|
||||
|
||||
+34
@@ -14,6 +14,7 @@ import p.packer.messages.diagnostics.PackerDiagnosticCategory;
|
||||
import p.packer.messages.diagnostics.PackerDiagnosticSeverity;
|
||||
import p.packer.models.*;
|
||||
import p.packer.repositories.FileSystemPackerCacheRepository;
|
||||
import p.packer.repositories.PackerContractFingerprint;
|
||||
import p.packer.repositories.PackerRuntimeRegistry;
|
||||
|
||||
import java.io.IOException;
|
||||
@@ -646,7 +647,11 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
|
||||
}
|
||||
|
||||
try {
|
||||
final String previousContractFingerprint = contractFingerprint(manifest);
|
||||
patchManifestContract(manifest, request);
|
||||
if (!Objects.equals(previousContractFingerprint, contractFingerprint(manifest))) {
|
||||
clearManifestBankComposition(manifest);
|
||||
}
|
||||
mapper.writerWithDefaultPrettyPrinter().writeValue(manifestPath.toFile(), manifest);
|
||||
final var runtime = runtimeRegistry.update(project, (currentSnapshot, generation) -> runtimePatchService.afterUpdateAssetContract(
|
||||
currentSnapshot,
|
||||
@@ -770,6 +775,35 @@ public final class FileSystemPackerWorkspaceService implements PackerWorkspaceSe
|
||||
}
|
||||
}
|
||||
|
||||
private String contractFingerprint(ObjectNode manifest) {
|
||||
final JsonNode outputNode = manifest.path("output");
|
||||
if (!(outputNode instanceof ObjectNode outputObject)) {
|
||||
return PackerContractFingerprint.metadataFingerprint(Map.of());
|
||||
}
|
||||
final JsonNode metadataNode = outputObject.path("metadata");
|
||||
if (!(metadataNode instanceof ObjectNode metadataObject)) {
|
||||
return PackerContractFingerprint.metadataFingerprint(Map.of());
|
||||
}
|
||||
final Map<String, String> metadata = new LinkedHashMap<>();
|
||||
metadataObject.fields().forEachRemaining(entry -> {
|
||||
if (entry.getKey() == null || entry.getKey().isBlank()) {
|
||||
return;
|
||||
}
|
||||
final JsonNode valueNode = entry.getValue();
|
||||
if (valueNode == null || valueNode.isContainerNode()) {
|
||||
return;
|
||||
}
|
||||
metadata.put(entry.getKey().trim(), valueNode.isNull() ? "" : valueNode.asText(""));
|
||||
});
|
||||
return PackerContractFingerprint.metadataFingerprint(metadata);
|
||||
}
|
||||
|
||||
private void clearManifestBankComposition(ObjectNode manifest) {
|
||||
final ObjectNode inputsNode = mutableObject(manifest, "inputs");
|
||||
inputsNode.removeAll();
|
||||
manifest.putArray("artifacts");
|
||||
}
|
||||
|
||||
private boolean isTrustedRelativePath(String value) {
|
||||
final Path path = Path.of(value).normalize();
|
||||
return !path.isAbsolute() && !path.startsWith("..");
|
||||
|
||||
+13
@@ -44,6 +44,7 @@ public final class PackerAssetDetailsService {
|
||||
final var parsed = runtimeAsset.parsedDeclaration();
|
||||
diagnostics.addAll(parsed.diagnostics());
|
||||
diagnostics.addAll(runtimeAsset.walkDiagnostics());
|
||||
appendWalkFileDiagnostics(runtimeAsset, diagnostics);
|
||||
if (!parsed.valid()) {
|
||||
return failureResult(project, request.assetReference(), resolved, diagnostics);
|
||||
}
|
||||
@@ -253,6 +254,18 @@ public final class PackerAssetDetailsService {
|
||||
true));
|
||||
}
|
||||
|
||||
private void appendWalkFileDiagnostics(
|
||||
PackerRuntimeAsset runtimeAsset,
|
||||
List<PackerDiagnostic> diagnostics) {
|
||||
for (PackerRuntimeWalkFile file : runtimeAsset.walkProjection().buildCandidateFiles()) {
|
||||
for (PackerDiagnostic diagnostic : file.diagnostics()) {
|
||||
if (!diagnostics.contains(diagnostic)) {
|
||||
diagnostics.add(diagnostic);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private AssetReference canonicalReference(
|
||||
final PackerProjectContext project,
|
||||
final Path assetRoot,
|
||||
|
||||
Reference in New Issue
Block a user