Skip to content

Commit a65ec49

Browse files
authored
Merge branch 'aarondfrancis:main' into feature/make-function-command
2 parents e4180a6 + e30df1a commit a65ec49

Some content is hidden

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

63 files changed

+215
-209
lines changed

.github/workflows/tests.yml

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,23 @@ on:
44
push:
55
branches:
66
- main
7-
87
pull_request:
9-
types: [ opened, synchronize, reopened ]
8+
types:
9+
- opened
10+
- synchronize
11+
- reopened
1012

1113
jobs:
1214
test:
1315
runs-on: ubuntu-latest
16+
1417
strategy:
1518
fail-fast: false
1619
matrix:
17-
php: ['8.1', '8.2', '8.3' ]
18-
laravel: [ '8.*', '9.*', '10.*', '11.*' ]
19-
guzzle: [ '6.*', '7.*' ]
20-
dependency-version: [ prefer-lowest, prefer-stable ]
20+
php: ['8.1', '8.2', '8.3']
21+
laravel: ['8.*', '9.*', '10.*', '11.*', '12.*']
22+
guzzle: ['6.*', '7.*']
23+
dependency-version: [prefer-lowest, prefer-stable]
2124
include:
2225
- laravel: 8.*
2326
testbench: 6.*
@@ -27,8 +30,10 @@ jobs:
2730
testbench: 8.*
2831
- laravel: 11.*
2932
testbench: 9.*
30-
33+
- laravel: 12.*
34+
testbench: 10.*
3135
exclude:
36+
# Laravel 8 exclusions
3237
- laravel: 8.*
3338
php: 8.1
3439
dependency-version: prefer-lowest
@@ -39,23 +44,31 @@ jobs:
3944
php: 8.3
4045
dependency-version: prefer-lowest
4146

47+
# Laravel 9 exclusions
4248
- laravel: 9.*
4349
php: 8.2
4450
dependency-version: prefer-lowest
4551
- laravel: 9.*
4652
php: 8.3
4753
dependency-version: prefer-lowest
4854

55+
# Laravel 11 exclusions
4956
- laravel: 11.*
5057
php: 8.1
5158

52-
# Guzzle restrictions
59+
# Laravel 12 exclusions
60+
- laravel: 12.*
61+
php: 8.1
62+
63+
# Guzzle exclusions
5364
- laravel: 9.*
5465
guzzle: 6.*
5566
- laravel: 10.*
5667
guzzle: 6.*
5768
- laravel: 11.*
5869
guzzle: 6.*
70+
- laravel: 12.*
71+
guzzle: 6.*
5972

6073
name: P${{ matrix.php }} / L${{ matrix.laravel }} / G${{ matrix.guzzle }} / ${{ matrix.dependency-version }}
6174

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,24 @@ You can write functions in any of the following runtimes and execute them straig
2222

2323
- Node.js 20
2424
- Node.js 18
25-
- Node.js 16
2625
- Python 3.12
2726
- Python 3.11
2827
- Python 3.10
2928
- Python 3.9
30-
- Python 3.8
3129
- Java 21
3230
- Java 17
3331
- Java 11
3432
- Java 8
35-
- .NET 7
33+
- .NET 8
3634
- .NET 6
35+
- Ruby 3.3
3736
- Ruby 3.2
3837
- OS-only runtime (Amazon Linux 2023)
3938
- OS-only runtime (Amazon Linux 2)
4039

4140
Any runtime that [Lambda supports](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html), you can use!
4241

