Skip to content
This repository was archived by the owner on Dec 30, 2024. It is now read-only.

Commit 9fc443f

Browse files
authored
Merge pull request #413 from aws-solutions/v1.13.2
Release v1.13.2
2 parents 01ab0b3 + d390ad6 commit 9fc443f

File tree

8 files changed

+262
-1464
lines changed

8 files changed

+262
-1464
lines changed

CHANGELOG.md

Lines changed: 156 additions & 140 deletions
Large diffs are not rendered by default.

NOTICE.txt

Lines changed: 61 additions & 1291 deletions
Large diffs are not rendered by default.

deployment/run-pre-check.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,13 @@ echo "Trufflehog Scan started"
3333
# if trufflehog already installed locally, skip installation step
3434
if ! command -v trufflehog &>/dev/null; then
3535
echo "Installing Trufflehog"
36+
# fixes error if you try and run this script twice. Remove old directory from git clone.
37+
if [ -d "trufflehog" ]; then
38+
echo "Removing existing Trufflehog directory"
39+
rm -rf trufflehog
40+
fi
3641
git clone https://github.com/trufflesecurity/trufflehog.git --branch v3.54.1
37-
cd trufflehog; go install
42+
cd trufflehog && go install
3843
fi
3944
cd "$root_dir"
4045
find . ! -path "*trufflehog*" ! -path "*test_venv*" ! -path "*.git*" ! -path "*pkg*" ! -path "." | \
@@ -93,8 +98,9 @@ echo "JsHint Scan finished"
9398

9499
echo -e "\n\n"
95100
echo "Eslint Scan started"
96-
npm i -g eslint
101+
npm i -g eslint@9.0.0
97102
cd "$source_dir/html"
103+
export ESLINT_USE_FLAT_CONFIG=false
98104
eslint -c .eslintrc.json .
99105
if [ $? -ne 0 ]; then
100106
echo "ERROR: eslint scan failed"

solution-manifest.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
id: SO0048
22
name: media-services-application-mapper
3-
version: v1.13.1
3+
version: v1.13.2
44
cloudformation_templates:
55
- template: aws-media-services-application-mapper-release.template
66
main_template: true
@@ -9,3 +9,5 @@ cloudformation_templates:
99
- template: msam-dynamodb-release.template
1010
- template: msam-events-release.template
1111
- template: msam-iam-roles-release.template
12+
build_environment:
13+
build_image: "aws/codebuild/standard:7.0"

source/cdk/package-lock.json

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

source/cdk/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cdk",
3-
"version": "1.0.0",
3+
"version": "1.13.2",
44
"description": "Synthesize templates for Media Services Application Mapper using AWS Cloud Development Kit (CDK).",
55
"license": "Apache-2.0",
66
"author": {

source/html/package-lock.json

Lines changed: 23 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

source/html/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"license": "Apache-2.0",
33
"description": "Media Services Application Mapper Browser Application",
4+
"version": "1.13.2",
45
"dependencies": {
56
"@fortawesome/fontawesome-free": "^5.15.4",
67
"bootstrap": "^5.1.3",

0 commit comments

Comments
 (0)