Skip to content

Commit f6ac528

Browse files
authored
Merge branch 'master' into fix-baremetal-doc-f
2 parents b2d0939 + 89935f1 commit f6ac528

File tree

48 files changed

+27140
-20012
lines changed

Some content is hidden

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

48 files changed

+27140
-20012
lines changed

docs/data-sources/lb_routes.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,5 @@ In addition to all arguments above, the following attributes are exported:
4040
- `update_at` - The date on which the route was last updated (RFC 3339 format).
4141
- `match_subdomains` - If true, all subdomains will match.
4242
- `match_sni` - Server Name Indication TLS extension field from an incoming connection made via an SSL/TLS transport layer.
43-
- `match_host_header` - Specifies the host of the server to which the request is being sent.
43+
- `match_host_header` - Specifies the host of the server to which the request is being sent.
44+
- `match_path_begin` - The value to match in the URL beginning path from an incoming request.

docs/resources/baremetal_server.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,9 @@ In addition to all arguments above, the following attributes are exported:
327327
- `status` - The private network status.
328328
- `created_at` - The date and time of the creation of the private network.
329329
- `updated_at` - The date and time of the last update of the private network.
330+
- `private_ips` - The list of private IPv4 and IPv6 addresses associated with the resource.
331+
- `id` - The ID of the IP address resource.
332+
- `address` - The private IP address.
330333
- `ips` - (List of) The IPs of the server.
331334
- `id` - The ID of the IP.
332335
- `address` - The address of the IP.

docs/resources/lb.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,9 @@ In addition to all arguments above, the following attributes are exported:
129129
- `private_network` - List of private networks connected to your load balancer.
130130
- `status` - The status of the private network connection.
131131
- `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the private network was created.
132+
- `private_ips` - The list of private IPv4 and IPv6 addresses associated with the resource.
133+
- `id` - The ID of the IP address resource.
134+
- `address` - The private IP address.
132135
- `organization_id` - The ID of the Organization ID the Load Balancer is associated with.
133136

134137
~> **Important:** `release_ip` will not be supported. This prevents the destruction of the IP from releasing a Load Balancer.

docs/resources/lb_route.md

Lines changed: 48 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,50 @@ resource "scaleway_lb_route" "rt01" {
7373
}
7474
```
7575

76+
### With path-begin matching for HTTP backends
77+
78+
```terraform
79+
resource "scaleway_lb_ip" "ip" {}
80+
81+
resource "scaleway_lb" "lb" {
82+
ip_id = scaleway_lb_ip.ip.id
83+
name = "my-lb"
84+
type = "lb-s"
85+
}
86+
87+
resource "scaleway_lb_backend" "app" {
88+
lb_id = scaleway_lb.lb.id
89+
forward_protocol = "http"
90+
forward_port = 80
91+
proxy_protocol = "none"
92+
}
93+
94+
resource "scaleway_lb_backend" "admin" {
95+
lb_id = scaleway_lb.lb.id
96+
forward_protocol = "http"
97+
forward_port = 8080
98+
proxy_protocol = "none"
99+
}
100+
101+
resource "scaleway_lb_frontend" "frontend" {
102+
lb_id = scaleway_lb.lb.id
103+
backend_id = scaleway_lb_backend.app.id
104+
inbound_port = 80
105+
}
106+
107+
resource "scaleway_lb_route" "admin_route" {
108+
frontend_id = scaleway_lb_frontend.frontend.id
109+
backend_id = scaleway_lb_backend.admin.id
110+
match_path_begin = "/admin"
111+
}
112+
113+
resource "scaleway_lb_route" "default_route" {
114+
frontend_id = scaleway_lb_frontend.frontend.id
115+
backend_id = scaleway_lb_backend.app.id
116+
match_path_begin = "/"
117+
}
118+
```
119+
76120
## Argument Reference
77121

78122
The following arguments are supported:
@@ -81,15 +125,17 @@ The following arguments are supported:
81125
- `frontend_id` - (Required) The ID of the frontend the route is associated with.
82126
- `match_subdomains` - (Default: `false`) If true, all subdomains will match.
83127
- `match_sni` - The Server Name Indication (SNI) value to match. Value to match in the Server Name Indication TLS extension (SNI) field from an incoming connection made via an SSL/TLS transport layer.
84-
Only one of `match_sni` and `match_host_header` should be specified.
128+
Only one of `match_sni`, `match_host_header` and `match_path_begin` should be specified.
85129

86130
~> **Important:** This field should be set for routes on TCP Load Balancers.
87131

88132
- `match_host_header` - The HTTP host header to match. Value to match in the HTTP Host request header from an incoming connection.
89-
Only one of `match_sni` and `match_host_header` should be specified.
133+
Only one of `match_sni`, `match_host_header` and `match_path_begin` should be specified.
90134

91135
~> **Important:** This field should be set for routes on HTTP Load Balancers.
92136

137+
- `match_path_begin` - The value to match in the URL beginning path from an incoming request.
138+
Only one of `match_sni`, `match_host_header` and `match_path_begin` should be specified.
93139
- `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the Load Balancer was created.
94140

95141
## Attributes Reference

docs/resources/rdb_instance.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,9 @@ are of the form `{region}/{id}`, e.g. `fr-par/11111111-1111-1111-1111-1111111111
238238
- `port` - Port in the Private Network.
239239
- `name` - Name of the endpoint.
240240
- `hostname` - Hostname of the endpoint.
241+
- `private_ip` - The private IPv4 address associated with the resource.
242+
- `id` - The ID of the IPv4 address resource.
243+
- `address` - The private IPv4 address.
241244
- `certificate` - Certificate of the Database Instance.
242245
- `organization_id` - The organization ID the Database Instance is associated with.
243246

