Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(pipelines): add feature to display all changesets for stage before manual approval step + added postPrepare Step #30855

Closed
wants to merge 30 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
7cd9b70
feat: added possibility to define postPrepare Actions on Stage and Wa…
Nico-DB May 3, 2023
06c263f
fix
Nico-DB Jun 1, 2023
ca7310b
fix: Changed integ test to use the IntegTest construct
Nico-DB Jun 2, 2023
c74423c
fixed tests
Nico-DB Jun 5, 2023
32c7927
fix: corrected test cases
Nico-DB Jun 5, 2023
aefc2ce
Update integ.newpipeline.ts
Nico-DB Jun 5, 2023
183849e
fix: merge conflicts
Nico-DB Jun 5, 2023
ef5afb0
Merge branch 'main' into feat-24072
Nico-DB Jun 5, 2023
2b5aa3e
feat: adapted snapshots
Nico-DB Jun 22, 2023
09f6bb1
feat: adapted snapshots
Nico-DB Jun 22, 2023
433c0f8
Merge branch 'feat-24072' into feat-integ
Nico-DB Jun 22, 2023
7434934
Merge branch 'aws:main' into main
Nico-DB Dec 18, 2023
63ac5b3
Merge branch 'feat-integ' into main
Nico-DB Dec 18, 2023
986f1c1
Merge pull request #4 from Nico-DB/main
Nico-DB Dec 18, 2023
6620043
fix: removed cdk-cki-wrapper due to unknown origin. Fix formatting
Nico-DB Dec 18, 2023
b6c9eb6
fix: removed cdk-cki-wrapper due to unknown origin. Fix formatting
Nico-DB Dec 18, 2023
6411def
fix: removed duplicate imports
Nico-DB Dec 18, 2023
e42fef9
fix: formatting and import/order
Nico-DB Dec 18, 2023
8861004
chore: added missing property @default for documentation
Nico-DB Dec 18, 2023
9911de1
fix: unit test
Nico-DB Dec 18, 2023
3658287
fix: test
Nico-DB Dec 19, 2023
874c73f
fix: unit-test
Nico-DB Dec 19, 2023
dfdde83
fix: unit-test
Nico-DB Dec 19, 2023
87ee3a0
fix: inted test updated
Nico-DB Dec 19, 2023
81375a3
fix: removed no-multi-empty-line
Nico-DB Dec 19, 2023
873b91c
Merge branch 'main' into feat-integ
Nico-DB Jul 1, 2024
476017f
feat: merged main into feature branch
Nico-DB Jul 15, 2024
6374548
fix: linting issues
Nico-DB Jul 15, 2024
138210a
Update integ.newpipeline-with-allPrepareNodesFirst.ts
Nico-DB Jul 17, 2024
00f9849
Update integ.newpipeline-with-vpc.ts
Nico-DB Jul 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: formatting and import/order
Nico-DB committed Dec 18, 2023
commit e42fef9539efd09ca70a7cdb893f25bdc9ff4ef1
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import * as path from 'path';
import { AssetType } from './asset-type';
import { Step } from './step';
import * as cxapi from '../../../cx-api';
import { AssetManifestReader, DockerImageManifestEntry, FileManifestEntry } from '../private/asset-manifest';
import { isAssetManifest } from '../private/cloud-assembly-internals';
import { AssetType } from './asset-type';
import { Step } from './step';



/**
* Properties for a `StackDeployment`
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import { StackDeployment } from './stack-deployment';
import { StackSteps, Step } from './step';
import * as cdk from '../../../core';
import { CloudFormationStackArtifact } from '../../../cx-api';
import { isStackArtifact } from '../private/cloud-assembly-internals';
import { pipelineSynth } from '../private/construct-internals';
import { StackDeployment } from './stack-deployment';
import { StackSteps, Step } from './step';



/**
* Properties for a `StageDeployment`
@@ -157,7 +155,6 @@ export class StageDeployment {
*/
public readonly prepareStep?: boolean;


private constructor(
/** The stacks deployed in this stage */
public readonly stacks: StackDeployment[],
4 changes: 2 additions & 2 deletions packages/aws-cdk-lib/pipelines/lib/blueprint/step.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Stack, Token } from '../../../core';
import { StepOutput } from '../helpers-internal/step-output';
import { FileSet, IFileSetProducer } from './file-set';
import { StackOutputReference } from './shell-step';
import { Stack, Token } from '../../../core';
import { StepOutput } from '../helpers-internal/step-output';

/**
* A generic Step which can be added to a Pipeline
2 changes: 0 additions & 2 deletions packages/aws-cdk-lib/pipelines/lib/blueprint/wave.ts
Original file line number Diff line number Diff line change
@@ -54,7 +54,6 @@ export class Wave {
*/
public readonly stages: StageDeployment[] = [];


constructor(
/** Identifier for this Wave */
public readonly id: string,
@@ -132,7 +131,6 @@ export interface AddStageOpts {
*/
readonly stackSteps?: StackSteps[];


}

/**
Original file line number Diff line number Diff line change
@@ -1,20 +1,7 @@
import {
AssetType,
FileSet,
StackAsset,
StackDeployment,
StageDeployment,
Step,
Wave,
} from '../blueprint';
import { PipelineBase } from '../main/pipeline-base';
import {
DependencyBuilders,
Graph,
GraphNode,
GraphNodeCollection,
} from './graph';
import { DependencyBuilders, Graph, GraphNode, GraphNodeCollection } from './graph';
import { PipelineQueries } from './pipeline-queries';
import { AssetType, FileSet, StackAsset, StackDeployment, StageDeployment, Step, Wave } from '../blueprint';
import { PipelineBase } from '../main/pipeline-base';

export interface PipelineGraphProps {
/**
Original file line number Diff line number Diff line change
@@ -114,7 +114,6 @@ describe('blueprint with wave and stage', () => {
]);
});


test('postPrepare and prepareNodes are added correctly inside stack graph', () => {
// GIVEN
const appWithExposedStacks = new AppWithExposedStacks(app, 'Gamma');
@@ -141,7 +140,6 @@ describe('blueprint with wave and stage', () => {

// WHEN
const graph = new PipelineGraph(blueprint).graph;
console.log(graph);
// THEN
expect(childrenAt(graph, 'Wave', 'Gamma', 'Stack1')).toEqual([
'Prepare-Gamma-Stack1',
@@ -153,7 +151,6 @@ describe('blueprint with wave and stage', () => {
]);
});


test('pre, changeSet, and post are added correctly inside stack graph', () => {
// GIVEN
const appWithExposedStacks = new AppWithExposedStacks(app, 'Gamma');
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/* eslint-disable import/no-extraneous-dependencies */
import { Construct } from 'constructs';
import * as fs from 'fs';
import * as path from 'path';
import { Construct } from 'constructs';
import { Capture, Match, Template } from '../../../assertions';
import { Stack, Stage, StageProps, Tags } from '../../../core';
import { BucketStack, LegacyTestGitHubNpmPipeline, ModernTestGitHubNpmPipeline, OneStackApp, PIPELINE_ENV, TestApp, behavior, stringLike } from '../testhelpers';



let app: TestApp;
let pipelineStack: Stack;

Original file line number Diff line number Diff line change
@@ -328,7 +328,6 @@ behavior('confirmBroadeningPermissions and notification topic options generates
function THEN_codePipelineExpectation() {
Template.fromStack(pipelineStack).resourceCountIs('AWS::SNS::Topic', 1);


Template.fromStack(pipelineStack).hasResourceProperties(
'AWS::CodePipeline::Pipeline',
{