Skip to content

Commit 6d3668a

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into efaLT
2 parents 0d557b4 + 5ce0a09 commit 6d3668a

9 files changed

Lines changed: 629 additions & 613 deletions

‎packages/@aws-cdk/lambda-layer-awscli/layer/Dockerfile‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,21 @@ RUN yum update -y \
1818
COPY requirements.txt ./
1919
RUN python -m pip install -r requirements.txt -t /opt/awscli
2020

21+
#
2122
# organize for self-contained usage
23+
#
24+
2225
RUN mv /opt/awscli/bin/aws /opt/awscli
2326

27+
#
2428
# cleanup
29+
#
30+
2531
RUN rm -rf \
2632
/opt/awscli/pip* \
2733
/opt/awscli/setuptools* \
28-
/opt/awscli/awscli/examples
34+
&& cd /opt/awscli/awscli/examples \
35+
&& rm -rf $(ls | grep -v global_options.rst)
2936

3037
#
3138
# Test that the CLI works

‎packages/@aws-cdk/lambda-layer-awscli/layer/requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
awscli==1.25.51
1+
awscli==1.25.58

‎packages/@aws-cdk/lambda-layer-awscli/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
"@aws-cdk/custom-resources": "0.0.0",
7777
"@aws-cdk/cdk-build-tools": "0.0.0",
7878
"@aws-cdk/integ-runner": "0.0.0",
79+
"@aws-cdk/integ-tests": "0.0.0",
7980
"@aws-cdk/pkglint": "0.0.0",
8081
"@types/jest": "^27.5.2",
8182
"jest": "^27.5.1"

packages/@aws-cdk/lambda-layer-awscli/test/awscli-layer.integ.snapshot/asset.8ad7bbf8be94e05d569da95ddb82511dcc959f25054825394cbb86028ccd1b6a.zip renamed to packages/@aws-cdk/lambda-layer-awscli/test/awscli-layer.integ.snapshot/asset.39ee629321f531fffd853b944b2d6f3fa7b5276431c9a4fd4dc681303ab15080.zip

12.9 MB
Binary file not shown.

‎packages/@aws-cdk/lambda-layer-awscli/test/awscli-layer.integ.snapshot/lambda-layer-awscli-integ-stack.assets.json‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
{
2+
"version": "20.0.0",
3+
"files": {
4+
"39ee629321f531fffd853b944b2d6f3fa7b5276431c9a4fd4dc681303ab15080": {
5+
"source": {
6+
"path": "asset.39ee629321f531fffd853b944b2d6f3fa7b5276431c9a4fd4dc681303ab15080.zip",
7+
"packaging": "file"
8+
},
9+
"destinations": {
10+
"current_account-current_region": {
11+
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12+
"objectKey": "39ee629321f531fffd853b944b2d6f3fa7b5276431c9a4fd4dc681303ab15080.zip",
13+
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
14+
}
15+
}
16+
},
17+
"5dff6208ccd5fb196bb0354fd6e47faa8431a789e6125d20386586fef761ed48": {
18+
"source": {
19+
"path": "asset.5dff6208ccd5fb196bb0354fd6e47faa8431a789e6125d20386586fef761ed48",
20+
"packaging": "zip"
21+
},
22+
"destinations": {
23+
"current_account-current_region": {
24+
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
25+
"objectKey": "5dff6208ccd5fb196bb0354fd6e47faa8431a789e6125d20386586fef761ed48.zip",
26+
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
27+
}
28+
}
29+
},
30+
"8dd02cc4ac473ca5b08800e92edaa31a1a7db4005928021d029c5363584f11b9": {
31+
"source": {
32+
"path": "asset.8dd02cc4ac473ca5b08800e92edaa31a1a7db4005928021d029c5363584f11b9",
33+
"packaging": "zip"
34+
},
35+
"destinations": {
36+
"current_account-current_region": {
37+
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
38+
"objectKey": "8dd02cc4ac473ca5b08800e92edaa31a1a7db4005928021d029c5363584f11b9.zip",
39+
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
40+
}
41+
}
42+
},
43+
"db3b79ea78a7c5870937de303240a14a1eb5bb3bd3511defffc68f678aa324f4": {
44+
"source": {
45+
"path": "lambda-layer-awscli-integ-stack.template.json",
46+
"packaging": "file"
47+
},
48+
"destinations": {
49+
"current_account-current_region": {
50+
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
51+
"objectKey": "db3b79ea78a7c5870937de303240a14a1eb5bb3bd3511defffc68f678aa324f4.json",
52+
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
53+
}
54+
}
55+
}
56+
},
57+
"dockerImages": {}
58+
}

0 commit comments

Comments
 (0)