Skip to content

feat(edge-services): enable v1beta1 #4659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 10, 2025
Merged

feat(edge-services): enable v1beta1 #4659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
583c1bd
feat(edge-services): enable v1beta1
yfodil Apr 9, 2025
5224a98
Merge branch 'master' into feat/enable-edge-services-v1beta1
yfodil Apr 10, 2025
2893b35
nolint staticcheck
yfodil Apr 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/scw/testdata/test-all-usage-edge-services-backend-stage-create-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ USAGE:
scw edge-services backend-stage create [arg=value ...]

ARGS:
[project-id] Project ID to use. If none is passed the default project ID will be used
[scaleway-s3.bucket-name] Name of the Bucket
[scaleway-s3.bucket-region] Region of the Bucket
[scaleway-s3.is-website] Defines whether the bucket website feature is enabled
Expand All @@ -15,6 +14,7 @@ ARGS:
[scaleway-lb.lbs.{index}.frontend-id] ID of the frontend linked to the Load Balancer
[scaleway-lb.lbs.{index}.is-ssl] Defines whether the Load Balancer's frontend handles SSL connections
[scaleway-lb.lbs.{index}.domain-name] Fully Qualified Domain Name (in the format subdomain.example.com) to use in HTTP requests sent towards your Load Balancer
pipeline-id Pipeline ID the Backend stage belongs to

FLAGS:
-h, --help help for create
Expand Down
44 changes: 44 additions & 0 deletions cmd/scw/testdata/test-all-usage-edge-services-backend-stage-list-usage.cassette.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
---
version: 1
interactions:
- request:
body: '{"access_key":"SCWBDFF054RNNE8204AJ", "secret_key":null, "description":"my-key",
"created_at":"2022-06-10T08:39:27.845066Z", "updated_at":"2022-07-05T15:12:12.987880Z",
"expires_at":null, "default_project_id":"564aa517-68b0-4fd7-8c8c-d21c4bcdcbd5",
"editable":true, "deletable":true, "managed":false, "creation_ip":"51.159.46.153",
"application_id":"531f5518-a0a5-44c2-b790-a9975505c89d"}'
form: {}
headers:
User-Agent:
- scaleway-sdk-go/v1.0.0-beta.33.0.20250402123125-11d6084394b9 (go1.24.0; darwin;
amd64) cli-e2e-test
url: https://api.scaleway.com/iam/v1alpha1/api-keys/SCWBDFF054RNNE8204AJ
method: GET
response:
body: '{"access_key":"SCWBDFF054RNNE8204AJ", "secret_key":null, "description":"my-key",
"created_at":"2022-06-10T08:39:27.845066Z", "updated_at":"2022-07-05T15:12:12.987880Z",
"expires_at":null, "default_project_id":"564aa517-68b0-4fd7-8c8c-d21c4bcdcbd5",
"editable":true, "deletable":true, "managed":false, "creation_ip":"51.159.46.153",
"application_id":"531f5518-a0a5-44c2-b790-a9975505c89d"}'
headers:
Content-Length:
- "388"
Content-Security-Policy:
- default-src 'none'; frame-ancestors 'none'
Content-Type:
- application/json
Date:
- Tue, 08 Apr 2025 12:59:43 GMT
Server:
- Scaleway API Gateway (fr-par-1;edge01)
Strict-Transport-Security:
- max-age=63072000
X-Content-Type-Options:
- nosniff
X-Frame-Options:
- DENY
X-Request-Id:
- 129d6879-2522-484a-bcac-e1bb2aeabb78
status: 200 OK
code: 200
duration: ""
9 changes: 4 additions & 5 deletions cmd/scw/testdata/test-all-usage-edge-services-backend-stage-list-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ USAGE:

