Skip to content

Commit 8290a1b

Browse files
authored
Merge branch 'master' into actionlint
2 parents 7f353d5 + f7f0a6a commit 8290a1b

15 files changed

+2379
-1497
lines changed

.github/CODEOWNERS

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,33 @@
22
# the repo. Unless a later match takes precedence,
33
* @remyleone
44

5-
/internal/services/account/ @Codelax
6-
/internal/services/applesilicon/ @Laure-di
7-
/internal/services/baremetal/ @Laure-di
8-
/internal/services/billing/ @yfodil
9-
/internal/services/block/ @Codelax
10-
/internal/services/cockpit/ @jremy42
11-
/internal/services/container/ @Codelax
12-
/internal/services/documentdb/ @jremy42
13-
/internal/services/domain/ @yfodil
14-
/internal/services/flexibleip/ @yfodil
15-
/internal/services/function/ @Codelax
16-
/internal/services/iam/ @Codelax
17-
/internal/services/instance/ @Codelax
18-
/internal/services/iot/ @jremy42
19-
/internal/services/ipam/ @yfodil
20-
/internal/services/jobs/ @Codelax
21-
/internal/services/k8s/ @Mia-Cross
22-
/internal/services/lb/ @yfodil
23-
/internal/services/marketplace/ @Codelax
24-
/internal/services/mnq/ @Codelax
25-
/internal/services/object/ @Mia-Cross
26-
/internal/services/rdb/ @jremy42
27-
/internal/services/redis/ @jremy42
28-
/internal/services/registry/ @Mia-Cross
29-
/internal/services/sdb/ @jremy42
30-
/internal/services/secret/ @Codelax
31-
/internal/services/tem/ @jremy42
32-
/internal/services/vpc/ @yfodil
33-
/internal/services/vpcgw/ @yfodil
34-
/internal/services/webhosting/ @jremy42
5+
/internal/services/account/ @scaleway/devtools-core
6+
/internal/services/applesilicon/ @scaleway/devtools-compute-foundation
7+
/internal/services/baremetal/ @scaleway/devtools-compute-foundation
8+
/internal/services/billing/ @scaleway/devtools-core
9+
/internal/services/block/ @scaleway/devtools-storage
10+
/internal/services/cockpit/ @scaleway/devtools-dms
11+
/internal/services/container/ @scaleway/devtools-compute
12+
/internal/services/documentdb/ @scaleway/devtools-dms
13+
/internal/services/domain/ @scaleway/devtools-dms
14+
/internal/services/flexibleip/ @scaleway/devtools-network
15+
/internal/services/function/ @scaleway/devtools-compute
16+
/internal/services/iam/ @scaleway/devtools-core
17+
/internal/services/instance/ @scaleway/devtools-compute
18+
/internal/services/iot/ @scaleway/devtools-dms
19+
/internal/services/ipam/ @scaleway/devtools-network
20+
/internal/services/jobs/ @scaleway/devtools-compute
21+
/internal/services/k8s/ @scaleway/devtools-compute
22+
/internal/services/lb/ @scaleway/devtools-network
23+
/internal/services/marketplace/ @scaleway/devtools-compute
24+
/internal/services/mnq/ @scaleway/devtools-dms
25+
/internal/services/object/ @scaleway/devtools-storage
26+
/internal/services/rdb/ @scaleway/devtools-dms
27+
/internal/services/redis/ @scaleway/devtools-dms
28+
/internal/services/registry/ @scaleway/devtools-compute
29+
/internal/services/sdb/ @scaleway/devtools-dms
30+
/internal/services/secret/ @scaleway/devtools-core
31+
/internal/services/tem/ @scaleway/devtools-dms
32+
/internal/services/vpc/ @scaleway/devtools-network
33+
/internal/services/vpcgw/ @scaleway/devtools-network
34+
/internal/services/webhosting/ @scaleway/devtools-dms

docs/data-sources/container.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ In addition to all arguments above, the following attributes are exported:
9393

9494
- `sandbox` - Execution environment of the container.
9595

96-
- `heath_check` - Health check configuration block of the container.
96+
- `health_check` - Health check configuration block of the container.
9797
- `http` - HTTP health check configuration.
9898
- `path` - Path to use for the HTTP health check.
9999
- `failure_threshold` - Number of consecutive health check failures before considering the container unhealthy.

docs/resources/container.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,23 +68,23 @@ The following arguments are supported:
6868

6969
- `cpu_limit` - (Optional) The amount of vCPU computing resources to allocate to each container.
7070

71-
- `timeout` - (Optional) The maximum amount of time your container can spend processing a request before being stopped.
71+
- `timeout` - (Optional) The maximum amount of time in seconds your container can spend processing a request before being stopped. Default to `300` seconds.
7272

7373
- `privacy` - (Optional) The privacy type defines the way to authenticate to your container. Please check our dedicated [section](https://www.scaleway.com/en/developers/api/serverless-containers/#protocol-9dd4c8).
7474

7575
- `registry_image` - (Optional) The registry image address (e.g., `rg.fr-par.scw.cloud/$NAMESPACE/$IMAGE`)
7676

7777
- `registry_sha256` - (Optional) The sha256 of your source registry image, changing it will re-apply the deployment. Can be any string.
7878

79-
- `max_concurrency` - (Optional) The maximum number of simultaneous requests your container can handle at the same time.
79+
- `max_concurrency` - (Deprecated) The maximum number of simultaneous requests your container can handle at the same time. Use `scaling_option.concurrent_requests_threshold` instead.
8080

8181
- `protocol` - (Optional) The communication [protocol](https://www.scaleway.com/en/developers/api/serverless-containers/#path-containers-update-an-existing-container) `http1` or `h2c`. Defaults to `http1`.
8282

8383
- `http_option` - (Optional) Allows both HTTP and HTTPS (`enabled`) or redirect HTTP to HTTPS (`redirected`). Defaults to `enabled`.
8484

8585
- `sandbox` - (Optional) Execution environment of the container.
8686

87-
- `heath_check` - (Optional) Health check configuration block of the container.
87+
- `health_check` - (Optional) Health check configuration block of the container.
8888
- `http` - HTTP health check configuration.
8989
- `path` - Path to use for the HTTP health check.
9090
- `failure_threshold` - Number of consecutive health check failures before considering the container unhealthy.

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ require (
2626
github.com/nats-io/jwt/v2 v2.7.3
2727
github.com/nats-io/nats.go v1.38.0
2828
github.com/robfig/cron/v3 v3.0.1
29-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.32.0.20250226134545-32bb2d9f1eee
29+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.32.0.20250306092204-9c7eed199df5
3030
github.com/stretchr/testify v1.10.0
3131
golang.org/x/crypto v0.33.0
3232
gopkg.in/dnaeon/go-vcr.v3 v3.2.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,8 @@ github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
296296
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
297297
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
298298
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
299-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.32.0.20250226134545-32bb2d9f1eee h1:MMM+KEDnKZ14GVt4de0hslFGYUualLHKYsvf1dCIxM4=
300-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.32.0.20250226134545-32bb2d9f1eee/go.mod h1:792k1RTU+5JeMXm35/e2Wgp71qPH/DmDoZrRc+EFZDk=
299+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.32.0.20250306092204-9c7eed199df5 h1:SxQid3QYa7GBdbdKqzTfnLRsaFJjSKPueH3duzuC1Dk=
300+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.32.0.20250306092204-9c7eed199df5/go.mod h1:792k1RTU+5JeMXm35/e2Wgp71qPH/DmDoZrRc+EFZDk=
301301
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
302302
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
303303
github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=

0 commit comments

Comments
 (0)