asset details (WIP)
This commit is contained in:
+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