Verwijder de destrictive check

Author: Cliff Odijk

.projenrc.ts

@@ -45,17 +45,6 @@ const project = new GitHubActionTypeScriptProject({
         description: 'github token',
         required: true,
       },
-      allowedDestroyTypes: {
-        description:
-          'Comma delimited list of resource types that are allowed to be destroyed',
-        required: false,
-        default: '',
-      },
-      failOnDestructiveChanges: {
-        description: 'Whether or not destructive changes should fail the job',
-        required: false,
-        default: 'true',
-      },
       stackSelectorPatterns: {
         description:
           'Comma delimited list of stack selector patterns. Use this to control which stages/stacks to diff. By default all stages & stacks are diffed\n\n' +
@@ -76,12 +65,6 @@ const project = new GitHubActionTypeScriptProject({
         default: 'all-stacks',
         required: false,
       },
-      noFailOnDestructiveChanges: {
-        description:
-          'List of stages where breaking changes will not fail the build',
-        required: false,
-        default: '',
-      },
       cdkOutDirs: {
         description: [
           'Glob pattern to find CDK output directories to diff.',

action.yml

@@ -1,6 +1,5 @@
 import {
   getInput,
-  getBooleanInput,
   getMultilineInput,
   debug,
 } from '@actions/core';
@@ -51,9 +50,8 @@ function hasGitChanges(directory: string, baseRef: string): boolean {
     const hasChanges = result.trim().length > 0;
     debug(`Directory ${projectDir} has changes against ${baseRef}: ${hasChanges}`);
 
-    if (hasChanges) {
-      debug(`Changed files in ${projectDir}:\n${result}`);
-    }
+    // Always show git diff output for debugging purposes
+    debug(`Git diff output for ${projectDir}:\n${result || '(no changes)'}`);
 
     return hasChanges;
   } catch (error) {
@@ -102,15 +100,11 @@ export async function run() {
     defaultStageDisplayName: getInput('defaultStageDisplayName', {
       required: true,
     }),
-    allowedDestroyTypes: getMultilineInput('allowedDestroyTypes'),
-    failOnDestructiveChanges: getBooleanInput('failOnDestructiveChanges'),
     githubToken: getInput('githubToken'),
     stackSelectorPatterns: getMultilineInput('stackSelectorPatterns'),
     stackSelectionStrategy: getInput('stackSelectionStrategy', {
       required: true,
     }),
-    noFailOnDestructiveChanges: getMultilineInput('noFailOnDestructiveChanges'),
-    cdkOutDirs: cdkOutDirs,
     baseRef: baseRef,
     diffMethod: getInput('diffMethod', { required: true }),
   };
@@ -138,9 +132,8 @@ export async function run() {
       : DiffMethod.ChangeSet();
   try {
     const comments = new Comments(octokit, context);
-    let hasAnyDestructiveChanges = false;
 
-    for (const cdkOutDir of inputs.cdkOutDirs) {
+    for (const cdkOutDir of cdkOutDirs) {
       debug(`Processing CDK output directory: ${cdkOutDir}`);
       const processor = new AssemblyProcessor({
         ...inputs,
@@ -149,7 +142,7 @@ export async function run() {
         toolkit,
       });
       try {
-        await processor.processStages(inputs.noFailOnDestructiveChanges);
+        await processor.processStages();
       } catch (e: any) {
         console.error(`Error running process stages for ${cdkOutDir}: `, e);
         throw e;
@@ -161,16 +154,6 @@ export async function run() {
         console.error(`Error commenting stages for ${cdkOutDir}: `, e);
         throw e;
       }
-
-      if (processor.hasDestructiveChanges) {
-        hasAnyDestructiveChanges = true;
-      }
-    }
-
-    if (hasAnyDestructiveChanges && inputs.failOnDestructiveChanges) {
-      throw new Error(
-        'There are destructive changes! See PR comment for details.',
-      );
     }
   } catch (e: any) {
     console.error('Error performing diff: ', e);

dist/index.js

@@ -7,21 +7,6 @@ export interface Inputs {
    */
   githubToken: string;
 
-  /**
-   * A list of CloudFormation resource types that are allowed
-   * to be destroyed.
-   *
-   * @default - there are no allowed destroy types
-   */
-  allowedDestroyTypes: string[];
-
-  /**
-   * Whether the workflow will fail if there are any non-allowed
-   * destructive changes
-   *
-   * @default true
-   */
-  failOnDestructiveChanges: boolean;
 
   /**
    * List of stack selector patterns
@@ -56,20 +41,6 @@ export interface Inputs {
    */
   diffMethod: string;
 
-  /**
-   * List of stages where breaking changes will not fail the build
-   *
-   * @default - breaking changes on any stage will fail the build
-   */
-  noFailOnDestructiveChanges: string[];
-
-  /**
-   * The locations of the CDK output directories
-   *
-   * @default ['cdk.out']
-   */
-  cdkOutDirs: string[];
-
   /**
    * Git reference to compare against for detecting changes
    *

dist/index.js.map

@@ -44,7 +44,7 @@ interface StageComment {
 }
 
 export interface AssemblyProcessorOptions
-  extends Omit<Inputs, 'githubToken' | 'diffMethod' | 'cdkOutDirs'> {
+  extends Omit<Inputs, 'githubToken' | 'diffMethod'> {
   cdkOutDir: string;
   diffMethod: DiffMethod;
   toolkit: Toolkit;
@@ -181,24 +181,21 @@ export class AssemblyProcessor {
    * Process all of the stages. Once this has been run
    * the comment can be created with `commentStages()`
    */
-  public async processStages(ignoreDestructiveChanges: string[] = []) {
+  public async processStages() {
     if (!this._templateDiffs) {
       await this.diffApp();
     }
     debug(`Diffs: ${JSON.stringify(this._templateDiffs, null, 2)}`);
     for (const stage of this.stageDiffInfo) {
       for (const stack of stage.stacks) {
         try {
-          const { comment, changes } = await this.diffStack(stack);
+          const { comment } = await this.diffStack(stack);
           debug(
             `Diff for stack ${stack.stackName}: ${JSON.stringify(comment, null, 2)}`,
           );
           this.stageComments[stage.name].stackComments[stack.stackName].push(
             ...comment,
           );
-          if (!ignoreDestructiveChanges.includes(stage.name)) {
-            this.stageComments[stage.name].destructiveChanges += changes;
-          }
         } catch (e: any) {
           console.error('Error processing stages: ', e);
           throw e;
@@ -317,23 +314,12 @@ export class AssemblyProcessor {
     }
   }
 
-  /**
-   * Returns whether or not there are destructive changes in this stage
-   */
-  public get hasDestructiveChanges(): boolean {
-    for (const comments of Object.values(this.stageComments)) {
-      if (comments.destructiveChanges) {
-        return true;
-      }
-    }
-    return false;
-  }
 
   private async diffStack(
     stack: StackDiffInfo,
   ): Promise<{ comment: string[]; changes: number }> {
     try {
-      const stackDiff = new StackDiff(stack, this.options.allowedDestroyTypes);
+      const stackDiff = new StackDiff(stack, []);
       const { diff, changes } = await stackDiff.diffStack();
       return {
         comment: this.formatStackComment(stack.stackName, diff, changes),

src/action.ts

@@ -169,7 +169,6 @@ describe('StageProcessor', () => {
     expect(
       p.SomeStage.stackComments['SomeStage/test-stack'].length,
     ).not.toEqual(0);
-    expect(p.SomeStage.destructiveChanges).toEqual(1);
   });
 
   test('stage with destructive changes-ignored', async () => {
@@ -396,7 +395,6 @@ describe('StageProcessor', () => {
     expect(p.SomeStage.stackComments['SomeOtherStage/test-stack']).toEqual(
       undefined,
     );
-    expect(p.SomeStage.destructiveChanges).toEqual(1);
   });
 });