Skip to content
This repository was archived by the owner on Oct 25, 2023. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit bd64f38

Browse files
tabdunabitabdunabi
authoredApr 18, 2023
Update to version v1.0.11
- Node module updates (fixing dependabot warnings) - Enabled Amazon S3 server access logging on logging bucket(s) - Some code formatting
2 parents 8a79c94 + cf615a3 commit bd64f38

File tree

11 files changed

+1711
-4331
lines changed

11 files changed

+1711
-4331
lines changed
 

‎CHANGELOG.md‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +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+
## [1.0.11] - 2023-04-18
9+
10+
### Changed
11+
12+
- Node module updates
13+
- Enabled Amazon S3 server access logging on logging bucket(s)
14+
815
## [1.0.10] - 2023-03-06
916

1017
### Added
11-
- Support for GovCloud deployment. Note: because of the absence of Amazon CloudFront in GovCloud, the deployment would need
12-
setting up a webserver outside of the deployment and copying the client app (UI) to the webserver resource for the front-end
13-
to work.
18+
19+
- Support for GovCloud deployment. Note: because of the absence of Amazon CloudFront in GovCloud, the deployment would need
20+
setting up a webserver outside of the deployment and copying the client app (UI) to the webserver resource for the front-end
21+
to work.
1422

1523
### Fixed
24+
1625
- Bug fix - address AWS CodePipeline and hence deployment failure because of an incorrect option in the `aws logs` API call
1726

1827
## [1.0.9] - 2023-02-13

‎deployment/document-understanding-cicd/index.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ exports.handler = async (event, context) => {
161161

162162
Logger.log(
163163
Logger.levels.ROBUST,
164-
`Commit successful, resp is ${resp}`
164+
`Commit successful, resp is ${JSON.stringify(resp)}`
165165
);
166166

167167
parentCommitId = resp.commitId;
@@ -170,15 +170,15 @@ exports.handler = async (event, context) => {
170170
} catch (ex) {
171171
Logger.log(
172172
Logger.levels.ROBUST,
173-
`It failed, continuing, error is: ${ex}`
173+
`It failed on ${JSON.stringify(
174+
codeCommitParams
175+
)}, \n continuing, error is: ${ex}`
174176
);
175177

176178
resp = "failed";
177179
// Avoiding throttling
178180
await new Promise((r) => setTimeout(r, 5000));
179181
}
180-
181-
// parentCommitId = resp.commitId;
182182
}
183183

184184
const _responseData = {

‎deployment/document-understanding-cicd/package-lock.json‎

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

‎deployment/document-understanding-cicd/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"name": "aws-solutions-builder"
77
},
88
"dependencies": {
9-
"aws-sdk": "*",
109
"adm-zip": "^0.4.13",
10+
"aws-sdk": "^2.1354.0",
1111
"logger": "file:../logger"
1212
},
1313
"main": "index.js",

