Skip to content

Commit 131364c

Browse files
scaleway-botscaleway-bot
authored
Merge branch 'scaleway:master' into master
2 parents abbe2f0 + c907dc0 commit 131364c

14 files changed

+2449
-5042
lines changed

‎cmd/scw/testdata/test-all-usage-lbacl-create-usage.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ ARGS:
1313
[action.redirect.target] Redirect target. For a location redirect, you can use a URL e.g. `https://scaleway.com`. Using a scheme name (e.g. `https`, `http`, `ftp`, `git`) will replace the request's original scheme. This can be useful to implement HTTP to HTTPS redirects. Valid placeholders that can be used in a `location` redirect to preserve parts of the original request in the redirection URL are \{\{host\}\}, \{\{query\}\}, \{\{path\}\} and \{\{scheme\}\}
1414
[action.redirect.code] HTTP redirect code to use. Valid values are 301, 302, 303, 307 and 308. Default value is 302
1515
[match.ip-subnet.{index}] List of IPs or CIDR v4/v6 addresses to filter for from the client side
16+
[match.ips-edge-services] Defines whether Edge Services IPs should be matched
1617
[match.http-filter] Type of HTTP filter to match. Extracts the request's URL path, which starts at the first slash and ends before the question mark (without the host part). Defines where to filter for the http_filter_value. Only supported for HTTP backends (acl_http_filter_none | path_begin | path_end | regex | http_header_match)
1718
[match.http-filter-value.{index}] List of values to filter for
1819
[match.http-filter-option] Name of the HTTP header to filter on if `http_header_match` was selected in `http_filter`

‎cmd/scw/testdata/test-all-usage-lbacl-set-usage.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ ARGS:
1212
[acls.{index}.action.redirect.target] Redirect target. For a location redirect, you can use a URL e.g. `https://scaleway.com`. Using a scheme name (e.g. `https`, `http`, `ftp`, `git`) will replace the request's original scheme. This can be useful to implement HTTP to HTTPS redirects. Valid placeholders that can be used in a `location` redirect to preserve parts of the original request in the redirection URL are \{\{host\}\}, \{\{query\}\}, \{\{path\}\} and \{\{scheme\}\}
1313
[acls.{index}.action.redirect.code] HTTP redirect code to use. Valid values are 301, 302, 303, 307 and 308. Default value is 302
1414
[acls.{index}.match.ip-subnet.{index}] List of IPs or CIDR v4/v6 addresses to filter for from the client side
15+
[acls.{index}.match.ips-edge-services] Defines whether Edge Services IPs should be matched
1516
[acls.{index}.match.http-filter] Type of HTTP filter to match. Extracts the request's URL path, which starts at the first slash and ends before the question mark (without the host part). Defines where to filter for the http_filter_value. Only supported for HTTP backends (acl_http_filter_none | path_begin | path_end | regex | http_header_match)
1617
[acls.{index}.match.http-filter-value.{index}] List of values to filter for
1718
[acls.{index}.match.http-filter-option] Name of the HTTP header to filter on if `http_header_match` was selected in `http_filter`

‎cmd/scw/testdata/test-all-usage-lbacl-update-usage.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ ARGS:
1313
[action.redirect.target] Redirect target. For a location redirect, you can use a URL e.g. `https://scaleway.com`. Using a scheme name (e.g. `https`, `http`, `ftp`, `git`) will replace the request's original scheme. This can be useful to implement HTTP to HTTPS redirects. Valid placeholders that can be used in a `location` redirect to preserve parts of the original request in the redirection URL are \{\{host\}\}, \{\{query\}\}, \{\{path\}\} and \{\{scheme\}\}
1414
[action.redirect.code] HTTP redirect code to use. Valid values are 301, 302, 303, 307 and 308. Default value is 302
1515
[match.ip-subnet.{index}] List of IPs or CIDR v4/v6 addresses to filter for from the client side
16+
[match.ips-edge-services] Defines whether Edge Services IPs should be matched
1617
[match.http-filter] Type of HTTP filter to match. Extracts the request's URL path, which starts at the first slash and ends before the question mark (without the host part). Defines where to filter for the http_filter_value. Only supported for HTTP backends (acl_http_filter_none | path_begin | path_end | regex | http_header_match)
1718
[match.http-filter-value.{index}] List of values to filter for
1819
[match.http-filter-option] Name of the HTTP header to filter on if `http_header_match` was selected in `http_filter`

