Skip to content

Commit

Permalink
Merge pull request #523 from aws-solutions/release/1.5.4
Browse files Browse the repository at this point in the history
Release v1.5.4
  • Loading branch information
tbelmega authored Feb 29, 2024
2 parents f60fc6b + f6869f1 commit fdac213
Show file tree
Hide file tree
Showing 35 changed files with 3,715 additions and 7,185 deletions.
2 changes: 1 addition & 1 deletion .gitattributes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions .projen/deps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .projen/files.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 2 additions & 5 deletions .projen/tasks.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 16 additions & 2 deletions .projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
import { readFileSync } from "node:fs";
import { awscdk } from "projen";
import { awscdk, YamlFile } from "projen";
import { JestReporter, NodePackageManager, Transform, UpdateSnapshot } from "projen/lib/javascript";

const cdkVersion = "2.102.0";
const solutionVersion = "1.5.4";
const solutionId = "SO0030";
const solutionName = "instance-scheduler-on-aws";

Expand Down Expand Up @@ -175,6 +176,19 @@ const project = new awscdk.AwsCdkTypeScriptApp({
],
});

new YamlFile(project, "solution-manifest.yaml", {
obj: {
id: solutionId,
name: solutionName,
version: solutionVersion,
cloudformation_templates: [
{ template: "instance-scheduler-on-aws.template", main_template: true },
{ template: "instance-scheduler-on-aws-remote.template" },
],
build_environment: { build_image: "aws/codebuild/standard:7.0" },
},
});

project.addTask("e2e-tests", { exec: "jest --config source/pipeline/jest.config.ts", receiveArgs: true });

const prettierTask = project.addTask("test:prettier", { exec: "npx prettier --check ./**/*.ts" });
Expand Down Expand Up @@ -229,6 +243,6 @@ project.jest?.addTestMatch("**/*.test.ts");
// use default snapshot resolution
project.tryFindObjectFile("jest.config.json")?.addOverride("snapshotResolver", undefined);

project.tryFindObjectFile("package.json")?.addOverride("version", "1.5.3");
project.tryFindObjectFile("package.json")?.addOverride("version", solutionVersion);

project.synth();
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [1.5.4] -- 2024-02-29

### Security

- Upgrade cryptography to mitigate CVE-2024-26130, CVE-2023-50782, CVE-2024-0727, CVE-2023-49083
- Upgrade Jinja to mitigate CVE-2024-22195
- Upgrade Werkzeug to mitigate CVE-2023-46136
- Upgrade IP to mitigate CVE-2023-42282
- Remove ecdsa to mitigate CVE-2024-23342

## [1.5.3] - 2023-10-22

### Security
Expand Down
4 changes: 4 additions & 0 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,19 @@ source-map-support under the MIT License

attrs under the MIT License
aws-lambda-powertools under the MIT License
awscli under the Apache License 2.0
boto3 under the Apache License 2.0
botocore under the Apache License 2.0
certifi under the Mozilla Public License 2.0
charset-normalizer under the MIT License
colorama under the BSD 3-Clause "New" or "Revised" License
docutils under the BSD 2-Clause License, BSD 3-Clause License, GNU General Public License (GPL), Python Software Foundation License, Public Domain (public domain, Python, 2-Clause BSD, GPL 3)
filelock under the The Unlicense
idna under the BSD 3-Clause "New" or "Revised" License
iniconfig under the MIT License
jmespath under the MIT License
pluggy under the MIT License
pyasn1 under the BSD 2-Clause License
pytest under the MIT License
python-dateutil under the Apache License 2.0 and the BSD 3-Clause "New" or "Revised" License
pytz under the MIT License
Expand Down
12 changes: 12 additions & 0 deletions deployment/run-unit-tests.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/usr/bin/env bash
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: Apache-2.0
[[ $DEBUG ]] && set -x
set -eou pipefail

main() {
echo "Review README.md for instructions to run tests locally"
exit 1
}

main "$@"
Loading

0 comments on commit fdac213

Please sign in to comment.