docs/resources/redis_cluster.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,10 @@ the form `{zone}/{id}`, e.g. `fr-par-1/11111111-1111-1111-1111-111111111111`
195195
- `endpoint_id` - The ID of the endpoint.
196196
- `zone` - The zone of the Private Network.
197197

198+
- `private_ips` - The list of private IPv4 addresses associated with the resource.
199+
- `id` - The ID of the IPv4 address resource.
200+
- `address` - The private IPv4 address.
201+
198202
- `created_at` - The date and time of creation of the Redis™ cluster.
199203
- `updated_at` - The date and time of the last update of the Redis™ cluster.
200204
- `certificate` - The PEM of the certificate used by redis, only when `tls_enabled` is true

docs/resources/vpc_gateway_network.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ In addition to all arguments above, the following attributes are exported:
113113
- `created_at` - The date and time of the creation of the GatewayNetwork.
114114
- `updated_at` - The date and time of the last update of the GatewayNetwork.
115115
- `status` - The status of the Public Gateway's connection to the Private Network.
116+
- `private_ip` - The private IPv4 address associated with the resource.
117+
- `id` - The ID of the IPv4 address resource.
118+
- `address` - The private IPv4 address.
116119

117120
## Import
118121

go.mod

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ go 1.24.0
55
require (
66
github.com/alexedwards/argon2id v1.0.0
77
github.com/aws/aws-sdk-go-v2 v1.36.3
8-
github.com/aws/aws-sdk-go-v2/config v1.29.9
9-
github.com/aws/aws-sdk-go-v2/credentials v1.17.62
10-
github.com/aws/aws-sdk-go-v2/service/s3 v1.78.2
11-
github.com/aws/aws-sdk-go-v2/service/sns v1.34.2
12-
github.com/aws/aws-sdk-go-v2/service/sqs v1.38.1
8+
github.com/aws/aws-sdk-go-v2/config v1.29.14
9+
github.com/aws/aws-sdk-go-v2/credentials v1.17.67
10+
github.com/aws/aws-sdk-go-v2/service/s3 v1.79.1
11+
github.com/aws/aws-sdk-go-v2/service/sns v1.34.4
12+
github.com/aws/aws-sdk-go-v2/service/sqs v1.38.5
1313
github.com/aws/smithy-go v1.22.3
1414
github.com/docker/docker v27.5.1+incompatible
1515
github.com/dustin/go-humanize v1.0.1
1616
github.com/google/go-cmp v0.7.0
1717
github.com/hashicorp/aws-sdk-go-base v1.1.0
18-
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.63
18+
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.64
1919
github.com/hashicorp/awspolicyequivalence v1.7.0
2020
github.com/hashicorp/go-cty v1.5.0
2121
github.com/hashicorp/go-multierror v1.1.1
@@ -24,12 +24,12 @@ require (
2424
github.com/hashicorp/terraform-plugin-log v0.9.0
2525
github.com/hashicorp/terraform-plugin-mux v0.18.0
2626
github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.0
27-
github.com/nats-io/jwt/v2 v2.7.3
27+
github.com/nats-io/jwt/v2 v2.7.4
2828
github.com/nats-io/nats.go v1.38.0
2929
github.com/robfig/cron/v3 v3.0.1
30-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250424152954-b4babe8f214c
30+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250512145715-0fc65cc3636b
3131
github.com/stretchr/testify v1.10.0
32-
golang.org/x/crypto v0.36.0
32+
golang.org/x/crypto v0.37.0
3333
gopkg.in/dnaeon/go-vcr.v3 v3.2.0
3434
)
3535

@@ -55,9 +55,9 @@ require (
5555
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.7.0 // indirect
5656
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
5757
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.15 // indirect
58-
github.com/aws/aws-sdk-go-v2/service/sso v1.25.1 // indirect
59-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.1 // indirect
60-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.17 // indirect
58+
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 // indirect
59+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 // indirect
60+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19 // indirect
6161
github.com/bflad/gopaniccheck v0.1.0 // indirect
6262
github.com/bflad/tfproviderdocs v0.12.1 // indirect
6363
github.com/bflad/tfproviderlint v0.31.0 // indirect
@@ -109,7 +109,7 @@ require (
109109
github.com/moby/docker-image-spec v1.3.1 // indirect
110110
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
111111
github.com/morikuni/aec v1.0.0 // indirect
112-
github.com/nats-io/nkeys v0.4.9 // indirect
112+
github.com/nats-io/nkeys v0.4.11 // indirect
113113
github.com/nats-io/nuid v1.0.1 // indirect
114114
github.com/oklog/run v1.1.0 // indirect
115115
github.com/opencontainers/go-digest v1.0.0 // indirect
@@ -135,9 +135,9 @@ require (
135135
golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect
136136
golang.org/x/mod v0.23.0 // indirect
137137
golang.org/x/net v0.38.0 // indirect
138-
golang.org/x/sync v0.13.0 // indirect
139-
golang.org/x/sys v0.31.0 // indirect
140-
golang.org/x/text v0.24.0 // indirect
138+
golang.org/x/sync v0.14.0 // indirect
139+
golang.org/x/sys v0.32.0 // indirect
140+
golang.org/x/text v0.25.0 // indirect
141141
golang.org/x/time v0.3.0 // indirect
142142
golang.org/x/tools v0.30.0 // indirect
143143
google.golang.org/appengine v1.6.8 // indirect

0 commit comments

Comments
 (0)