‎docs/commands/lb.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ scw lb acl create [arg=value ...]
9696
| action.redirect.target | | Redirect target. For a location redirect, you can use a URL e.g. `https://scaleway.com`. Using a scheme name (e.g. `https`, `http`, `ftp`, `git`) will replace the request's original scheme. This can be useful to implement HTTP to HTTPS redirects. Valid placeholders that can be used in a `location` redirect to preserve parts of the original request in the redirection URL are \{\{host\}\}, \{\{query\}\}, \{\{path\}\} and \{\{scheme\}\} |
9797
| action.redirect.code | | HTTP redirect code to use. Valid values are 301, 302, 303, 307 and 308. Default value is 302 |
9898
| match.ip-subnet.{index} | | List of IPs or CIDR v4/v6 addresses to filter for from the client side |
99+
| match.ips-edge-services | | Defines whether Edge Services IPs should be matched |
99100
| match.http-filter | One of: `acl_http_filter_none`, `path_begin`, `path_end`, `regex`, `http_header_match` | Type of HTTP filter to match. Extracts the request's URL path, which starts at the first slash and ends before the question mark (without the host part). Defines where to filter for the http_filter_value. Only supported for HTTP backends |
100101
| match.http-filter-value.{index} | | List of values to filter for |
101102
| match.http-filter-option | | Name of the HTTP header to filter on if `http_header_match` was selected in `http_filter` |
@@ -189,6 +190,7 @@ scw lb acl set [arg=value ...]
189190
| acls.{index}.action.redirect.target | | Redirect target. For a location redirect, you can use a URL e.g. `https://scaleway.com`. Using a scheme name (e.g. `https`, `http`, `ftp`, `git`) will replace the request's original scheme. This can be useful to implement HTTP to HTTPS redirects. Valid placeholders that can be used in a `location` redirect to preserve parts of the original request in the redirection URL are \{\{host\}\}, \{\{query\}\}, \{\{path\}\} and \{\{scheme\}\} |
190191
| acls.{index}.action.redirect.code | | HTTP redirect code to use. Valid values are 301, 302, 303, 307 and 308. Default value is 302 |
191192
| acls.{index}.match.ip-subnet.{index} | | List of IPs or CIDR v4/v6 addresses to filter for from the client side |
193+
| acls.{index}.match.ips-edge-services | | Defines whether Edge Services IPs should be matched |
192194
| acls.{index}.match.http-filter | One of: `acl_http_filter_none`, `path_begin`, `path_end`, `regex`, `http_header_match` | Type of HTTP filter to match. Extracts the request's URL path, which starts at the first slash and ends before the question mark (without the host part). Defines where to filter for the http_filter_value. Only supported for HTTP backends |
193195
| acls.{index}.match.http-filter-value.{index} | | List of values to filter for |
194196
| acls.{index}.match.http-filter-option | | Name of the HTTP header to filter on if `http_header_match` was selected in `http_filter` |
@@ -222,6 +224,7 @@ scw lb acl update <acl-id ...> [arg=value ...]
222224
| action.redirect.target | | Redirect target. For a location redirect, you can use a URL e.g. `https://scaleway.com`. Using a scheme name (e.g. `https`, `http`, `ftp`, `git`) will replace the request's original scheme. This can be useful to implement HTTP to HTTPS redirects. Valid placeholders that can be used in a `location` redirect to preserve parts of the original request in the redirection URL are \{\{host\}\}, \{\{query\}\}, \{\{path\}\} and \{\{scheme\}\} |
223225
| action.redirect.code | | HTTP redirect code to use. Valid values are 301, 302, 303, 307 and 308. Default value is 302 |
224226
| match.ip-subnet.{index} | | List of IPs or CIDR v4/v6 addresses to filter for from the client side |
227+
| match.ips-edge-services | | Defines whether Edge Services IPs should be matched |
225228
| match.http-filter | One of: `acl_http_filter_none`, `path_begin`, `path_end`, `regex`, `http_header_match` | Type of HTTP filter to match. Extracts the request's URL path, which starts at the first slash and ends before the question mark (without the host part). Defines where to filter for the http_filter_value. Only supported for HTTP backends |
226229
| match.http-filter-value.{index} | | List of values to filter for |
227230
| match.http-filter-option | | Name of the HTTP header to filter on if `http_header_match` was selected in `http_filter` |

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@ require (
2323
github.com/mattn/go-isatty v0.0.20
2424
github.com/moby/buildkit v0.13.2
2525
github.com/opencontainers/go-digest v1.0.0
26-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250521073217-9a5c0c809817
26+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250522081800-5c022ea08bfd
2727
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
2828
github.com/spf13/cobra v1.9.1
2929
github.com/spf13/pflag v1.0.6
3030
github.com/stretchr/testify v1.10.0
3131
golang.org/x/crypto v0.38.0
32+
golang.org/x/sync v0.14.0
3233
golang.org/x/term v0.32.0
3334
golang.org/x/text v0.25.0
3435
gopkg.in/yaml.v3 v3.0.1
@@ -190,7 +191,6 @@ require (
190191
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
191192
golang.org/x/mod v0.17.0 // indirect
192193
golang.org/x/net v0.38.0 // indirect
193-
golang.org/x/sync v0.14.0 // indirect
194194
golang.org/x/sys v0.33.0 // indirect
195195
golang.org/x/time v0.5.0 // indirect
196196
google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda // indirect

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -466,8 +466,8 @@ github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUz
466466
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
467467
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
468468
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
469-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250521073217-9a5c0c809817 h1:aSM5Zrt8tQOKzZAxObc6haaFCDMc1Vo+PGwz5ufnnRY=
470-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250521073217-9a5c0c809817/go.mod h1:qiGzapFyNPFwBBLJ+hTFykKSnU95n1zL64+o1ubmwf0=
469+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250522081800-5c022ea08bfd h1:pREUaKMVVWP3gbbZ/FQAXjQ1SpLHAMDF4KJfnfstr5M=
470+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.33.0.20250522081800-5c022ea08bfd/go.mod h1:qiGzapFyNPFwBBLJ+hTFykKSnU95n1zL64+o1ubmwf0=
471471
github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
472472
github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
473473
github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA=

‎internal/namespaces/container/v1beta1/testdata/test-create-simple.golden

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,7 @@ Region fr-par
6262
"ready_at": null,
6363
"region": "fr-par",
6464
"tags": [],
65-
"private_network_id": null
65+
"private_network_id": null,
66+
"command": null,
67+
"args": null
6668
}

‎internal/namespaces/lb/v1/lb_cli.go

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2732,6 +2732,13 @@ func lbACLCreate() *core.Command {
27322732
Deprecated: false,
27332733
Positional: false,
27342734
},
2735+
{
2736+
Name: "match.ips-edge-services",
2737+
Short: `Defines whether Edge Services IPs should be matched`,
2738+
Required: false,
2739+
Deprecated: false,
2740+
Positional: false,
2741+
},
27352742
{
27362743
Name: "match.http-filter",
27372744
Short: `Type of HTTP filter to match. Extracts the request's URL path, which starts at the first slash and ends before the question mark (without the host part). Defines where to filter for the http_filter_value. Only supported for HTTP backends`,
@@ -2910,6 +2917,13 @@ func lbACLUpdate() *core.Command {
29102917
Deprecated: false,
29112918
Positional: false,
29122919
},
2920+
{
2921+
Name: "match.ips-edge-services",
2922+
Short: `Defines whether Edge Services IPs should be matched`,
2923+
Required: false,
2924+
Deprecated: false,
2925+
Positional: false,
2926+
},
29132927
{
29142928
Name: "match.http-filter",
29152929
Short: `Type of HTTP filter to match. Extracts the request's URL path, which starts at the first slash and ends before the question mark (without the host part). Defines where to filter for the http_filter_value. Only supported for HTTP backends`,
@@ -3088,6 +3102,13 @@ func lbACLSet() *core.Command {
30883102
Deprecated: false,
30893103
Positional: false,
30903104
},
3105+
{
3106+
Name: "acls.{index}.match.ips-edge-services",
3107+
Short: `Defines whether Edge Services IPs should be matched`,
3108+
Required: false,
3109+
Deprecated: false,
3110+
Positional: false,
3111+
},
30913112
{
30923113
Name: "acls.{index}.match.http-filter",
30933114
Short: `Type of HTTP filter to match. Extracts the request's URL path, which starts at the first slash and ends before the question mark (without the host part). Defines where to filter for the http_filter_value. Only supported for HTTP backends`,

‎internal/namespaces/lb/v1/testdata/test-get-frontend-simple.golden

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟩🟩🟩 STDOUT️ 🟩🟩🟩️
3-
ID 65efd103-17fb-4452-9ba3-5cf18db5a147
4-
Name cli-test
5-
InboundPort 8888
6-
TimeoutClient 5m0s
7-
CreatedAt few seconds ago
8-
UpdatedAt few seconds ago
9-
EnableHTTP3 false
3+
ID 65efd103-17fb-4452-9ba3-5cf18db5a147
4+
Name cli-test
5+
InboundPort 8888
6+
TimeoutClient 5m0s
7+
CreatedAt few seconds ago
8+
UpdatedAt few seconds ago
9+
EnableHTTP3 false
10+
EnableAccessLogs false
1011

1112
Lb:
1213
ID 7deaefe5-7389-46a4-abf6-94002a62ffef
@@ -198,5 +199,6 @@ ID STATUS IP ADDRESS CREATED AT UPDATED AT REGION ZONE
198199
"updated_at": "1970-01-01T00:00:00.0Z",
199200
"enable_http3": false,
200201
"connection_rate_limit": null,
202+
"enable_access_logs": false,
201203
"timeout_client": 300000
202204
}

0 commit comments

Comments
 (0)