Skip to content

Commit a3dbb52

Browse files
authored
Merge branch 'master' into feat-monthly-apple-silicon
2 parents 2ef0531 + 14ce6b4 commit a3dbb52

File tree

72 files changed

+18932
-3989
lines changed

Some content is hidden

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

72 files changed

+18932
-3989
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

.github/workflows/actionlint.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Lint GitHub Actions workflows
2+
on: [push, pull_request]
3+
4+
jobs:
5+
actionlint:
6+
runs-on: ubuntu-latest
7+
steps:
8+
- uses: actions/checkout@v4
9+
- name: Check workflow files
10+
uses: docker://rhysd/actionlint:latest
11+
with:
12+
args: -color -ignore SC2086

.github/workflows/announce.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ jobs:
1010
steps:
1111
- name: Get tag
1212
id: get_tag
13-
run: echo ::set-output name=TAG::${GITHUB_REF/refs\/tags\//}
13+
run: echo "{TAG}=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
1414
- name: Get version
1515
id: get_version
16-
run: echo ::set-output name=VERSION::${TAG##v}
16+
run: echo "{VERSION}=${TAG##v}" >> $GITHUB_OUTPUT
1717
env:
1818
TAG: ${{ steps.get_tag.outputs.TAG }}
1919
- name: Prepare message
2020
id: get_message
21-
run: echo ::set-output name=MSG::"${{ secrets.SLACK_MESSAGE }}"
21+
run: echo "{MSG}=${{ secrets.SLACK_MESSAGE }}" >> $GITHUB_OUTPUT
2222
env:
2323
VERSION: ${{ steps.get_version.outputs.VERSION }}
2424
TAG: ${{ steps.get_tag.outputs.TAG }}
@@ -27,7 +27,7 @@ jobs:
2727
id: announce_slack
2828
run: |
2929
readarray -td' ' URL_LIST <<<$SLACK_WEBHOOKS;
30-
for WEBHOOK_URL in ${URL_LIST[@]};
30+
for WEBHOOK_URL in "${URL_LIST[@]}";
3131
do curl -X POST -H 'Content-type: application/json' \
3232
--data '{
3333
"blocks": [

.github/workflows/nightly.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
- cockpit
2121
- container
2222
- domain
23+
- edgeservices
2324
- flexibleip
2425
- function
2526
- iam

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: 5 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.
@@ -99,6 +99,8 @@ The following arguments are supported:
9999

100100
- `deploy` - (Optional) Boolean indicating whether the container is in a production environment.
101101

102+
- `local_storage_limit` - Local storage limit of the container (in MB)
103+
102104
Note that if you want to use your own configuration, you must consult our configuration [restrictions](https://www.scaleway.com/en/docs/serverless-containers/reference-content/containers-limitations/#configuration-restrictions) section.
103105

104106
## Attributes Reference
Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
---
2+
subcategory: "Edge Services"
3+
page_title: "Scaleway: scaleway_edge_services_backend_stage"
4+
---
5+
6+
# Resource: scaleway_edge_services_backend_stage
7+
8+
Creates and manages Scaleway Edge Services Backend Stages.
9+
10+
## Example Usage
11+
12+
### With object backend
13+
14+
```terraform
15+
resource "scaleway_object_bucket" "main" {
16+
name = "my-bucket-name"
17+
tags = {
18+
foo = "bar"
19+
}
20+
}
21+
22+
resource "scaleway_edge_services_pipeline" "main" {
23+
name = "my-pipeline"
24+
}
25+
26+
resource "scaleway_edge_services_backend_stage" "main" {
27+
pipeline_id = scaleway_edge_services_pipeline.main.id
28+
s3_backend_config {
29+
bucket_name = scaleway_object_bucket.main.name
30+
bucket_region = "fr-par"
31+
}
32+
}
33+
```
34+
35+
### With LB backend
36+
37+
```terraform
38+
resource "scaleway_lb" "main" {
39+
ip_ids = [scaleway_lb_ip.main.id]
40+
zone = "fr-par-1"
41+
type = "LB-S"
42+
}
43+
44+
resource "scaleway_lb_frontend" "main" {
45+
lb_id = scaleway_lb.main.id
46+
backend_id = scaleway_lb_backend.main.id
47+
name = "frontend01"
48+
inbound_port = "443"
49+
certificate_ids = [
50+
scaleway_lb_certificate.cert01.id,
51+
]
52+
}
53+
54+
resource "scaleway_edge_services_pipeline" "main" {
55+
name = "my-pipeline"
56+
}
57+
58+
resource "scaleway_edge_services_backend_stage" "main" {
59+
pipeline_id = scaleway_edge_services_pipeline.main.id
60+
lb_backend_config {
61+
lb_config {
62+
id = scaleway_lb.main.id
63+
frontend_id = scaleway_lb_frontend.id
64+
is_ssl = true
65+
zone = "fr-par-1"
66+
}
67+
}
68+
}
69+
```
70+
71+
## Argument Reference
72+
73+
- `pipeline_id` - (Required) The ID of the pipeline.
74+
- `s3_backend_config` - (Optional) The Scaleway Object Storage origin bucket (S3) linked to the backend stage.
75+
- `bucket_name` - The name of the Bucket.
76+
- `bucket_region` - The region of the Bucket.
77+
- `is_website` - Defines whether the bucket website feature is enabled.
78+
- `lb_backend_config` - (Optional) The Scaleway Load Balancer linked to the backend stage.
79+
- `lb_config` - The Load Balancer config.
80+
- `id` - The ID of the Load Balancer.
81+
- `frontend_id` - The ID of the frontend.
82+
- `is_ssl` - Defines whether the Load Balancer's frontend handles SSL connections.
83+
- `domain_name` - The Fully Qualified Domain Name (in the format subdomain.example.com) to use in HTTP requests sent towards your Load Balancer.
84+
- `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) of the Load Balancer.
85+
- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the backend stage is associated with.
86+
87+
## Attributes Reference
88+
89+
In addition to all arguments above, the following attributes are exported:
90+
91+
- `id` - The ID of the backend stage (UUID format).
92+
- `created_at` - The date and time of the creation of the backend stage.
93+
- `updated_at` - The date and time of the last update of the backend stage.
94+
95+
## Import
96+
97+
Backend stages can be imported using the `{id}`, e.g.
98+
99+
```bash
100+
$ terraform import scaleway_edge_services_backend_stage.basic 11111111-1111-1111-1111-111111111111
101+
```
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
---
2+
subcategory: "Edge Services"
3+
page_title: "Scaleway: scaleway_edge_services_cache_stage"
4+
---
5+
6+
# Resource: scaleway_edge_services_cache_stage
7+
8+
Creates and manages Scaleway Edge Services Cache Stages.
9+
10+
## Example Usage
11+
12+
### Basic
13+
14+
```terraform
15+
resource "scaleway_edge_services_cache_stage" "main" {
16+
pipeline_id = scaleway_edge_services_pipeline.main.id
17+
backend_stage_id = scaleway_edge_services_backend_stage.main.id
18+
}
19+
```
20+
21+
### Purge request
22+
23+
```terraform
24+
resource "scaleway_edge_services_cache_stage" "main" {
25+
pipeline_id = scaleway_edge_services_pipeline.main.id
26+
backend_stage_id = scaleway_edge_services_backend_stage.main.id
27+
28+
purge {
29+
pipeline_id = scaleway_edge_services_pipeline.main.id
30+
all = true
31+
}
32+
}
33+
```
34+
35+
## Argument Reference
36+
37+
- `pipeline_id` - (Required) The ID of the pipeline.
38+
- `backend_stage_id` - (Optional) The backend stage ID the cache stage will be linked to.
39+
- `fallback_ttl` - (Optional) The Time To Live (TTL) in seconds. Defines how long content is cached.
40+
- `refresh_cache` - (Optional) Trigger a refresh of the cache by changing this field's value.
41+
- `purge_requests` - (Optional) The Scaleway Object Storage origin bucket (S3) linked to the backend stage.
42+
- `pipeline_id` - The pipeline ID in which the purge request will be created.
43+
- `assets` - The list of asserts to purge.
44+
- `all` - Defines whether to purge all content.
45+
- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the cache stage is associated with.
46+
47+
## Attributes Reference
48+
49+
In addition to all arguments above, the following attributes are exported:
50+
51+
- `id` - The ID of the cache stage (UUID format).
52+
- `created_at` - The date and time of the creation of the cache stage.
53+
- `updated_at` - The date and time of the last update of the cache stage.
54+
55+
## Import
56+
57+
Cache stages can be imported using the `{id}`, e.g.
58+
59+
```bash
60+
$ terraform import scaleway_edge_services_cache_stage.basic 11111111-1111-1111-1111-111111111111
61+
```
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
---
2+
subcategory: "Edge Services"
3+
page_title: "Scaleway: scaleway_edge_services_dns_stage"
4+
---
5+
6+
# Resource: scaleway_edge_services_dns_stage
7+
8+
Creates and manages Scaleway Edge Services DNS Stages.
9+
10+
## Example Usage
11+
12+
### Basic
13+
14+
```terraform
15+
resource "scaleway_edge_services_dns_stage" "main" {
16+
pipeline_id = scaleway_edge_services_pipeline.main.id
17+
fqdns = ["subdomain.example.com"]
18+
}
19+
```
20+
21+
## Argument Reference
22+
23+
- `pipeline_id` - (Required) The ID of the pipeline.
24+
- `backend_stage_id` - (Optional) The backend stage ID the DNS stage will be linked to.
25+
- `tls_stage_id` - (Optional) The TLS stage ID the DNS stage will be linked to.
26+
- `cache_stage_id` - (Optional) The cache stage ID the DNS stage will be linked to.
27+
- `fqdns` - (Optional) Fully Qualified Domain Name (in the format subdomain.example.com) to attach to the stage.
28+
- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the DNS stage is associated with.
29+
30+
## Attributes Reference
31+
32+
In addition to all arguments above, the following attributes are exported:
33+
34+
- `id` - The ID of the DNS stage (UUID format).
35+
- `type` - The type of the stage.
36+
- `created_at` - The date and time of the creation of the DNS stage.
37+
- `updated_at` - The date and time of the last update of the DNS stage.
38+
39+
## Import
40+
41+
DNS stages can be imported using the `{id}`, e.g.
42+
43+
```bash
44+
$ terraform import scaleway_edge_services_dns_stage.basic 11111111-1111-1111-1111-111111111111
45+
```

0 commit comments

Comments
 (0)