Skip to content

Commit 2feae97

Browse files
remyleoneremyleone
committed
Fix
1 parent 299f0de commit 2feae97

File tree

5 files changed

+57
-48
lines changed

5 files changed

+57
-48
lines changed

‎cmd/scw/testdata/test-all-usage-secret-secret-list-usage.golden

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ USAGE:
77

88
ARGS:
99
[project-id] Filter by Project ID (optional)
10-
[name] Filter by secret name (optional)
11-
[tags.{index}] List of tags to filter on (optional)
1210
[order-by] (name_asc | name_desc | created_at_asc | created_at_desc | updated_at_asc | updated_at_desc)
11+
[tags.{index}] List of tags to filter on (optional)
12+
[name] Filter by secret name (optional)
13+
[is-managed] Filter by managed / not managed (optional)
1314
[organization-id] Filter by Organization ID (optional)
1415
[region=fr-par] Region to target. If none is passed will use default region from the config (fr-par | all)
1516

‎cmd/scw/testdata/test-all-usage-secret-usage.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
22
🟥🟥🟥 STDERR️️ 🟥🟥🟥️
3-
Secret Manager API documentation.
3+
This API allows you to conveniently store, access and share sensitive data.
44

55
USAGE:
66
scw secret <command>

‎cmd/scw/testdata/test-main-usage-usage.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ AVAILABLE COMMANDS:
2525
rdb Managed Database for PostgreSQL and MySQL API
2626
redis Managed Database for Redis™ API
2727
registry Container Registry API
28-
secret This API allows you to conveniently store, access and share sensitive data
28+
secret Secret Manager API
2929
tem Tem
3030
vpc VPC API
3131
vpc-gw Public Gateways API

‎docs/commands/secret.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!-- DO NOT EDIT: this file is automatically generated using scw-doc-gen -->
22
# Documentation for `scw secret`
3-
Secret Manager API documentation.
3+
This API allows you to conveniently store, access and share sensitive data.
44