‎deployment/document-understanding-solution.template‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,8 @@ Resources:
622622
"s3:GetBucketWebsite",
623623
"s3:PutBucketWebsite",
624624
"s3:PutLifecycleConfiguration",
625-
"s3:GetLifecycleConfiguration"
625+
"s3:GetLifecycleConfiguration",
626+
"s3:PutBucketOwnershipControls"
626627
]
627628
},
628629
{

‎deployment/logger/package-lock.json‎

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

‎source/lib/cdk-textract-client-stack.ts‎

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
/**********************************************************************************************************************
32
* Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. *
43
* *
@@ -12,37 +11,29 @@
1211
* and limitations under the License. *
1312
*********************************************************************************************************************/
1413

15-
import { Construct, Stack, StackProps } from "@aws-cdk/core";
16-
import s3 = require("@aws-cdk/aws-s3");
17-
import s3deployment = require("@aws-cdk/aws-s3-deployment");
14+
import { Construct, Stack, StackProps } from '@aws-cdk/core';
15+
import s3 = require('@aws-cdk/aws-s3');
16+
import s3deployment = require('@aws-cdk/aws-s3-deployment');
1817

1918
export class CdkTextractClientStack extends Stack {
20-
constructor(
21-
scope: Construct | undefined,
22-
id: string | undefined,
23-
props?: StackProps | undefined
24-
) {
25-
super(scope, id, props);
19+
constructor(scope: Construct | undefined, id: string | undefined, props?: StackProps | undefined) {
20+
super(scope, id, props);
2621

27-
const clientS3Bucket = "%%CLIENT_APP_BUCKET%%";
22+
const clientS3Bucket = '%%CLIENT_APP_BUCKET%%';
2823

29-
const resourceName = (name: string) => `${id}${name}`;
24+
const resourceName = (name: string) => `${id}${name}`;
3025

31-
const clientAppS3Bucket = s3.Bucket.fromBucketName(
32-
this,
33-
"ClientAppBucket",
34-
clientS3Bucket
35-
);
26+
const clientAppS3Bucket = s3.Bucket.fromBucketName(this, 'ClientAppBucket', clientS3Bucket);
3627

37-
// eslint-disable-next-line no-unused-vars
38-
const clientAppS3BucketDeployment = new s3deployment.BucketDeployment(
39-
this,
40-
resourceName("DeployClientAppS3Bucket"),
41-
{
42-
sources: [s3deployment.Source.asset("app/out")],
43-
destinationBucket: clientAppS3Bucket,
44-
destinationKeyPrefix: ""
45-
}
46-
);
47-
}
28+
// eslint-disable-next-line no-unused-vars
29+
const clientAppS3BucketDeployment = new s3deployment.BucketDeployment(
30+
this,
31+
resourceName('DeployClientAppS3Bucket'),
32+
{
33+
sources: [s3deployment.Source.asset('app/out')],
34+
destinationBucket: clientAppS3Bucket,
35+
destinationKeyPrefix: ''
36+
}
37+
);
38+
}
4839
}

‎source/lib/cdk-textract-stack.ts‎

Lines changed: 1595 additions & 1530 deletions
Large diffs are not rendered by default.

‎source/package-lock.json‎

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

‎source/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"@types/node": "^18.6.1",
7070
"aws-amplify": "^4.3.28",
7171
"aws-cdk": "1.158.0",
72-
"aws-sdk": "^2.1182.0",
72+
"aws-sdk": "^2.1354.0",
7373
"classnames": "^2.3.1",
7474
"date-fns": "^1.30.1",
7575
"dotenv": "^16.0.1",

‎source/yarn.lock‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3219,10 +3219,10 @@ aws-cdk@1.158.0:
32193219
optionalDependencies:
32203220
fsevents "2.3.2"
32213221

3222-
aws-sdk@^2.1182.0:
3223-
version "2.1310.0"
3224-
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1310.0.tgz#7ec1aa9c4bd96f957ecc6d3d2510f3e9dd9975f9"
3225-
integrity sha512-D0m9uFUa1UVXWTe4GSyNJP4+6DXwboE2FEG/URkLoo4r9Q8LHxwNFCGkBhaoEwssREyRe2LOYS1Nag/6WyvC6Q==
3222+
aws-sdk@^2.1354.0:
3223+
version "2.1354.0"
3224+
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1354.0.tgz#26a1cf72c84a4c105caf0025621a5f04327181e4"
3225+
integrity sha512-3aDxvyuOqMB9DqJguCq6p8momdsz0JR1axwkWOOCzHA7a35+Bw+WLmqt3pWwRjR1tGIwkkZ2CvGJObYHsOuw3w==
32263226
dependencies:
32273227
buffer "4.9.2"
32283228
events "1.1.1"
@@ -3233,7 +3233,7 @@ aws-sdk@^2.1182.0:
32333233
url "0.10.3"
32343234
util "^0.12.4"
32353235
uuid "8.0.0"
3236-
xml2js "0.4.19"
3236+
xml2js "0.5.0"
32373237

32383238
axios@0.26.0:
32393239
version "0.26.0"
@@ -6176,18 +6176,18 @@ wrappy@1:
61766176
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
61776177
integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
61786178

6179-
xml2js@0.4.19:
6180-
version "0.4.19"
6181-
resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
6182-
integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==
6179+
xml2js@0.5.0:
6180+
version "0.5.0"
6181+
resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.5.0.tgz#d9440631fbb2ed800203fad106f2724f62c493b7"
6182+
integrity sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==
61836183
dependencies:
61846184
sax ">=0.6.0"
6185-
xmlbuilder "~9.0.1"
6185+
xmlbuilder "~11.0.0"
61866186

6187-
xmlbuilder@~9.0.1:
6188-
version "9.0.7"
6189-
resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
6190-
integrity sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ==
6187+
xmlbuilder@~11.0.0:
6188+
version "11.0.1"
6189+
resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
6190+
integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
61916191

61926192
yallist@^4.0.0:
61936193
version "4.0.0"

0 commit comments

Comments
 (0)
This repository has been archived.