43-
Sidecar is maintained by [Aaron Francis](https://twitter.com/aarondfrancis), go follow me on Twitter!
42+
Sidecar is maintained by [Aaron Francis](https://twitter.com/aarondfrancis), go follow me on Twitter!
4443

4544
### What It Looks Like
4645

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
],
1212
"require": {
1313
"php": "^8.1",
14-
"illuminate/filesystem": "^8|^9|^10|^11",
15-
"illuminate/console": "^8|^9|^10|^11",
16-
"illuminate/support": "^8|^9|^10|^11",
14+
"illuminate/filesystem": "^8|^9|^10|^11|^12.0",
15+
"illuminate/console": "^8|^9|^10|^11|^12.0",
16+
"illuminate/support": "^8|^9|^10|^11|^12.0",
1717
"maennchen/zipstream-php": "^3.1",
1818
"guzzlehttp/guzzle": "^6.5.8|^7.2",
1919
"aws/aws-sdk-php": "^3.216.1"
2020
},
2121
"require-dev": {
22-
"orchestra/testbench": "^5|^6|^7|^8|^9",
22+
"orchestra/testbench": "^5|^6|^7|^8|^9|^10.0",
2323
"mockery/mockery": "^1.3.3",
2424
"phpunit/phpunit": ">=8.5.23|^9|^10"
2525
},

docs/functions/customization.md

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,17 @@ Lambda supports multiple languages through the use of runtimes. You can choose a
99

1010
- Node.js 20: `nodejs20.x`
1111
- Node.js 18: `nodejs18.x`
12-
- Node.js 16: `nodejs16.x`
1312
- Python 3.12: `python3.12`
1413
- Python 3.11: `python3.11`
1514
- Python 3.10: `python3.10`
1615
- Python 3.9: `python3.9`
17-
- Python 3.8: `python3.8`
1816
- Java 21: `java21`
1917
- Java 17: `java17`
2018
- Java 11: `java11`
2119
- Java 8: `java8.al2`
22-
- .NET 7: `dotnet7`
20+
- .NET 8: `dotnet8`
2321
- .NET 6: `dotnet6`
22+
- Ruby 3.3: `ruby3.3`
2423
- Ruby 3.2: `ruby3.2`
2524
- OS-only runtime (Amazon Linux 2023): `provided.al2023`
2625
- OS-only runtime (Amazon Linux 2): `provided.al2`
@@ -229,6 +228,26 @@ You likely won't need to change this, but if you do, *you must include the envir
229228
}
230229
```
231230

231+
### Description
232+
233+
By default, Sidecar will generate a description for your Lambda function based on the deployment environment and the name of your app.
234+
235+
You likely won't need to customise it, however, you can if you want, although it has no direct impact.
236+
237+
```php
238+
class ExampleFunction extends LambdaFunction
239+
{
240+
public function description()
241+
{
242+
return sprintf('%s [%s]: Sidecar function `%s`.', ...[
243+
config('sidecar.app_name'),
244+
Sidecar::getEnvironment(),
245+
static::class,
246+
]);
247+
}
248+
}
249+
```
250+
232251
## Tags
233252

234253
A key-value array of strings of tags to be applied to your function, this can be used to organize your functions by owner, project or departement.

docs/overview.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ You can write functions in any of the following runtimes and execute them straig
1919
- Java 17
2020
- Java 11
2121
- Java 8
22+
- .NET 8
2223
- .NET 7
2324
- .NET 6
25+
- Ruby 3.3
2426
- Ruby 3.2
2527
- OS-only runtime (Amazon Linux 2023)
2628
- OS-only runtime (Amazon Linux 2)

phpunit.xml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</testsuite>
1111
</testsuites>
1212
<php>
13-
13+
<server name="APP_ENV" value="testing"/>
1414
</php>
1515
<source>
1616
<include>
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* @author Aaron Francis <aarondfrancis@gmail.com|https://twitter.com/aarondfrancis>
45
*/
@@ -7,6 +8,4 @@
78

89
use Aws\CloudWatchLogs\CloudWatchLogsClient as BaseClient;
910

10-
class CloudWatchLogsClient extends BaseClient
11-
{
12-
}
11+
class CloudWatchLogsClient extends BaseClient {}

src/Clients/LambdaClient.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* @author Aaron Francis <aarondfrancis@gmail.com|https://twitter.com/aarondfrancis>
45
*/

src/Clients/S3Client.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@
44

55
use Aws\S3\S3Client as BaseClient;
66

7-
class S3Client extends BaseClient
8-
{
9-
}
7+
class S3Client extends BaseClient {}

src/Commands/Actions/BaseAction.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* @author Aaron Francis <aarondfrancis@gmail.com|https://twitter.com/aarondfrancis>
45
*/

0 commit comments

Comments
 (0)