55
- [Secret management commands](#secret-management-commands)
66
- [Create a secret](#create-a-secret)
@@ -123,9 +123,10 @@ scw secret secret list [arg=value ...]
123123
| Name | | Description |
124124
|------|---|-------------|
125125
| project-id | | Filter by Project ID (optional) |
126-
| name | | Filter by secret name (optional) |
127-
| tags.{index} | | List of tags to filter on (optional) |
128126
| order-by | One of: `name_asc`, `name_desc`, `created_at_asc`, `created_at_desc`, `updated_at_asc`, `updated_at_desc` | |
127+
| tags.{index} | | List of tags to filter on (optional) |
128+
| name | | Filter by secret name (optional) |
129+
| is-managed | | Filter by managed / not managed (optional) |
129130
| organization-id | | Filter by Organization ID (optional) |
130131
| region | Default: `fr-par`<br />One of: `fr-par`, `all` | Region to target. If none is passed will use default region from the config |
131132

‎internal/namespaces/secret/v1alpha1/secret_cli.go

Lines changed: 48 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ func GetGeneratedCommands() *core.Commands {
3131
secretVersionGet(),
3232
secretVersionUpdate(),
3333
secretVersionList(),
34-
secretVersionDelete(),
3534
secretVersionEnable(),
3635
secretVersionDisable(),
3736
secretVersionAccess(),
37+
secretVersionDelete(),
3838
)
3939
}
4040
func secretRoot() *core.Command {
4141
return &core.Command{
42-
Short: `This API allows you to conveniently store, access and share sensitive data`,
43-
Long: `Secret Manager API documentation.`,
42+
Short: `Secret Manager API`,
43+
Long: `This API allows you to conveniently store, access and share sensitive data.`,
4444
Namespace: "secret",
4545
}
4646
}
@@ -213,11 +213,11 @@ func secretSecretList() *core.Command {
213213
Positional: false,
214214
},
215215
{
216-
Name: "name",
217-
Short: `Filter by secret name (optional)`,
216+
Name: "order-by",
218217
Required: false,
219218
Deprecated: false,
220219
Positional: false,
220+
EnumValues: []string{"name_asc", "name_desc", "created_at_asc", "created_at_desc", "updated_at_asc", "updated_at_desc"},
221221
},
222222
{
223223
Name: "tags.{index}",
@@ -227,11 +227,18 @@ func secretSecretList() *core.Command {
227227
Positional: false,
228228
},
229229
{
230-
Name: "order-by",
230+
Name: "name",
231+
Short: `Filter by secret name (optional)`,
232+
Required: false,
233+
Deprecated: false,
234+
Positional: false,
235+
},
236+
{
237+
Name: "is-managed",
238+
Short: `Filter by managed / not managed (optional)`,
231239
Required: false,
232240
Deprecated: false,
233241
Positional: false,
234-
EnumValues: []string{"name_asc", "name_desc", "created_at_asc", "created_at_desc", "updated_at_asc", "updated_at_desc"},
235242
},
236243
{
237244
Name: "organization-id",
@@ -525,15 +532,15 @@ func secretVersionList() *core.Command {
525532
}
526533
}
527534

528-
func secretVersionDelete() *core.Command {
535+
func secretVersionEnable() *core.Command {
529536
return &core.Command{
530-
Short: `Delete a version`,
531-
Long: `Delete a secret's version and the sensitive data contained in it. Deleting a version is permanent and cannot be undone.`,
537+
Short: `Enable a version`,
538+
Long: `Make a specific version accessible. You must specify the ` + "`" + `region` + "`" + `, ` + "`" + `secret_id` + "`" + ` and ` + "`" + `revision` + "`" + ` parameters.`,
532539
Namespace: "secret",
533540
Resource: "version",
534-
Verb: "delete",
541+
Verb: "enable",
535542
// Deprecated: false,
536-
ArgsType: reflect.TypeOf(secret.DestroySecretVersionRequest{}),
543+
ArgsType: reflect.TypeOf(secret.EnableSecretVersionRequest{}),
537544
ArgSpecs: core.ArgSpecs{
538545
{
539546
Name: "secret-id",
@@ -552,31 +559,25 @@ func secretVersionDelete() *core.Command {
552559
core.RegionArgSpec(scw.RegionFrPar),
553560
},
554561
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
555-
request := args.(*secret.DestroySecretVersionRequest)
562+
request := args.(*secret.EnableSecretVersionRequest)
556563

557564
client := core.ExtractClient(ctx)
558565
api := secret.NewAPI(client)
559-
return api.DestroySecretVersion(request)
566+
return api.EnableSecretVersion(request)
560567

561568
},
562-
Examples: []*core.Example{
563-
{
564-
Short: "Delete a given Secret Version",
565-
ArgsJSON: `{"revision":"1","secret_id":"11111111-1111-1111-1111-111111111111"}`,
566-
},
567-
},
568569
}
569570
}
570571

571-
func secretVersionEnable() *core.Command {
572+
func secretVersionDisable() *core.Command {
572573
return &core.Command{
573-
Short: `Enable a version`,
574-
Long: `Make a specific version accessible. You must specify the ` + "`" + `region` + "`" + `, ` + "`" + `secret_id` + "`" + ` and ` + "`" + `revision` + "`" + ` parameters.`,
574+
Short: `Disable a version`,
575+
Long: `Make a specific version inaccessible. You must specify the ` + "`" + `region` + "`" + `, ` + "`" + `secret_id` + "`" + ` and ` + "`" + `revision` + "`" + ` parameters.`,
575576
Namespace: "secret",
576577
Resource: "version",
577-
Verb: "enable",
578+
Verb: "disable",
578579
// Deprecated: false,
579-
ArgsType: reflect.TypeOf(secret.EnableSecretVersionRequest{}),
580+
ArgsType: reflect.TypeOf(secret.DisableSecretVersionRequest{}),
580581
ArgSpecs: core.ArgSpecs{
581582
{
582583
Name: "secret-id",
@@ -595,25 +596,25 @@ func secretVersionEnable() *core.Command {
595596
core.RegionArgSpec(scw.RegionFrPar),
596597
},
597598
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
598-
request := args.(*secret.EnableSecretVersionRequest)
599+
request := args.(*secret.DisableSecretVersionRequest)
599600

600601
client := core.ExtractClient(ctx)
601602
api := secret.NewAPI(client)
602-
return api.EnableSecretVersion(request)
603+
return api.DisableSecretVersion(request)
603604

604605
},
605606
}
606607
}
607608

608-
func secretVersionDisable() *core.Command {
609+
func secretVersionAccess() *core.Command {
609610
return &core.Command{
610-
Short: `Disable a version`,
611-
Long: `Make a specific version inaccessible. You must specify the ` + "`" + `region` + "`" + `, ` + "`" + `secret_id` + "`" + ` and ` + "`" + `revision` + "`" + ` parameters.`,
611+
Short: `Access a secret's version using the secret's ID`,
612+
Long: `Access sensitive data in a secret's version specified by the ` + "`" + `region` + "`" + `, ` + "`" + `secret_id` + "`" + ` and ` + "`" + `revision` + "`" + ` parameters.`,
612613
Namespace: "secret",
613614
Resource: "version",
614-
Verb: "disable",
615+
Verb: "access",
615616
// Deprecated: false,
616-
ArgsType: reflect.TypeOf(secret.DisableSecretVersionRequest{}),
617+
ArgsType: reflect.TypeOf(secret.AccessSecretVersionRequest{}),
617618
ArgSpecs: core.ArgSpecs{
618619
{
619620
Name: "secret-id",
@@ -632,25 +633,25 @@ func secretVersionDisable() *core.Command {
632633
core.RegionArgSpec(scw.RegionFrPar),
633634
},
634635
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
635-
request := args.(*secret.DisableSecretVersionRequest)
636+
request := args.(*secret.AccessSecretVersionRequest)
636637

637638
client := core.ExtractClient(ctx)
638639
api := secret.NewAPI(client)
639-
return api.DisableSecretVersion(request)
640+
return api.AccessSecretVersion(request)
640641

641642
},
642643
}
643644
}
644645

645-
func secretVersionAccess() *core.Command {
646+
func secretVersionDelete() *core.Command {
646647
return &core.Command{
647-
Short: `Access a secret's version using the secret's ID`,
648-
Long: `Access sensitive data in a secret's version specified by the ` + "`" + `region` + "`" + `, ` + "`" + `secret_id` + "`" + ` and ` + "`" + `revision` + "`" + ` parameters.`,
648+
Short: `Delete a version`,
649+
Long: `Delete a secret's version and the sensitive data contained in it. Deleting a version is permanent and cannot be undone.`,
649650
Namespace: "secret",
650651
Resource: "version",
651-
Verb: "access",
652+
Verb: "delete",
652653
// Deprecated: false,
653-
ArgsType: reflect.TypeOf(secret.AccessSecretVersionRequest{}),
654+
ArgsType: reflect.TypeOf(secret.DestroySecretVersionRequest{}),
654655
ArgSpecs: core.ArgSpecs{
655656
{
656657
Name: "secret-id",
@@ -669,12 +670,18 @@ func secretVersionAccess() *core.Command {
669670
core.RegionArgSpec(scw.RegionFrPar),
670671
},
671672
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
672-
request := args.(*secret.AccessSecretVersionRequest)
673+
request := args.(*secret.DestroySecretVersionRequest)
673674

674675
client := core.ExtractClient(ctx)
675676
api := secret.NewAPI(client)
676-
return api.AccessSecretVersion(request)
677+
return api.DestroySecretVersion(request)
677678

678679
},
680+
Examples: []*core.Example{
681+
{
682+
Short: "Delete a given Secret Version",
683+
ArgsJSON: `{"revision":"1","secret_id":"11111111-1111-1111-1111-111111111111"}`,
684+
},
685+
},
679686
}
680687
}

0 commit comments

Comments
 (0)