ARGS:
[order-by] Sort order of backend stages in the response (created_at_asc | created_at_desc)
[pipeline-id] Pipeline ID to filter for, only backend stages from this pipeline will be returned
[project-id] Project ID to filter for, only backend stages from this Project will be returned
[bucket-name] Bucket name to filter for, only backend stages from this Bucket will be returned
[bucket-region] Bucket region to filter for, only backend stages with buckets in this region will be returned
[lb-id] Load Balancer ID to filter for, only backend stages with this Load Balancer will be returned
pipeline-id Pipeline ID to filter for. Only backend stages from this pipeline will be returned
[bucket-name] Bucket name to filter for. Only backend stages from this Bucket will be returned
[bucket-region] Bucket region to filter for. Only backend stages with buckets in this region will be returned
[lb-id] Load Balancer ID to filter for. Only backend stages with this Load Balancer will be returned

FLAGS:
-h, --help help for list
Expand Down
1 change: 1 addition & 0 deletions cmd/scw/testdata/test-all-usage-edge-services-backend-stage-update-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ ARGS:
[scaleway-lb.lbs.{index}.frontend-id] ID of the frontend linked to the Load Balancer
[scaleway-lb.lbs.{index}.is-ssl] Defines whether the Load Balancer's frontend handles SSL connections
[scaleway-lb.lbs.{index}.domain-name] Fully Qualified Domain Name (in the format subdomain.example.com) to use in HTTP requests sent towards your Load Balancer
[pipeline-id] Pipeline ID the Backend stage belongs to

FLAGS:
-h, --help help for update
Expand Down
41 changes: 41 additions & 0 deletions cmd/scw/testdata/test-all-usage-edge-services-cache-stage-create-usage.cassette.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
---
version: 1
interactions:
- request:
body: '{"access_key":"SCWBDFF054RNNE8204AJ", "secret_key":null, "description":"my-key",
"created_at":"2022-06-10T08:39:27.845066Z", "updated_at":"2022-07-05T15:12:12.987880Z",
"expires_at":null, "default_project_id":"564aa517-68b0-4fd7-8c8c-d21c4bcdcbd5",
"editable":true, "creation_ip":"51.159.46.153", "application_id":"531f5518-a0a5-44c2-b790-a9975505c89d"}'
form: {}
headers:
User-Agent:
- scaleway-sdk-go/v1.0.0-beta.7+dev (go1.22.2; darwin; amd64) cli-e2e-test
url: https://api.scaleway.com/iam/v1alpha1/api-keys/SCWXXXXXXXXXXXXXXXXX
method: GET
response:
body: '{"access_key":"SCWBDFF054RNNE8204AJ", "secret_key":null, "description":"my-key",
"created_at":"2022-06-10T08:39:27.845066Z", "updated_at":"2022-07-05T15:12:12.987880Z",
"expires_at":null, "default_project_id":"564aa517-68b0-4fd7-8c8c-d21c4bcdcbd5",
"editable":true, "creation_ip":"51.159.46.153", "application_id":"531f5518-a0a5-44c2-b790-a9975505c89d"}'
headers:
Content-Length:
- "353"
Content-Security-Policy:
- default-src 'none'; frame-ancestors 'none'
Content-Type:
- application/json
Date:
- Tue, 09 Jul 2024 14:44:28 GMT
Server:
- Scaleway API Gateway (fr-par-3;edge02)
Strict-Transport-Security:
- max-age=63072000
X-Content-Type-Options:
- nosniff
X-Frame-Options:
- DENY
X-Request-Id:
- 5f4acf0c-34ef-4783-a893-3bcd63f3b1eb
status: 200 OK
code: 200
duration: ""
4 changes: 3 additions & 1 deletion cmd/scw/testdata/test-all-usage-edge-services-cache-stage-create-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ USAGE:
scw edge-services cache-stage create [arg=value ...]

ARGS:
[project-id] Project ID to use. If none is passed the default project ID will be used
[fallback-ttl=3600s] Time To Live (TTL) in seconds. Defines how long content is cached
[backend-stage-id] Backend stage ID the cache stage will be linked to
pipeline-id Pipeline ID the Cache stage belongs to
[waf-stage-id]
[route-stage-id]

