Skip to content

Commit fd203f7

Browse files
committed
update to version 6.2.0
1 parent a3892ca commit fd203f7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+17423
-6732
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
**/dist
33
**/global-s3-assets
44
**/regional-s3-assets
5+
**/staging
56
**/open-source
67
**/.zip
78
**/tmp
@@ -14,6 +15,7 @@
1415
**/coverage
1516
**/coverage-reports
1617
**/.nyc_output
18+
**/mock-*
1719

1820
# misc
1921
**/npm-debug.log

.viperlightignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ CONTRIBUTING.md:46
33
CODE_OF_CONDUCT.md:4
44
coverage/*
55
.zip
6+
Config

.viperlightrc

Lines changed: 0 additions & 4 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,23 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [6.2.0] - 2023-04-24
9+
10+
### Added
11+
12+
+ Add `cdk-helper` module to help with packaging cdk generated assets in solutions internal pipelines
13+
+ Use [DefaultStackSynthesizer](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.DefaultStackSynthesizer.html) with different configurations to generate template for `cdk deploy` and on internal solutions pipeline
14+
+ Add esbuild bundler for lambda functions using `NodejsFunction`, reference [aws_lambda_nodejs](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_lambda_nodejs-readme.html)
15+
+ Refactor pipeline scripts
16+
+ Changes semver dependency version to 7.5.2 for github reported vulnerability CVE-2022-25883
17+
+ Changes word-wrap dependency version to aashutoshrathi/word-wrap for github reported vulnerability CVE-2023-26115
18+
819
## [6.1.2] - 2023-04-14
920

1021
### Changed
1122

1223
- added s3 bucket ownership control permission and ownership parameter to S3 logging bucket to account for [changes in S3 default behavior](https://docs.aws.amazon.com/AmazonS3/latest/userguide/create-bucket-faq.html)
13-
- changed xml2js version to 0.5.0
24+
- changed xml2js version to 0.5.0 for github dependabot reported vulnerability CVE-2023-0842
1425

1526
## [6.1.1] - 2023-02-09
1627

CONTRIBUTING.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@ When filing an issue, please check [existing open](https://github.com/aws-soluti
2222

2323
Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
2424

25-
1. You are working against the latest source on the _develop_ branch.
25+
1. You are working against the latest source on the _main_ branch.
2626
1. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
2727
1. You open an issue to discuss any significant work - we would hate for your time to be wasted.
28-
1. Note that the head of the develop branch contains latest features being developed for the solution.
29-
1. Changes in this branch will be unstable and are not recommended for production deployments.
3028

3129
To send us a pull request, please:
3230

@@ -36,7 +34,6 @@ To send us a pull request, please:
3634
1. Run _npx npm run prettier-format_ in _source_ to ensure that code format standards are maintained.
3735
1. If your changes include new capabilities, include in the PR description text that can be folded into the solution documentation.
3836
1. Commit to your fork using clear commit messages.
39-
1. Ensure that github Actions pass for all Required tasks.
4037
1. In your repository _Security_ section, ensure that security advisories are enabled and address any Dependabot issues that appear.
4138
1. Send us a pull request, answering any default questions in the pull request interface.
4239
1. If the changes are complex or may involve additional communication, we may create a feature branch specific to your PR and ask you to rebase using that branch.

NOTICE.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ This software includes third party software subject to the following copyrights:
2626
@types/uuid under the Massachusetts Institute of Technology (MIT) license
2727
@typescript-eslint/eslint-plugin under the Massachusetts Institute of Technology (MIT) license
2828
@typescript-eslint/parser under the BSD 2-Clause license
29+
adm-zip under the Massachusetts Institute of Technology (MIT) license
2930
aws-cdk under the Apache License 2.0
3031
aws-sdk under the Apache License 2.0
3132
axios under the Massachusetts Institute of Technology (MIT) license

README.md

Lines changed: 18 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@
1010
- [Customizing the Solution](#customizing-the-solution)
1111
- [Prerequisites for Customization](#prerequisites-for-customization)
1212
- [1. Clone the repository](#1-clone-the-repository)
13-
- [2. Declare environment variables](#2-declare-environment-variables)
14-
- [Unit Test](#unit-test)
15-
- [Build](#build)
16-
- [Deploy](#deploy)
13+
- [2. Unit Test](#2-unit-test)
14+
- [3. Build & Deploy](#3-build-and-deploy)
1715
- [Collection of operational metrics](#collection-of-operational-metrics)
1816
- [External Contributors](#external-contributors)
1917
- [License](#license)
@@ -46,7 +44,7 @@ In addition to the AWS Solutions Constructs, the solution uses AWS CDK directly
4644
## Prerequisites for Customization
4745

4846
- [AWS Command Line Interface](https://aws.amazon.com/cli/)
49-
- Node.js 16.x or later
47+
- Node.js 14.x
5048

5149
### 1. Clone the repository
5250

@@ -56,39 +54,30 @@ cd serverless-image-handler
5654
export MAIN_DIRECTORY=$PWD
5755
```
5856

59-
### 2. Declare environment variables
6057

61-
```bash
62-
export REGION=aws-region-code # the AWS region to launch the solution (e.g. us-east-1)
63-
export BUCKET_PREFIX=my-bucket-name # the bucket prefix, randomized name recommended
64-
export BUCKET_NAME=$BUCKET_PREFIX-$REGION # the bucket name where customized code will reside
65-
export SOLUTION_NAME=my-solution-name # the solution name
66-
export VERSION=my-version # version number for the customized code
67-
```
68-
69-
## Unit Test
58+
### 2. Unit Test
7059

7160
After making changes, run unit tests to make sure added customization passes the tests:
7261

7362
```bash
7463
cd $MAIN_DIRECTORY/deployment
75-
chmod +x run-unit-tests.sh
76-
./run-unit-tests.sh
64+
chmod +x run-unit-tests.sh && ./run-unit-tests.sh
7765
```
7866

79-
## Build
80-
67+
### 3. Build and Deploy
8168
```bash
82-
cd $MAIN_DIRECTORY/deployment
83-
chmod +x build-s3-dist.sh
84-
./build-s3-dist.sh $BUCKET_PREFIX $SOLUTION_NAME $VERSION
69+
cd $MAIN_DIRECTORY/source/constructs
70+
npm run clean:install
71+
overrideWarningsEnabled=false npx cdk bootstrap --profile <PROFILE_NAME>
72+
overrideWarningsEnabled=false npx cdk deploy\
73+
--parameters DeployDemoUIParameter=Yes\
74+
--parameters SourceBucketsParameter=<MY_BUCKET>\
75+
--profile <PROFILE_NAME>
8576
```
8677

87-
## Deploy
88-
89-
- Deploy the distributable to the Amazon S3 bucket in your account. Make sure you are uploading the files in `deployment/global-s3-assets` and `deployment/regional-s3-assets` to `$BUCKET_NAME/$SOLUTION_NAME/$VERSION`.
90-
- Get the link of the solution template uploaded to your Amazon S3 bucket.
91-
- Deploy the solution to your account by launching a new AWS CloudFormation stack using the link of the solution template in Amazon S3.
78+
_Note:_
79+
- **MY_BUCKET**: name of an existing bucket in your account
80+
- **PROFILE_NAME**: name of an AWS CLI profile that has appropriate credentials for deploying in your preferred region
9281

9382
# Collection of operational metrics
9483

@@ -116,6 +105,5 @@ This solution collects anonymous operational metrics to help AWS improve the qua
116105

117106
# License
118107

119-
Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
120-
121-
SPDX-License-Identifier: Apache-2.0
108+
Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
109+
SPDX-License-Identifier: Apache-2.0

buildspec.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

deployment/build-open-source-dist.sh

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)