From f965149c61abf2f3788478b53d8e10227db105d0 Mon Sep 17 00:00:00 2001 From: scaleway-bot Date: Sat, 19 Jun 2021 10:29:20 +0000 Subject: [PATCH 1/2] feat: update generated cli --- internal/namespaces/domain/v2beta1/domain_cli.go | 10 +++++----- internal/namespaces/instance/v1/instance_cli.go | 8 ++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/internal/namespaces/domain/v2beta1/domain_cli.go b/internal/namespaces/domain/v2beta1/domain_cli.go index 5efca50310..cb5c47ea07 100644 --- a/internal/namespaces/domain/v2beta1/domain_cli.go +++ b/internal/namespaces/domain/v2beta1/domain_cli.go @@ -397,7 +397,7 @@ You can filter the records by type and name. Required: false, Deprecated: false, Positional: false, - EnumValues: []string{"unknown", "A", "AAAA", "CNAME", "TXT", "SRV", "TLSA", "MX", "NS", "PTR", "CAA", "ALIAS"}, + EnumValues: []string{"unknown", "A", "AAAA", "CNAME", "TXT", "SRV", "TLSA", "MX", "NS", "PTR", "CAA", "ALIAS", "LOC", "SSHFP", "HINFO", "RP", "URI", "DS", "NAPTR"}, }, }, Run: func(ctx context.Context, args interface{}) (i interface{}, e error) { @@ -501,7 +501,7 @@ All edits will be versioned. Required: false, Deprecated: false, Positional: false, - EnumValues: []string{"unknown", "A", "AAAA", "CNAME", "TXT", "SRV", "TLSA", "MX", "NS", "PTR", "CAA", "ALIAS"}, + EnumValues: []string{"unknown", "A", "AAAA", "CNAME", "TXT", "SRV", "TLSA", "MX", "NS", "PTR", "CAA", "ALIAS", "LOC", "SSHFP", "HINFO", "RP", "URI", "DS", "NAPTR"}, }, { Name: "changes.{index}.add.records.{index}.comment", @@ -611,7 +611,7 @@ All edits will be versioned. Required: false, Deprecated: false, Positional: false, - EnumValues: []string{"unknown", "A", "AAAA", "CNAME", "TXT", "SRV", "TLSA", "MX", "NS", "PTR", "CAA", "ALIAS"}, + EnumValues: []string{"unknown", "A", "AAAA", "CNAME", "TXT", "SRV", "TLSA", "MX", "NS", "PTR", "CAA", "ALIAS", "LOC", "SSHFP", "HINFO", "RP", "URI", "DS", "NAPTR"}, }, { Name: "changes.{index}.set.id-fields.data", @@ -654,7 +654,7 @@ All edits will be versioned. Required: false, Deprecated: false, Positional: false, - EnumValues: []string{"unknown", "A", "AAAA", "CNAME", "TXT", "SRV", "TLSA", "MX", "NS", "PTR", "CAA", "ALIAS"}, + EnumValues: []string{"unknown", "A", "AAAA", "CNAME", "TXT", "SRV", "TLSA", "MX", "NS", "PTR", "CAA", "ALIAS", "LOC", "SSHFP", "HINFO", "RP", "URI", "DS", "NAPTR"}, }, { Name: "changes.{index}.set.records.{index}.comment", @@ -764,7 +764,7 @@ All edits will be versioned. Required: false, Deprecated: false, Positional: false, - EnumValues: []string{"unknown", "A", "AAAA", "CNAME", "TXT", "SRV", "TLSA", "MX", "NS", "PTR", "CAA", "ALIAS"}, + EnumValues: []string{"unknown", "A", "AAAA", "CNAME", "TXT", "SRV", "TLSA", "MX", "NS", "PTR", "CAA", "ALIAS", "LOC", "SSHFP", "HINFO", "RP", "URI", "DS", "NAPTR"}, }, { Name: "changes.{index}.delete.id-fields.data", diff --git a/internal/namespaces/instance/v1/instance_cli.go b/internal/namespaces/instance/v1/instance_cli.go index 4022f1e7c0..3dd4e46e5d 100644 --- a/internal/namespaces/instance/v1/instance_cli.go +++ b/internal/namespaces/instance/v1/instance_cli.go @@ -429,6 +429,14 @@ func instanceServerList() *core.Command { Deprecated: false, Positional: false, }, + { + Name: "order", + Short: `Define the order of the returned servers`, + Required: false, + Deprecated: false, + Positional: false, + EnumValues: []string{"creation_date_desc", "creation_date_asc", "modification_date_desc", "modification_date_asc"}, + }, { Name: "organization", Short: `List only servers of this organization ID`, From 353417e8d7a11381b6ea11538882ab2773827de0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Wed, 23 Jun 2021 10:18:18 +0200 Subject: [PATCH 2/2] Fix --- .../test-all-usage-dns-record-bulk-update-usage.golden | 8 ++++---- .../test-all-usage-dns-record-list-usage.golden | 2 +- docs/commands/dns.md | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cmd/scw/testdata/test-all-usage-dns-record-bulk-update-usage.golden b/cmd/scw/testdata/test-all-usage-dns-record-bulk-update-usage.golden index 03d66340b5..8d052a6273 100644 --- a/cmd/scw/testdata/test-all-usage-dns-record-bulk-update-usage.golden +++ b/cmd/scw/testdata/test-all-usage-dns-record-bulk-update-usage.golden @@ -27,7 +27,7 @@ ARGS: [changes.{index}.add.records.{index}.name] [changes.{index}.add.records.{index}.priority] [changes.{index}.add.records.{index}.ttl] - [changes.{index}.add.records.{index}.type] (unknown | A | AAAA | CNAME | TXT | SRV | TLSA | MX | NS | PTR | CAA | ALIAS) + [changes.{index}.add.records.{index}.type] (unknown | A | AAAA | CNAME | TXT | SRV | TLSA | MX | NS | PTR | CAA | ALIAS | LOC | SSHFP | HINFO | RP | URI | DS | NAPTR) [changes.{index}.add.records.{index}.comment] [changes.{index}.add.records.{index}.geo-ip-config.matches.{index}.countries.{index}] [changes.{index}.add.records.{index}.geo-ip-config.matches.{index}.continents.{index}] @@ -45,14 +45,14 @@ ARGS: [changes.{index}.add.records.{index}.id] [changes.{index}.set.id] [changes.{index}.set.id-fields.name] - [changes.{index}.set.id-fields.type] (unknown | A | AAAA | CNAME | TXT | SRV | TLSA | MX | NS | PTR | CAA | ALIAS) + [changes.{index}.set.id-fields.type] (unknown | A | AAAA | CNAME | TXT | SRV | TLSA | MX | NS | PTR | CAA | ALIAS | LOC | SSHFP | HINFO | RP | URI | DS | NAPTR) [changes.{index}.set.id-fields.data] [changes.{index}.set.id-fields.ttl] [changes.{index}.set.records.{index}.data] [changes.{index}.set.records.{index}.name] [changes.{index}.set.records.{index}.priority] [changes.{index}.set.records.{index}.ttl] - [changes.{index}.set.records.{index}.type] (unknown | A | AAAA | CNAME | TXT | SRV | TLSA | MX | NS | PTR | CAA | ALIAS) + [changes.{index}.set.records.{index}.type] (unknown | A | AAAA | CNAME | TXT | SRV | TLSA | MX | NS | PTR | CAA | ALIAS | LOC | SSHFP | HINFO | RP | URI | DS | NAPTR) [changes.{index}.set.records.{index}.comment] [changes.{index}.set.records.{index}.geo-ip-config.matches.{index}.countries.{index}] [changes.{index}.set.records.{index}.geo-ip-config.matches.{index}.continents.{index}] @@ -70,7 +70,7 @@ ARGS: [changes.{index}.set.records.{index}.id] [changes.{index}.delete.id] [changes.{index}.delete.id-fields.name] - [changes.{index}.delete.id-fields.type] (unknown | A | AAAA | CNAME | TXT | SRV | TLSA | MX | NS | PTR | CAA | ALIAS) + [changes.{index}.delete.id-fields.type] (unknown | A | AAAA | CNAME | TXT | SRV | TLSA | MX | NS | PTR | CAA | ALIAS | LOC | SSHFP | HINFO | RP | URI | DS | NAPTR) [changes.{index}.delete.id-fields.data] [changes.{index}.delete.id-fields.ttl] [return-all-records] Whether or not to return all the records diff --git a/cmd/scw/testdata/test-all-usage-dns-record-list-usage.golden b/cmd/scw/testdata/test-all-usage-dns-record-list-usage.golden index 1b83ff2f03..af93171b6c 100644 --- a/cmd/scw/testdata/test-all-usage-dns-record-list-usage.golden +++ b/cmd/scw/testdata/test-all-usage-dns-record-list-usage.golden @@ -11,7 +11,7 @@ ARGS: [order-by] The sort order of the returned DNS zone records (name_asc | name_desc) dns-zone The DNS zone on which to filter the returned DNS zone records [name] The name on which to filter the returned DNS zone records - [type] The record type on which to filter the returned DNS zone records (unknown | A | AAAA | CNAME | TXT | SRV | TLSA | MX | NS | PTR | CAA | ALIAS) + [type] The record type on which to filter the returned DNS zone records (unknown | A | AAAA | CNAME | TXT | SRV | TLSA | MX | NS | PTR | CAA | ALIAS | LOC | SSHFP | HINFO | RP | URI | DS | NAPTR) FLAGS: -h, --help help for list diff --git a/docs/commands/dns.md b/docs/commands/dns.md index 6533333b2b..c3ce4f4319 100644 --- a/docs/commands/dns.md +++ b/docs/commands/dns.md @@ -198,7 +198,7 @@ scw dns record bulk-update [arg=value ...] | changes.{index}.add.records.{index}.name | | | | changes.{index}.add.records.{index}.priority | | | | changes.{index}.add.records.{index}.ttl | | | -| changes.{index}.add.records.{index}.type | One of: `unknown`, `A`, `AAAA`, `CNAME`, `TXT`, `SRV`, `TLSA`, `MX`, `NS`, `PTR`, `CAA`, `ALIAS` | | +| changes.{index}.add.records.{index}.type | One of: `unknown`, `A`, `AAAA`, `CNAME`, `TXT`, `SRV`, `TLSA`, `MX`, `NS`, `PTR`, `CAA`, `ALIAS`, `LOC`, `SSHFP`, `HINFO`, `RP`, `URI`, `DS`, `NAPTR` | | | changes.{index}.add.records.{index}.comment | | | | changes.{index}.add.records.{index}.geo-ip-config.matches.{index}.countries.{index} | | | | changes.{index}.add.records.{index}.geo-ip-config.matches.{index}.continents.{index} | | | @@ -216,14 +216,14 @@ scw dns record bulk-update [arg=value ...] | changes.{index}.add.records.{index}.id | | | | changes.{index}.set.id | | | | changes.{index}.set.id-fields.name | | | -| changes.{index}.set.id-fields.type | One of: `unknown`, `A`, `AAAA`, `CNAME`, `TXT`, `SRV`, `TLSA`, `MX`, `NS`, `PTR`, `CAA`, `ALIAS` | | +| changes.{index}.set.id-fields.type | One of: `unknown`, `A`, `AAAA`, `CNAME`, `TXT`, `SRV`, `TLSA`, `MX`, `NS`, `PTR`, `CAA`, `ALIAS`, `LOC`, `SSHFP`, `HINFO`, `RP`, `URI`, `DS`, `NAPTR` | | | changes.{index}.set.id-fields.data | | | | changes.{index}.set.id-fields.ttl | | | | changes.{index}.set.records.{index}.data | | | | changes.{index}.set.records.{index}.name | | | | changes.{index}.set.records.{index}.priority | | | | changes.{index}.set.records.{index}.ttl | | | -| changes.{index}.set.records.{index}.type | One of: `unknown`, `A`, `AAAA`, `CNAME`, `TXT`, `SRV`, `TLSA`, `MX`, `NS`, `PTR`, `CAA`, `ALIAS` | | +| changes.{index}.set.records.{index}.type | One of: `unknown`, `A`, `AAAA`, `CNAME`, `TXT`, `SRV`, `TLSA`, `MX`, `NS`, `PTR`, `CAA`, `ALIAS`, `LOC`, `SSHFP`, `HINFO`, `RP`, `URI`, `DS`, `NAPTR` | | | changes.{index}.set.records.{index}.comment | | | | changes.{index}.set.records.{index}.geo-ip-config.matches.{index}.countries.{index} | | | | changes.{index}.set.records.{index}.geo-ip-config.matches.{index}.continents.{index} | | | @@ -241,7 +241,7 @@ scw dns record bulk-update [arg=value ...] | changes.{index}.set.records.{index}.id | | | | changes.{index}.delete.id | | | | changes.{index}.delete.id-fields.name | | | -| changes.{index}.delete.id-fields.type | One of: `unknown`, `A`, `AAAA`, `CNAME`, `TXT`, `SRV`, `TLSA`, `MX`, `NS`, `PTR`, `CAA`, `ALIAS` | | +| changes.{index}.delete.id-fields.type | One of: `unknown`, `A`, `AAAA`, `CNAME`, `TXT`, `SRV`, `TLSA`, `MX`, `NS`, `PTR`, `CAA`, `ALIAS`, `LOC`, `SSHFP`, `HINFO`, `RP`, `URI`, `DS`, `NAPTR` | | | changes.{index}.delete.id-fields.data | | | | changes.{index}.delete.id-fields.ttl | | | | return-all-records | | Whether or not to return all the records | @@ -314,7 +314,7 @@ scw dns record list [arg=value ...] | order-by | One of: `name_asc`, `name_desc` | The sort order of the returned DNS zone records | | dns-zone | Required | The DNS zone on which to filter the returned DNS zone records | | name | | The name on which to filter the returned DNS zone records | -| type | One of: `unknown`, `A`, `AAAA`, `CNAME`, `TXT`, `SRV`, `TLSA`, `MX`, `NS`, `PTR`, `CAA`, `ALIAS` | The record type on which to filter the returned DNS zone records | +| type | One of: `unknown`, `A`, `AAAA`, `CNAME`, `TXT`, `SRV`, `TLSA`, `MX`, `NS`, `PTR`, `CAA`, `ALIAS`, `LOC`, `SSHFP`, `HINFO`, `RP`, `URI`, `DS`, `NAPTR` | The record type on which to filter the returned DNS zone records |