FLAGS:
-h, --help help for create
Expand Down
5 changes: 2 additions & 3 deletions cmd/scw/testdata/test-all-usage-edge-services-cache-stage-list-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ USAGE:
scw edge-services cache-stage list [arg=value ...]

ARGS:
[order-by] Sort order of cache stages in the response (created_at_asc | created_at_desc)
[pipeline-id] Pipeline ID to filter for, only cache stages from this pipeline will be returned
[project-id] Project ID to filter for, only cache stages from this Project will be returned
[order-by] Sort order of cache stages in the response (created_at_asc | created_at_desc)
pipeline-id Pipeline ID to filter for. Only cache stages from this pipeline will be returned

FLAGS:
-h, --help help for list
Expand Down
2 changes: 2 additions & 0 deletions cmd/scw/testdata/test-all-usage-edge-services-cache-stage-update-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ ARGS:
cache-stage-id ID of the cache stage to update
[fallback-ttl] Time To Live (TTL) in seconds. Defines how long content is cached
[backend-stage-id] Backend stage ID the cache stage will be linked to
[waf-stage-id]
[route-stage-id]

FLAGS:
-h, --help help for update
Expand Down
2 changes: 1 addition & 1 deletion cmd/scw/testdata/test-all-usage-edge-services-dns-stage-create-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ USAGE:
scw edge-services dns-stage create [arg=value ...]

ARGS:
[project-id] Project ID to use. If none is passed the default project ID will be used
[fqdns.{index}] Fully Qualified Domain Name (in the format subdomain.example.com) to attach to the stage
[tls-stage-id] TLS stage ID the DNS stage will be linked to
[cache-stage-id] Cache stage ID the DNS stage will be linked to
[backend-stage-id] Backend stage ID the DNS stage will be linked to
pipeline-id Pipeline ID the DNS stage belongs to

FLAGS:
-h, --help help for create
Expand Down
7 changes: 3 additions & 4 deletions cmd/scw/testdata/test-all-usage-edge-services-dns-stage-list-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ USAGE:
scw edge-services dns-stage list [arg=value ...]

ARGS:
[order-by] Sort order of DNS stages in the response (created_at_asc | created_at_desc)
[pipeline-id] Pipeline ID to filter for, only DNS stages from this pipeline will be returned
[project-id] Project ID to filter for, only DNS stages from this Project will be returned
[fqdn] Fully Qualified Domain Name to filter for (in the format subdomain.example.com), only DNS stages with this FQDN will be returned
[order-by] Sort order of DNS stages in the response (created_at_asc | created_at_desc)
pipeline-id Pipeline ID to filter for. Only DNS stages from this pipeline will be returned
[fqdn] Fully Qualified Domain Name to filter for (in the format subdomain.example.com). Only DNS stages with this FQDN will be returned

FLAGS:
-h, --help help for list
Expand Down
7 changes: 3 additions & 4 deletions cmd/scw/testdata/test-all-usage-edge-services-pipeline-create-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ USAGE:
scw edge-services pipeline create [arg=value ...]

ARGS:
[project-id] Project ID to use. If none is passed the default project ID will be used
name Name of the pipeline
description Description of the pipeline
[dns-stage-id] DNS stage ID the pipeline will be attached to
[project-id] Project ID to use. If none is passed the default project ID will be used
name Name of the pipeline
description Description of the pipeline

FLAGS:
-h, --help help for create
Expand Down
8 changes: 4 additions & 4 deletions cmd/scw/testdata/test-all-usage-edge-services-pipeline-list-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ USAGE:

ARGS:
[order-by] Sort order of pipelines in the response (created_at_asc | created_at_desc | name_asc | name_desc)
[name] Pipeline name to filter for, only pipelines with this string within their name will be returned
[project-id] Project ID to filter for, only pipelines from this Project will be returned
[has-backend-stage-lb] Filter on backend stage, only pipelines with a Load Balancer origin will be returned
[organization-id] Organization ID to filter for, only pipelines from this Organization will be returned
[name] Pipeline name to filter for. Only pipelines with this string within their name will be returned
[project-id] Project ID to filter for. Only pipelines from this Project will be returned
[has-backend-stage-lb] Filter on backend stage. Only pipelines with a Load Balancer origin will be returned
[organization-id] Organization ID to filter for. Only pipelines from this Organization will be returned

