tests

aws · Feb 19, 2024 · b4f04e5 · b4f04e5
1 parent d391cb1
commit b4f04e5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/packages/@aws-cdk/cloudformation-diff/lib/diff-template.ts b/packages/@aws-cdk/cloudformation-diff/lib/diff-template.ts
@@ -52,7 +52,7 @@ export function fullDiff(
   normalize(newTemplate);
   const theDiff = diffTemplate(currentTemplate, newTemplate);
   if (changeSet) {
-    filterFalsePositivies(theDiff, changeSet);
+    filterFalsePositives(theDiff, changeSet);
     addImportInformation(theDiff, changeSet);
   }
 
@@ -218,7 +218,7 @@ function addImportInformation(diff: types.TemplateDiff, changeSet: CloudFormatio
   });
 }
 
-function filterFalsePositivies(diff: types.TemplateDiff, changeSet: CloudFormation.DescribeChangeSetOutput) {
+function filterFalsePositives(diff: types.TemplateDiff, changeSet: CloudFormation.DescribeChangeSetOutput) {
   const replacements = findResourceReplacements(changeSet);
   diff.resources.forEachDifference((logicalId: string, change: types.ResourceDifference) => {
     change.forEachDifference((type: 'Property' | 'Other', name: string, value: types.Difference<any> | types.PropertyDifference<any>) => {

diff --git a/packages/aws-cdk/lib/api/nested-stack-helpers.ts b/packages/aws-cdk/lib/api/nested-stack-helpers.ts
@@ -7,9 +7,9 @@ import { CloudFormationStack, Template } from './util/cloudformation';
 
 export interface NestedStackTemplates {
   readonly physicalName: string | undefined;
-  readonly deployedTemplate: Template
-  readonly generatedTemplate: Template
-  readonly nestedStackTemplates: { [nestedStackLogicalId: string]: NestedStackTemplates}
+  readonly deployedTemplate: Template;
+  readonly generatedTemplate: Template;
+  readonly nestedStackTemplates: { [nestedStackLogicalId: string]: NestedStackTemplates};
 }
 
 export interface RootTemplateWithNestedStacks {

diff --git a/packages/aws-cdk/test/diff.test.ts b/packages/aws-cdk/test/diff.test.ts
@@ -15,7 +15,7 @@ let toolkit: CdkToolkit;
 
 describe('imports', () => {
   beforeEach(() => {
-    jest.spyOn(cfn, 'createDiffChangeSet').mockImplementation(async () => {
+    jest.spyOn(cfn, 'createDiffChangeSet').mockImplementationOnce(async () => {
       return {
         Changes: [
           {
@@ -70,8 +70,8 @@ describe('imports', () => {
     // Default implementations
     cloudFormation.readCurrentTemplateWithNestedStacks.mockImplementation((_stackArtifact: CloudFormationStackArtifact) => {
       return Promise.resolve({
-        deployedTemplate: {},
-        nestedStackCount: 0,
+        deployedRootTemplate: {},
+        nestedStacks: {},
       });
     });
     cloudFormation.deployStack.mockImplementation((options) => Promise.resolve({
@@ -486,6 +486,7 @@ describe('nested stacks', () => {
     const exitCode = await toolkit.diff({
       stackNames: ['Parent'],
       stream: buffer,
+      changeSet: false,
     });
 
     // THEN