From ac5dc6bf9c8fb3b7acbebee25c289a39e79ffdb2 Mon Sep 17 00:00:00 2001 From: Kaizen Conroy Date: Thu, 21 May 2026 17:49:56 -0400 Subject: [PATCH] feat(cloud-assembly-schema): rename report file to validation-report.json Rename from policy-validation-report.json to validation-report.json to avoid conflicting with the existing report format written by aws-cdk-lib which uses a different schema shape. --- .../lib/cloud-assembly/validation-report-schema.ts | 2 +- .../test/validation-report.test.ts | 10 +++++----- packages/@aws-cdk/toolkit-lib/lib/toolkit/toolkit.ts | 2 +- ...y-validation-report.json => validation-report.json} | 0 ...y-validation-report.json => validation-report.json} | 0 ...y-validation-report.json => validation-report.json} | 0 ...y-validation-report.json => validation-report.json} | 0 7 files changed, 7 insertions(+), 7 deletions(-) rename packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-malformed-validation-report/cdk.out/{policy-validation-report.json => validation-report.json} (100%) rename packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-no-title-validation/cdk.out/{policy-validation-report.json => validation-report.json} (100%) rename packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-passing-validation/cdk.out/{policy-validation-report.json => validation-report.json} (100%) rename packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-validation-report/cdk.out/{policy-validation-report.json => validation-report.json} (100%) diff --git a/packages/@aws-cdk/cloud-assembly-schema/lib/cloud-assembly/validation-report-schema.ts b/packages/@aws-cdk/cloud-assembly-schema/lib/cloud-assembly/validation-report-schema.ts index 8366fa94e..c47aa44f1 100644 --- a/packages/@aws-cdk/cloud-assembly-schema/lib/cloud-assembly/validation-report-schema.ts +++ b/packages/@aws-cdk/cloud-assembly-schema/lib/cloud-assembly/validation-report-schema.ts @@ -1,5 +1,5 @@ /** - * JSON schema for policy-validation-report.json + * JSON schema for validation-report.json * * This file is written to the cloud assembly directory by aws-cdk-lib * during synthesis and consumed by the CDK CLI's validate command. diff --git a/packages/@aws-cdk/cloud-assembly-schema/test/validation-report.test.ts b/packages/@aws-cdk/cloud-assembly-schema/test/validation-report.test.ts index 3c1f27ada..846689928 100644 --- a/packages/@aws-cdk/cloud-assembly-schema/test/validation-report.test.ts +++ b/packages/@aws-cdk/cloud-assembly-schema/test/validation-report.test.ts @@ -15,7 +15,7 @@ describe('Manifest.loadValidationReport', () => { }); test('loads a valid report', () => { - const reportPath = path.join(tmpDir, 'policy-validation-report.json'); + const reportPath = path.join(tmpDir, 'validation-report.json'); fs.writeFileSync(reportPath, JSON.stringify({ version: '1.0.0', pluginReports: [{ @@ -46,7 +46,7 @@ describe('Manifest.loadValidationReport', () => { }); test('loads a report with optional fields', () => { - const reportPath = path.join(tmpDir, 'policy-validation-report.json'); + const reportPath = path.join(tmpDir, 'validation-report.json'); fs.writeFileSync(reportPath, JSON.stringify({ version: '1.0.0', title: 'Validation Report', @@ -67,7 +67,7 @@ describe('Manifest.loadValidationReport', () => { }); test('throws on missing required fields', () => { - const reportPath = path.join(tmpDir, 'policy-validation-report.json'); + const reportPath = path.join(tmpDir, 'validation-report.json'); fs.writeFileSync(reportPath, JSON.stringify({ title: 'Validation Report', })); @@ -76,7 +76,7 @@ describe('Manifest.loadValidationReport', () => { }); test('throws on invalid conclusion value', () => { - const reportPath = path.join(tmpDir, 'policy-validation-report.json'); + const reportPath = path.join(tmpDir, 'validation-report.json'); fs.writeFileSync(reportPath, JSON.stringify({ version: '1.0.0', pluginReports: [{ @@ -90,7 +90,7 @@ describe('Manifest.loadValidationReport', () => { }); test('throws on invalid severity value', () => { - const reportPath = path.join(tmpDir, 'policy-validation-report.json'); + const reportPath = path.join(tmpDir, 'validation-report.json'); fs.writeFileSync(reportPath, JSON.stringify({ version: '1.0.0', pluginReports: [{ diff --git a/packages/@aws-cdk/toolkit-lib/lib/toolkit/toolkit.ts b/packages/@aws-cdk/toolkit-lib/lib/toolkit/toolkit.ts index 2be20f742..8e783a627 100644 --- a/packages/@aws-cdk/toolkit-lib/lib/toolkit/toolkit.ts +++ b/packages/@aws-cdk/toolkit-lib/lib/toolkit/toolkit.ts @@ -114,7 +114,7 @@ import { pLimit } from '../util/concurrency'; import { createIgnoreMatcher } from '../util/glob-matcher'; import { promiseWithResolvers } from '../util/promises'; -const POLICY_VALIDATION_REPORT_FILE = 'policy-validation-report.json'; +const POLICY_VALIDATION_REPORT_FILE = 'validation-report.json'; export interface ToolkitOptions { /** diff --git a/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-malformed-validation-report/cdk.out/policy-validation-report.json b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-malformed-validation-report/cdk.out/validation-report.json similarity index 100% rename from packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-malformed-validation-report/cdk.out/policy-validation-report.json rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-malformed-validation-report/cdk.out/validation-report.json diff --git a/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-no-title-validation/cdk.out/policy-validation-report.json b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-no-title-validation/cdk.out/validation-report.json similarity index 100% rename from packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-no-title-validation/cdk.out/policy-validation-report.json rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-no-title-validation/cdk.out/validation-report.json diff --git a/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-passing-validation/cdk.out/policy-validation-report.json b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-passing-validation/cdk.out/validation-report.json similarity index 100% rename from packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-passing-validation/cdk.out/policy-validation-report.json rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-passing-validation/cdk.out/validation-report.json diff --git a/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-validation-report/cdk.out/policy-validation-report.json b/packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-validation-report/cdk.out/validation-report.json similarity index 100% rename from packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-validation-report/cdk.out/policy-validation-report.json rename to packages/@aws-cdk/toolkit-lib/test/_fixtures/stack-with-validation-report/cdk.out/validation-report.json