FLAGS:
-h, --help help for list
Expand Down
7 changes: 3 additions & 4 deletions cmd/scw/testdata/test-all-usage-edge-services-pipeline-update-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ USAGE:
scw edge-services pipeline update <pipeline-id ...> [arg=value ...]

ARGS:
pipeline-id ID of the pipeline to update
[name] Name of the pipeline
[description] Description of the pipeline
[dns-stage-id] DNS stage ID the pipeline will be attached to
pipeline-id ID of the pipeline to update
[name] Name of the pipeline
[description] Description of the pipeline

FLAGS:
-h, --help help for update
Expand Down
41 changes: 41 additions & 0 deletions cmd/scw/testdata/test-all-usage-edge-services-purge-request-get-usage.cassette.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
---
version: 1
interactions:
- request:
body: '{"access_key":"SCWBDFF054RNNE8204AJ", "secret_key":null, "description":"my-key",
"created_at":"2022-06-10T08:39:27.845066Z", "updated_at":"2022-07-05T15:12:12.987880Z",
"expires_at":null, "default_project_id":"564aa517-68b0-4fd7-8c8c-d21c4bcdcbd5",
"editable":true, "creation_ip":"51.159.46.153", "application_id":"531f5518-a0a5-44c2-b790-a9975505c89d"}'
form: {}
headers:
User-Agent:
- scaleway-sdk-go/v1.0.0-beta.7+dev (go1.22.2; darwin; amd64) cli-e2e-test
url: https://api.scaleway.com/iam/v1alpha1/api-keys/SCWXXXXXXXXXXXXXXXXX
method: GET
response:
body: '{"access_key":"SCWBDFF054RNNE8204AJ", "secret_key":null, "description":"my-key",
"created_at":"2022-06-10T08:39:27.845066Z", "updated_at":"2022-07-05T15:12:12.987880Z",
"expires_at":null, "default_project_id":"564aa517-68b0-4fd7-8c8c-d21c4bcdcbd5",
"editable":true, "creation_ip":"51.159.46.153", "application_id":"531f5518-a0a5-44c2-b790-a9975505c89d"}'
headers:
Content-Length:
- "353"
Content-Security-Policy:
- default-src 'none'; frame-ancestors 'none'
Content-Type:
- application/json
Date:
- Tue, 09 Jul 2024 14:44:28 GMT
Server:
- Scaleway API Gateway (fr-par-3;edge02)
Strict-Transport-Security:
- max-age=63072000
X-Content-Type-Options:
- nosniff
X-Frame-Options:
- DENY
X-Request-Id:
- 1ab4042b-f80f-4f44-a25c-fdc41d0173ff
status: 200 OK
code: 200
duration: ""
6 changes: 3 additions & 3 deletions cmd/scw/testdata/test-all-usage-edge-services-purge-request-list-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ USAGE:

ARGS:
[order-by] Sort order of purge requests in the response (created_at_asc | created_at_desc)
[project-id] Project ID to filter for, only purge requests from this Project will be returned
[pipeline-id] Pipeline ID to filter for, only purge requests from this pipeline will be returned
[organization-id] Organization ID to filter for, only purge requests from this Project will be returned
[project-id] Project ID to filter for. Only purge requests from this Project will be returned
[pipeline-id] Pipeline ID to filter for. Only purge requests from this pipeline will be returned
[organization-id] Organization ID to filter for. Only purge requests from this Project will be returned

FLAGS:
-h, --help help for list
Expand Down
24 changes: 24 additions & 0 deletions cmd/scw/testdata/test-all-usage-edge-services-route-rules-add-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
Add route rules to an existing route stage, specified by its `route_stage_id`.

USAGE:
scw edge-services route-rules add <route-stage-id ...> [arg=value ...]

