Skip to content

Commit 473ac5d

Browse files
Merge pull request #81 from shelfio/feature/PREVIEWAPI-476-use-previous-layer-name-for-x64-fix-version-detection-to-update-readme
PREVIEWAPI-476 Use previous layer name for x64, fix version detection to update readme
2 parents 5f784d3 + 985848b commit 473ac5d

File tree

4 files changed

+43
-43
lines changed

4 files changed

+43
-43
lines changed

.github/workflows/layers_dispatch.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
7878
{
7979
X64_VERSION=$(aws lambda publish-layer-version \
80-
--layer-name chrome-aws-lambda-x64 \
80+
--layer-name chrome-aws-lambda \
8181
--content S3Bucket=$BUCKET_NAME,S3Key=${{ env.X64_FILENAME }} \
8282
--region $REGION \
8383
--compatible-architectures x86_64 \
@@ -87,7 +87,7 @@ jobs:
8787
8888
aws lambda add-layer-version-permission \
8989
--region "$REGION" \
90-
--layer-name chrome-aws-lambda-x64 \
90+
--layer-name chrome-aws-lambda \
9191
--statement-id sid1 \
9292
--action lambda:GetLayerVersion \
9393
--principal '*' \

.github/workflows/update_readme.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ jobs:
6666
sed -i -e "s|Has Chromium v[0-9\.]*|Has Chromium $TAG_VERSION|g" readme.md
6767
6868
for REGION in ${{ env.AWS_REGIONS }}; do
69-
X64_VERSION=$(aws lambda list-layer-versions --layer-name chrome-aws-lambda-x64 --region $REGION --query 'LayerVersions[0].Version' --output text 2>/dev/null || echo "1")
70-
ARM64_VERSION=$(aws lambda list-layer-versions --layer-name chrome-aws-lambda-arm64 --region $REGION --query 'LayerVersions[0].Version' --output text 2>/dev/null || echo "1")
69+
X64_VERSION=$(aws lambda list-layer-versions --layer-name chrome-aws-lambda --region $REGION --query 'LayerVersions[0].LayerVersionArn' --output text | grep -oE '[0-9]+$')
70+
ARM64_VERSION=$(aws lambda list-layer-versions --layer-name chrome-aws-lambda-arm64 --region $REGION --query 'LayerVersions[0].LayerVersionArn' --output text | grep -oE '[0-9]+$')
7171
72-
X64_ARN="$ARN_BASE$REGION:$ACCOUNT_ID:layer:chrome-aws-lambda-x64:$X64_VERSION"
72+
X64_ARN="$ARN_BASE$REGION:$ACCOUNT_ID:layer:chrome-aws-lambda:$X64_VERSION"
7373
ARM64_ARN="$ARN_BASE$REGION:$ACCOUNT_ID:layer:chrome-aws-lambda-arm64:$ARM64_VERSION"
7474
75-
sed -i -e "s|arn:aws:lambda:$REGION:[0-9]*:layer:chrome-aws-lambda-x64:[0-9]*|$X64_ARN|g" readme.md
75+
sed -i -e "s|arn:aws:lambda:$REGION:[0-9]*:layer:chrome-aws-lambda:[0-9]*|$X64_ARN|g" readme.md
7676
sed -i -e "s|arn:aws:lambda:$REGION:[0-9]*:layer:chrome-aws-lambda-arm64:[0-9]*|$ARM64_ARN|g" readme.md
7777
done
7878

.tag_version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v143.0.4
1+
v143.0.0

readme.md

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ Click on Layers and choose "Add a layer", and "Provide a layer version ARN" and
1212

1313
**For x86_64 (Intel/AMD)**:
1414
```
15-
arn:aws:lambda:us-east-1:764866452798:layer:chrome-aws-lambda-x64:2None
15+
arn:aws:lambda:us-east-1:764866452798:layer:chrome-aws-lambda:2
1616
```
1717

1818
**For arm64 (Graviton2)**:
1919
```
20-
arn:aws:lambda:us-east-1:764866452798:layer:chrome-aws-lambda-arm64:2None
20+
arn:aws:lambda:us-east-1:764866452798:layer:chrome-aws-lambda-arm64:2
2121
```
2222

2323
When importing the module within lambda, make sure you import `@sparticuz/chromium` not `chrome-aws-lambda`
@@ -41,14 +41,14 @@ const chromium = require('@sparticuz/chromium');
4141
**For x86_64**:
4242
```ts
4343
layers: [LayerVersion.fromLayerVersionArn(this, 'chromium-lambda-layer',
44-
'arn:aws:lambda:us-east-1:764866452798:layer:chrome-aws-lambda-x64:2None'
44+
'arn:aws:lambda:us-east-1:764866452798:layer:chrome-aws-lambda:2'
4545
)]
4646
```
4747

4848
**For arm64**:
4949
```ts
5050
layers: [LayerVersion.fromLayerVersionArn(this, 'chromium-lambda-layer',
51-
'arn:aws:lambda:us-east-1:764866452798:layer:chrome-aws-lambda-arm64:2None'
51+
'arn:aws:lambda:us-east-1:764866452798:layer:chrome-aws-lambda-arm64:2'
5252
)]
5353
```
5454

@@ -59,41 +59,41 @@ You can just use a regular ES6 or CommonJS import statement for `@sparticuz/chro
5959

6060
### x86_64 (Intel/AMD)
6161

62-
* ap-northeast-1: `arn:aws:lambda:ap-northeast-1:764866452798:layer:chrome-aws-lambda-x64:2None`
63-
* ap-northeast-2: `arn:aws:lambda:ap-northeast-2:764866452798:layer:chrome-aws-lambda-x64:2None`
64-
* ap-south-1: `arn:aws:lambda:ap-south-1:764866452798:layer:chrome-aws-lambda-x64:2None`
65-
* ap-southeast-1: `arn:aws:lambda:ap-southeast-1:764866452798:layer:chrome-aws-lambda-x64:2None`
66-
* ap-southeast-2: `arn:aws:lambda:ap-southeast-2:764866452798:layer:chrome-aws-lambda-x64:2None`
67-
* ca-central-1: `arn:aws:lambda:ca-central-1:764866452798:layer:chrome-aws-lambda-x64:2None`
68-
* eu-north-1: `arn:aws:lambda:eu-north-1:764866452798:layer:chrome-aws-lambda-x64:2None`
69-
* eu-central-1: `arn:aws:lambda:eu-central-1:764866452798:layer:chrome-aws-lambda-x64:2None`
70-
* eu-west-1: `arn:aws:lambda:eu-west-1:764866452798:layer:chrome-aws-lambda-x64:2None`
71-
* eu-west-2: `arn:aws:lambda:eu-west-2:764866452798:layer:chrome-aws-lambda-x64:2None`
72-
* eu-west-3: `arn:aws:lambda:eu-west-3:764866452798:layer:chrome-aws-lambda-x64:2None`
73-
* sa-east-1: `arn:aws:lambda:sa-east-1:764866452798:layer:chrome-aws-lambda-x64:2None`
74-
* us-east-1: `arn:aws:lambda:us-east-1:764866452798:layer:chrome-aws-lambda-x64:2None`
75-
* us-east-2: `arn:aws:lambda:us-east-2:764866452798:layer:chrome-aws-lambda-x64:2None`
76-
* us-west-1: `arn:aws:lambda:us-west-1:764866452798:layer:chrome-aws-lambda-x64:2None`
77-
* us-west-2: `arn:aws:lambda:us-west-2:764866452798:layer:chrome-aws-lambda-x64:2None`
62+
* ap-northeast-1: `arn:aws:lambda:ap-northeast-1:764866452798:layer:chrome-aws-lambda:2`
63+
* ap-northeast-2: `arn:aws:lambda:ap-northeast-2:764866452798:layer:chrome-aws-lambda:2`
64+
* ap-south-1: `arn:aws:lambda:ap-south-1:764866452798:layer:chrome-aws-lambda:2`
65+
* ap-southeast-1: `arn:aws:lambda:ap-southeast-1:764866452798:layer:chrome-aws-lambda:2`
66+
* ap-southeast-2: `arn:aws:lambda:ap-southeast-2:764866452798:layer:chrome-aws-lambda:2`
67+
* ca-central-1: `arn:aws:lambda:ca-central-1:764866452798:layer:chrome-aws-lambda:2`
68+
* eu-north-1: `arn:aws:lambda:eu-north-1:764866452798:layer:chrome-aws-lambda:2`
69+
* eu-central-1: `arn:aws:lambda:eu-central-1:764866452798:layer:chrome-aws-lambda:2`
70+
* eu-west-1: `arn:aws:lambda:eu-west-1:764866452798:layer:chrome-aws-lambda:2`
71+
* eu-west-2: `arn:aws:lambda:eu-west-2:764866452798:layer:chrome-aws-lambda:2`
72+
* eu-west-3: `arn:aws:lambda:eu-west-3:764866452798:layer:chrome-aws-lambda:2`
73+
* sa-east-1: `arn:aws:lambda:sa-east-1:764866452798:layer:chrome-aws-lambda:2`
74+
* us-east-1: `arn:aws:lambda:us-east-1:764866452798:layer:chrome-aws-lambda:2`
75+
* us-east-2: `arn:aws:lambda:us-east-2:764866452798:layer:chrome-aws-lambda:2`
76+
* us-west-1: `arn:aws:lambda:us-west-1:764866452798:layer:chrome-aws-lambda:2`
77+
* us-west-2: `arn:aws:lambda:us-west-2:764866452798:layer:chrome-aws-lambda:2`
7878

7979
### arm64 (Graviton2)
8080

81-
* ap-northeast-1: `arn:aws:lambda:ap-northeast-1:764866452798:layer:chrome-aws-lambda-arm64:2None`
82-
* ap-northeast-2: `arn:aws:lambda:ap-northeast-2:764866452798:layer:chrome-aws-lambda-arm64:2None`
83-
* ap-south-1: `arn:aws:lambda:ap-south-1:764866452798:layer:chrome-aws-lambda-arm64:2None`
84-
* ap-southeast-1: `arn:aws:lambda:ap-southeast-1:764866452798:layer:chrome-aws-lambda-arm64:2None`
85-
* ap-southeast-2: `arn:aws:lambda:ap-southeast-2:764866452798:layer:chrome-aws-lambda-arm64:2None`
86-
* ca-central-1: `arn:aws:lambda:ca-central-1:764866452798:layer:chrome-aws-lambda-arm64:2None`
87-
* eu-north-1: `arn:aws:lambda:eu-north-1:764866452798:layer:chrome-aws-lambda-arm64:2None`
88-
* eu-central-1: `arn:aws:lambda:eu-central-1:764866452798:layer:chrome-aws-lambda-arm64:2None`
89-
* eu-west-1: `arn:aws:lambda:eu-west-1:764866452798:layer:chrome-aws-lambda-arm64:2None`
90-
* eu-west-2: `arn:aws:lambda:eu-west-2:764866452798:layer:chrome-aws-lambda-arm64:2None`
91-
* eu-west-3: `arn:aws:lambda:eu-west-3:764866452798:layer:chrome-aws-lambda-arm64:2None`
92-
* sa-east-1: `arn:aws:lambda:sa-east-1:764866452798:layer:chrome-aws-lambda-arm64:2None`
93-
* us-east-1: `arn:aws:lambda:us-east-1:764866452798:layer:chrome-aws-lambda-arm64:2None`
94-
* us-east-2: `arn:aws:lambda:us-east-2:764866452798:layer:chrome-aws-lambda-arm64:2None`
95-
* us-west-1: `arn:aws:lambda:us-west-1:764866452798:layer:chrome-aws-lambda-arm64:2None`
96-
* us-west-2: `arn:aws:lambda:us-west-2:764866452798:layer:chrome-aws-lambda-arm64:2None`
81+
* ap-northeast-1: `arn:aws:lambda:ap-northeast-1:764866452798:layer:chrome-aws-lambda-arm64:2`
82+
* ap-northeast-2: `arn:aws:lambda:ap-northeast-2:764866452798:layer:chrome-aws-lambda-arm64:2`
83+
* ap-south-1: `arn:aws:lambda:ap-south-1:764866452798:layer:chrome-aws-lambda-arm64:2`
84+
* ap-southeast-1: `arn:aws:lambda:ap-southeast-1:764866452798:layer:chrome-aws-lambda-arm64:2`
85+
* ap-southeast-2: `arn:aws:lambda:ap-southeast-2:764866452798:layer:chrome-aws-lambda-arm64:2`
86+
* ca-central-1: `arn:aws:lambda:ca-central-1:764866452798:layer:chrome-aws-lambda-arm64:2`
87+
* eu-north-1: `arn:aws:lambda:eu-north-1:764866452798:layer:chrome-aws-lambda-arm64:2`
88+
* eu-central-1: `arn:aws:lambda:eu-central-1:764866452798:layer:chrome-aws-lambda-arm64:2`
89+
* eu-west-1: `arn:aws:lambda:eu-west-1:764866452798:layer:chrome-aws-lambda-arm64:2`
90+
* eu-west-2: `arn:aws:lambda:eu-west-2:764866452798:layer:chrome-aws-lambda-arm64:2`
91+
* eu-west-3: `arn:aws:lambda:eu-west-3:764866452798:layer:chrome-aws-lambda-arm64:2`
92+
* sa-east-1: `arn:aws:lambda:sa-east-1:764866452798:layer:chrome-aws-lambda-arm64:2`
93+
* us-east-1: `arn:aws:lambda:us-east-1:764866452798:layer:chrome-aws-lambda-arm64:2`
94+
* us-east-2: `arn:aws:lambda:us-east-2:764866452798:layer:chrome-aws-lambda-arm64:2`
95+
* us-west-1: `arn:aws:lambda:us-west-1:764866452798:layer:chrome-aws-lambda-arm64:2`
96+
* us-west-2: `arn:aws:lambda:us-west-2:764866452798:layer:chrome-aws-lambda-arm64:2`
9797

9898
## License
9999

0 commit comments

Comments
 (0)