diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5fedba7..b06c94a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,4 +37,4 @@ jobs: run: ./scripts/test.sh - name: CDK-Synth-No-Lookup run: ./scripts/cdk-synth-no-lookup.sh - \ No newline at end of file + diff --git a/CHANGELOG.md b/CHANGELOG.md index cfa2d1c..5f96130 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [Released] -## [1.1.1] - 2023-11-29done +## [1.1.2] - 2023-11-29 +In this release we have included bugfixes. + +### Added +### Changed +### Fixed +- Issue in the PipelineStack tests when adding a stack deploying SecretsManager secrets. Namespaced all the template stack identifiers as well to avoid potential crashes during new resource creations +- Enforce use of latest [pip](https://pypi.org/project/pip/) version in the Security Scans + +## [1.1.1] - 2023-11-29 In this release we have included bugfixes, small updates to README as well as changed the Github Workflow to use cdk synth without lookup. ### Added diff --git a/NOTICE b/NOTICE index 84a94bb..53a4c53 100644 --- a/NOTICE +++ b/NOTICE @@ -7781,7 +7781,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -cicd-boot 1.1.1 +cicd-boot 1.1.2 MIT* MIT No Attribution diff --git a/package-lock.json b/package-lock.json index 0eb041e..e4454c6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cicd-boot", - "version": "1.1.1", + "version": "1.1.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cicd-boot", - "version": "1.1.1", + "version": "1.1.2", "dependencies": { "@cloudcomponents/cdk-pull-request-approval-rule": "2.1.0", "@cloudcomponents/cdk-pull-request-check": "2.1.0", diff --git a/package-verification.json b/package-verification.json index 5ec6471..bc28dbe 100644 --- a/package-verification.json +++ b/package-verification.json @@ -1 +1 @@ -{"package-lock.json":"e6c4dda3873ee39ce3a4fb7cf04b05f9a0b3c1ec531c736fd0e669e718fce5c4"} \ No newline at end of file +{"package-lock.json":"c83652d2d0037cd54319668560fad1db66d03a9dda672b0e6dd107589aa3da5a"} \ No newline at end of file diff --git a/package.json b/package.json index c2a751c..a333fc7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cicd-boot", - "version": "1.1.1", + "version": "1.1.2", "bin": { "pipeline": "bin/app.ts" }, diff --git a/scripts/check-code-scan-security.sh b/scripts/check-code-scan-security.sh index eabae36..7a1c9cf 100755 --- a/scripts/check-code-scan-security.sh +++ b/scripts/check-code-scan-security.sh @@ -68,6 +68,8 @@ function initalize_security_env() { $PYTHON_COMMAND -m venv "$WORK_DIR/venv" > /dev/null; . $WORK_DIR/venv/bin/activate; + + $PYTHON_COMMAND -m pip install --upgrade pip > /dev/null; } function install_python_dependency() { @@ -86,7 +88,7 @@ function install_python_dependency() { function report_location() { ## On CI/CD generate reports always if [[ -z "$JUNIT_REPORT" ]]; then - if [ ! -z $CODEBUILD_BUILD_ID ] || [ -z $CODEBUILD_BUILD_ID ]; then + if [ ! -z $CODEBUILD_BUILD_ID ] || [ -z $CODEBUILD_BUILD_ID ]; then JUNIT_REPORT="ci"; fi fi @@ -132,7 +134,7 @@ function bandit_scan() { install_python_dependency "bandit" "$BANDIT_VERSION"; # Execute bandit if [[ -z "$JUNIT_REPORT" ]]; then - bandit -x '**node_modules/*,**cdk.out/*' -r . + bandit -x '**node_modules/*,**cdk.out/*' -r . else if ! bandit -x '**node_modules/*,**cdk.out/*' -r -f xml -q . > "${JUNIT_REPORT_FOLDER}/bandit-junit-results.xml"; then CHECK_FAILED=1; diff --git a/test/PipelineStack.test.ts b/test/PipelineStack.test.ts index 96d1182..3a66630 100644 --- a/test/PipelineStack.test.ts +++ b/test/PipelineStack.test.ts @@ -22,7 +22,7 @@ describe('pipeline-stack-test-codecommit', () => { }); const template = Template.fromStack( - new PipelineStack(app, 'PipelineStack', { + new PipelineStack(app, 'PipelineStackCodeCommit', { env: { account: TestAppConfig.deploymentAccounts.RES, region: TestAppConfig.region }, applicationName: TestAppConfig.applicationName, applicationQualifier: TestAppConfig.applicationQualifier, @@ -125,7 +125,7 @@ describe('pipeline-stack-test-codestar', () => { }); const template = Template.fromStack( - new PipelineStack(app, 'PipelineStack', { + new PipelineStack(app, 'PipelineStackCodeStar', { env: { account: TestAppConfig.deploymentAccounts.RES, region: TestAppConfig.region }, applicationName: TestAppConfig.applicationName, applicationQualifier: TestAppConfig.applicationQualifier, diff --git a/test/RepositoryStack.test.ts b/test/RepositoryStack.test.ts index ee28bff..cd95f32 100644 --- a/test/RepositoryStack.test.ts +++ b/test/RepositoryStack.test.ts @@ -9,7 +9,7 @@ import { RepositoryStack } from '../lib/stacks/core/RepositoryStack'; describe('repository-stack-test-codecommit', () => { const app = new cdk.App(); const template = Template.fromStack( - new RepositoryStack(app, 'RepositoryStack', { + new RepositoryStack(app, 'RepositoryStackCodeCommit', { env: { account: TestAppConfig.deploymentAccounts.RES, region: TestAppConfig.region }, applicationName: TestAppConfig.applicationName, applicationQualifier: TestAppConfig.applicationQualifier, @@ -30,7 +30,7 @@ describe('repository-stack-test-codecommit', () => { describe('repository-stack-test-codestarconnect', () => { const app = new cdk.App(); - const stack = new RepositoryStack(app, 'RepositoryStack', { + const stack = new RepositoryStack(app, 'RepositoryStackCodeStar', { env: { account: TestAppConfig.deploymentAccounts.RES, region: TestAppConfig.region }, applicationName: TestAppConfig.applicationName, applicationQualifier: TestAppConfig.applicationQualifier, diff --git a/test/VPCStack.test.ts b/test/VPCStack.test.ts index 3e436d8..3366999 100644 --- a/test/VPCStack.test.ts +++ b/test/VPCStack.test.ts @@ -19,7 +19,7 @@ describe('vpc-stack-test-with-proxy', () => { }, }; - const vpcStack = new VPCStack(app, 'VPCStack', { + const vpcStack = new VPCStack(app, 'VPCStackWithProxy', { env: { account: TestAppConfig.deploymentAccounts.RES, region: TestAppConfig.region }, vpcConfig: vpcConfig, proxy: { @@ -83,7 +83,7 @@ describe('vpc-stack-test-without-proxy', () => { }, }; - const vpcStack = new VPCStack(app, 'VPCStack', { + const vpcStack = new VPCStack(app, 'VPCStackWithoutProxy', { env: { account: TestAppConfig.deploymentAccounts.RES, region: TestAppConfig.region }, vpcConfig: vpcConfig, flowLogsBucketName: TestAppConfig.complianceLogBucketName.RES, @@ -114,7 +114,7 @@ describe('vpc-stack-test-omission', () => { }; const template = Template.fromStack( - new VPCStack(app, 'VPCStack', { + new VPCStack(app, 'VPCStackOmission', { env: { account: TestAppConfig.deploymentAccounts.RES, region: TestAppConfig.region }, vpcConfig, flowLogsBucketName: TestAppConfig.complianceLogBucketName.RES,