Skip to content

Commit f8c72da

Browse files
authored
Merge branch 'scaleway:master' into master
2 parents 5904b06 + 1a90849 commit f8c72da

24 files changed

+651
-193
lines changed

cmd/scw-sweeper/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
flexibleipSweeper "github.com/scaleway/scaleway-sdk-go/api/flexibleip/v1alpha1/sweepers"
1515
functionSweeper "github.com/scaleway/scaleway-sdk-go/api/function/v1beta1/sweepers"
1616
iamSweeper "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1/sweepers"
17-
inferenceSweeper "github.com/scaleway/scaleway-sdk-go/api/inference/v1beta1/sweepers"
17+
inferenceSweeper "github.com/scaleway/scaleway-sdk-go/api/inference/v1/sweepers"
1818
instanceSweeper "github.com/scaleway/scaleway-sdk-go/api/instance/v1/sweepers"
1919
iotSweeper "github.com/scaleway/scaleway-sdk-go/api/iot/v1/sweepers"
2020
ipamSweeper "github.com/scaleway/scaleway-sdk-go/api/ipam/v1/sweepers"

cmd/scw/testdata/test-all-usage-apple-silicon-server-reinstall-usage.golden

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,9 @@ USAGE:
66
scw apple-silicon server reinstall <server-id ...> [arg=value ...]
77

88
ARGS:
9-
server-id UUID of the server you want to reinstall
10-
[os-id] Reinstall the server with the OS corresponding to the os_id
11-
[runner-configuration.name]
12-
[runner-configuration.url]
13-
[runner-configuration.token]
14-
[runner-configuration.provider] (unknown_provider | github | gitlab)
15-
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-3)
9+
server-id UUID of the server you want to reinstall
10+
[os-id] Reinstall the server with the OS corresponding to the os_id
11+
[zone=fr-par-1] Zone to target. If none is passed will use default zone from the config (fr-par-3)
1612

1713
FLAGS:
1814
-h, --help help for reinstall

cmd/scw/testdata/test-all-usage-cockpit-managed-alerts-usage.golden

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
Managed alerts management commands.
44

55
USAGE:
6-
scw cockpit managed-alerts <command>
7-
8-
AVAILABLE COMMANDS:
9-
disable Disable managed alerts
10-
enable Enable managed alerts
6+
scw cockpit managed-alerts
117

128
FLAGS:
139
-h, --help help for managed-alerts
@@ -17,5 +13,3 @@ GLOBAL FLAGS:
1713
-D, --debug Enable debug mode
1814
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
1915
-p, --profile string The config profile to use
20-
21-
Use "scw cockpit managed-alerts [command] --help" for more information about a command.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
2+
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3+
Enable SAML Identity Provider for an Organization.
4+
5+
USAGE:
6+
scw iam organization enable-saml [arg=value ...]
7+
8+
ARGS:
9+
[organization-id] Organization ID to use. If none is passed the default organization ID will be used
10+
11+
FLAGS:
12+
-h, --help help for enable-saml
13+
14+
GLOBAL FLAGS:
15+
-c, --config string The path to the config file
16+
-D, --debug Enable debug mode
17+
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
18+
-p, --profile string The config profile to use
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
2+
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3+
Get SAML Identity Provider configuration of an Organization.
4+
5+
USAGE:
6+
scw iam organization get-saml [arg=value ...]
7+
8+
ARGS:
9+
[organization-id] Organization ID to use. If none is passed the default organization ID will be used
10+
11+
FLAGS:
12+
-h, --help help for get-saml
13+
14+
GLOBAL FLAGS:
15+
-c, --config string The path to the config file
16+
-D, --debug Enable debug mode
17+
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
18+
-p, --profile string The config profile to use

cmd/scw/testdata/test-all-usage-iam-organization-usage.golden

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
Organization-wide management commands.
44

55
USAGE:
6-
scw iam organization
6+
scw iam organization <command>
7+
8+
AVAILABLE COMMANDS:
9+
enable-saml Enable SAML Identity Provider for an Organization
10+
get-saml Get SAML Identity Provider configuration of an Organization
711

812
FLAGS:
913
-h, --help help for organization
@@ -13,3 +17,5 @@ GLOBAL FLAGS:
1317
-D, --debug Enable debug mode
1418
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
1519
-p, --profile string The config profile to use
20+
21+
Use "scw iam organization [command] --help" for more information about a command.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
2+
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3+
Add a SAML certificate.
4+
5+
USAGE:
6+
scw iam saml-certificates add <saml-id ...> [arg=value ...]
7+
8+
ARGS:
9+
saml-id ID of the SAML configuration
10+
type Type of the SAML certificate (unknown_certificate_type | signing | encryption)
11+
content Content of the SAML certificate
12+
13+
FLAGS:
14+
-h, --help help for add
15+
16+
GLOBAL FLAGS:
17+
-c, --config string The path to the config file
18+
-D, --debug Enable debug mode
19+
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
20+
-p, --profile string The config profile to use
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
2+
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3+
Delete a SAML certificate.
4+
5+
USAGE:
6+
scw iam saml-certificates delete <certificate-id ...> [arg=value ...]
7+
8+
ARGS:
9+
certificate-id ID of the certificate to delete
10+
11+
FLAGS:
12+
-h, --help help for delete
13+
14+
GLOBAL FLAGS:
15+
-c, --config string The path to the config file
16+
-D, --debug Enable debug mode
17+
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
18+
-p, --profile string The config profile to use
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
2+
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3+
List SAML certificates.
4+
5+
USAGE:
6+
scw iam saml-certificates list <saml-id ...> [arg=value ...]
7+
8+
ARGS:
9+
saml-id ID of the SAML configuration
10+
11+
FLAGS:
12+
-h, --help help for list
13+
14+
GLOBAL FLAGS:
15+
-c, --config string The path to the config file
16+
-D, --debug Enable debug mode
17+
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
18+
-p, --profile string The config profile to use
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
2+
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3+
SAML Certificates management commands.
4+
5+
USAGE:
6+
scw iam saml-certificates <command>
7+
8+
AVAILABLE COMMANDS:
9+
add Add a SAML certificate
10+
delete Delete a SAML certificate
11+
list List SAML certificates
12+
13+
FLAGS:
14+
-h, --help help for saml-certificates
15+
16+
GLOBAL FLAGS:
17+
-c, --config string The path to the config file
18+
-D, --debug Enable debug mode
19+
-o, --output string Output format: json or human, see 'scw help output' for more info (default "human")
20+
-p, --profile string The config profile to use
21+
22+
Use "scw iam saml-certificates [command] --help" for more information about a command.

0 commit comments

Comments
 (0)