ARGS:
route-stage-id ID of the route stage to update
[route-rules.{index}.rule-http-match.method-filters.{index}] HTTP methods to filter for. A request using any of these methods will be considered to match the rule. Possible values are `get`, `post`, `put`, `patch`, `delete`, `head`, `options`. All methods will match if none is provided (unknown_method_filter | get | post | put | patch | delete | head | options)
[route-rules.{index}.rule-http-match.path-filter.path-filter-type] Type of filter to match for the HTTP URL path. For now, all path filters must be written in regex and use the `regex` type (unknown_path_filter | regex)
[route-rules.{index}.rule-http-match.path-filter.value] Value to be matched for the HTTP URL path
[route-rules.{index}.backend-stage-id] ID of the backend stage that requests matching the rule should be forwarded to
[after-position] Add rules after the given position
[before-position] Add rules before the given position

FLAGS:
-h, --help help for add

GLOBAL FLAGS:
-c, --config string The path to the config file
-D, --debug Enable debug mode
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
-p, --profile string The config profile to use
18 changes: 18 additions & 0 deletions cmd/scw/testdata/test-all-usage-edge-services-route-rules-list-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
List all route rules of an existing route stage, specified by its `route_stage_id`.

USAGE:
scw edge-services route-rules list [arg=value ...]

ARGS:
route-stage-id Route stage ID to filter for. Only route rules from this route stage will be returned

FLAGS:
-h, --help help for list

GLOBAL FLAGS:
-c, --config string The path to the config file
-D, --debug Enable debug mode
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
-p, --profile string The config profile to use
22 changes: 22 additions & 0 deletions cmd/scw/testdata/test-all-usage-edge-services-route-rules-set-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
Set the rules of an existing route stage, specified by its `route_stage_id`.

USAGE:
scw edge-services route-rules set <route-stage-id ...> [arg=value ...]

ARGS:
route-stage-id ID of the route stage to update
[route-rules.{index}.rule-http-match.method-filters.{index}] HTTP methods to filter for. A request using any of these methods will be considered to match the rule. Possible values are `get`, `post`, `put`, `patch`, `delete`, `head`, `options`. All methods will match if none is provided (unknown_method_filter | get | post | put | patch | delete | head | options)
[route-rules.{index}.rule-http-match.path-filter.path-filter-type] Type of filter to match for the HTTP URL path. For now, all path filters must be written in regex and use the `regex` type (unknown_path_filter | regex)
[route-rules.{index}.rule-http-match.path-filter.value] Value to be matched for the HTTP URL path
[route-rules.{index}.backend-stage-id] ID of the backend stage that requests matching the rule should be forwarded to

FLAGS:
-h, --help help for set

GLOBAL FLAGS:
-c, --config string The path to the config file
-D, --debug Enable debug mode
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
-p, --profile string The config profile to use
22 changes: 22 additions & 0 deletions cmd/scw/testdata/test-all-usage-edge-services-route-rules-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
Route-rules management commands.

USAGE:
scw edge-services route-rules <command>

AVAILABLE COMMANDS:
add Add route rules
list List route rules
set Set route rules

FLAGS:
-h, --help help for route-rules

GLOBAL FLAGS:
-c, --config string The path to the config file
-D, --debug Enable debug mode
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
-p, --profile string The config profile to use

Use "scw edge-services route-rules [command] --help" for more information about a command.
19 changes: 19 additions & 0 deletions cmd/scw/testdata/test-all-usage-edge-services-route-stage-create-usage.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
Create a new route stage. You must specify the `waf_stage_id` field to customize the route.

USAGE:
scw edge-services route-stage create [arg=value ...]

ARGS:
pipeline-id Pipeline ID the route stage belongs to
[waf-stage-id] ID of the WAF stage HTTP requests should be forwarded to when no rules are matched

FLAGS:
-h, --help help for create

GLOBAL FLAGS:
-c, --config string The path to the config file
-D, --debug Enable debug mode
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
-p, --profile string The config profile to use
Loading
Loading