mirror of
https://github.com/morluto/rea.git
synced 2026-11-18 20:53:00 +00:00
fix(maven): preserve qualified property keys in metadata (#11860)
fix(maven): preserve qualified property keys
This commit is contained in:
1 parent
82e16b4dda
commit
004c43e32a
4 files changed
+98
-13
No files matched your search
@@ -44,7 +44,10 @@ coordinate: [only group/version coordinates may be inherited](https://maven.apac
|
||||
For a POM, `parent` records the declared parent coordinates and `relative_path`
|
||||
when present. `relative_path_declared` distinguishes an empty `<relativePath/>`,
|
||||
which disables Maven's local parent lookup, from an omitted tag. `properties`
|
||||
lists each child of `<properties>` as name and value. URL userinfo
|
||||
lists each child of `<properties>` as its written qualified name and value.
|
||||
Prefixes remain part of the key: `a:revision` and `b:revision` stay distinct
|
||||
even when both prefixes bind to the same XML namespace URI, and match the
|
||||
spelling kept in `${a:revision}` and `${b:revision}` references. URL userinfo
|
||||
credentials in a property value are removed and `value_credentials_redacted`
|
||||
is `true`; when the credential span cannot be located, `value` is `null`.
|
||||
`dependencies` comes from the project's `<dependencies>` list.
|
||||
|
||||
@@ -54,6 +54,27 @@ export const mavenPomFixture = `<?xml version="1.0" encoding="UTF-8"?>
|
||||
</project>
|
||||
`;
|
||||
|
||||
/** Maven property keys keep their prefixes even when XML namespace URIs agree. */
|
||||
export const qualifiedMavenPropertiesFixture = `<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:a="urn:revisions" xmlns:b="urn:revisions">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>example</groupId>
|
||||
<artifactId>qualified-properties</artifactId>
|
||||
<version>\${a:revision}</version>
|
||||
<properties>
|
||||
<revision>0</revision>
|
||||
<a:revision>11</a:revision>
|
||||
<b:revision>22</b:revision>
|
||||
</properties>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>example</groupId>
|
||||
<artifactId>dependency</artifactId>
|
||||
<version>\${b:revision}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
`;
|
||||
|
||||
/** Tiny Gradle Module Metadata 1.1 document with library and platform variants. */
|
||||
export const gradleModuleFixture = `{
|
||||
"formatVersion": "1.1",
|
||||
|
||||
@@ -325,15 +325,15 @@ const parsePom = (
|
||||
const properties =
|
||||
propertiesElement === undefined
|
||||
? []
|
||||
: childElements(propertiesElement).flatMap((property) => {
|
||||
const name = nonempty(property.localName);
|
||||
if (name === null) return [];
|
||||
: childElements(propertiesElement).map((property) => {
|
||||
// A property may hold a repository URL; its userinfo never leaves the parser.
|
||||
const {
|
||||
url: value,
|
||||
url_credentials_redacted: value_credentials_redacted,
|
||||
} = redactRecordedTransportUrl(elementText(property));
|
||||
return [{ name, value, value_credentials_redacted }];
|
||||
// Maven property keys are the written qualified names, not XML
|
||||
// expanded names: different prefixes remain different keys.
|
||||
return { name: property.tagName, value, value_credentials_redacted };
|
||||
});
|
||||
const dependencyManagementElement = soleNamed(root, "dependencyManagement");
|
||||
const managedContainer = dependencyManagementElement
|
||||
|
||||
@@ -1,15 +1,16 @@
|
||||
import { createHash } from "node:crypto";
|
||||
import { writeFile } from "node:fs/promises";
|
||||
import { readFile, writeFile } from "node:fs/promises";
|
||||
import { join } from "node:path";
|
||||
import { expect } from "vitest";
|
||||
import { contractNamed } from "../../src/cli/contractCliDescription.js";
|
||||
import { MAVEN_GRADLE_METADATA_TOOL_CONTRACTS } from "../../src/contracts/java/mavenGradleMetadataToolContracts.js";
|
||||
import { toolContract } from "../../src/contracts/toolContracts.js";
|
||||
import { SESSION_TOOL_CONTRACTS } from "../../src/contracts/sessionToolContracts.js";
|
||||
import { parseEvidenceBundle } from "../../src/domain/evidenceBundle.js";
|
||||
import { connectLocalToolsMcp } from "../fixtures/localToolsMcp.js";
|
||||
import {
|
||||
gradleModuleFixture,
|
||||
mavenPomFixture,
|
||||
qualifiedMavenPropertiesFixture,
|
||||
} from "../../src/java/MavenGradleMetadata.fixture.js";
|
||||
import { createTestTempDirectory } from "../fixtures/temporaryDirectory.js";
|
||||
import { cliTest } from "../support/cli/cliFixture.js";
|
||||
@@ -18,6 +19,70 @@ const outputSchema = contractNamed(
|
||||
MAVEN_GRADLE_METADATA_TOOL_CONTRACTS,
|
||||
"inspect_maven_gradle_metadata",
|
||||
).outputSchema;
|
||||
const bundleOutputSchema = contractNamed(
|
||||
SESSION_TOOL_CONTRACTS,
|
||||
"get_evidence_bundle",
|
||||
).outputSchema;
|
||||
|
||||
cliTest(
|
||||
"preserves qualified POM property keys beside their references through CLI, MCP and retained Evidence",
|
||||
async ({ cli }) => {
|
||||
const root = await createTestTempDirectory("rea-maven-property-keys-");
|
||||
const path = join(root, "pom.xml");
|
||||
const bytes = Buffer.from(qualifiedMavenPropertiesFixture);
|
||||
await writeFile(path, bytes);
|
||||
const result = await cli.run({
|
||||
arguments: ["inspect-maven-gradle-metadata", path, "--json"],
|
||||
});
|
||||
expect(result.exitCode, result.stdout + result.stderr).toBe(0);
|
||||
const cliEvidence = outputSchema.parse(result.json);
|
||||
const report = cliEvidence.normalized_result;
|
||||
expect(report.properties).toEqual([
|
||||
{ name: "revision", value: "0", value_credentials_redacted: false },
|
||||
{ name: "a:revision", value: "11", value_credentials_redacted: false },
|
||||
{ name: "b:revision", value: "22", value_credentials_redacted: false },
|
||||
]);
|
||||
expect(report.coordinates.version).toBe("${a:revision}");
|
||||
expect(report.dependencies[0]?.version).toBe("${b:revision}");
|
||||
expect(report.unresolved).toEqual([
|
||||
{
|
||||
kind: "property",
|
||||
reference: "${a:revision}",
|
||||
field: "version",
|
||||
owner: "project",
|
||||
index: null,
|
||||
},
|
||||
{
|
||||
kind: "property",
|
||||
reference: "${b:revision}",
|
||||
field: "version",
|
||||
owner: "dependency",
|
||||
index: 0,
|
||||
},
|
||||
]);
|
||||
expect(report.artifact).toEqual({
|
||||
path,
|
||||
bytes: bytes.length,
|
||||
sha256: createHash("sha256").update(bytes).digest("hex"),
|
||||
});
|
||||
const { call } = await connectLocalToolsMcp();
|
||||
const response = await call("inspect_maven_gradle_metadata", { path });
|
||||
expect(response.isError, JSON.stringify(response)).not.toBe(true);
|
||||
const evidence = outputSchema.parse(response.structuredContent);
|
||||
expect(evidence.normalized_result).toEqual(report);
|
||||
const retained = await call("get_evidence_bundle", { detail: "complete" });
|
||||
expect(retained.isError, JSON.stringify(retained)).not.toBe(true);
|
||||
const bundle = parseEvidenceBundle(
|
||||
bundleOutputSchema.parse(retained.structuredContent).result,
|
||||
);
|
||||
expect(
|
||||
bundle.records.find(
|
||||
(record) => record.evidence_id === evidence.evidence_id,
|
||||
),
|
||||
).toEqual(evidence);
|
||||
expect((await readFile(path)).equals(bytes)).toBe(true);
|
||||
},
|
||||
);
|
||||
|
||||
cliTest(
|
||||
"reports a missing child artifact independently of parent group and version through CLI and MCP",
|
||||
@@ -65,9 +130,7 @@ cliTest(
|
||||
const retained = await call("get_evidence_bundle", { detail: "complete" });
|
||||
expect(retained.isError, JSON.stringify(retained)).not.toBe(true);
|
||||
const bundle = parseEvidenceBundle(
|
||||
toolContract("get_evidence_bundle").outputSchema.parse(
|
||||
retained.structuredContent,
|
||||
).result,
|
||||
bundleOutputSchema.parse(retained.structuredContent).result,
|
||||
);
|
||||
expect(
|
||||
bundle.records.find(
|
||||
@@ -148,9 +211,7 @@ cliTest(
|
||||
});
|
||||
expect(retained.isError, JSON.stringify(retained)).not.toBe(true);
|
||||
const bundle = parseEvidenceBundle(
|
||||
toolContract("get_evidence_bundle").outputSchema.parse(
|
||||
retained.structuredContent,
|
||||
).result,
|
||||
bundleOutputSchema.parse(retained.structuredContent).result,
|
||||
);
|
||||
expect(
|
||||
bundle.records.find(
|
||||
|
||||
Reference in new issue
Block a user