Skip to content

Commit 970f779

Browse files
authored
Merge branch 'master' into v1.3598.0
2 parents 7174201 + 69821b1 commit 970f779

2 files changed

Lines changed: 45 additions & 58 deletions

File tree

internal/namespaces/secret/v1alpha1/secret_cli.go

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -349,44 +349,9 @@ func secretVersionCreate() *core.Command {
349349
Deprecated: false,
350350
Positional: false,
351351
},
352-
{
353-
Name: "password-generation.length",
354-
Short: `Length of the password to generate (between 1 and 1024)`,
355-
Required: false,
356-
Deprecated: false,
357-
Positional: false,
358-
},
359-
{
360-
Name: "password-generation.no-lowercase-letters",
361-
Short: `Do not include lower case letters by default in the alphabet`,
362-
Required: false,
363-
Deprecated: false,
364-
Positional: false,
365-
},
366-
{
367-
Name: "password-generation.no-uppercase-letters",
368-
Short: `Do not include upper case letters by default in the alphabet`,
369-
Required: false,
370-
Deprecated: false,
371-
Positional: false,
372-
},
373-
{
374-
Name: "password-generation.no-digits",
375-
Short: `Do not include digits by default in the alphabet`,
376-
Required: false,
377-
Deprecated: false,
378-
Positional: false,
379-
},
380-
{
381-
Name: "password-generation.additional-chars",
382-
Short: `Additional ascii characters to be included in the alphabet`,
383-
Required: false,
384-
Deprecated: false,
385-
Positional: false,
386-
},
387352
{
388353
Name: "data-crc32",
389-
Short: `The CRC32 checksum of the data as a base-10 integer`,
354+
Short: `(Optional.) The CRC32 checksum of the data as a base-10 integer`,
390355
Required: false,
391356
Deprecated: false,
392357
Positional: false,

internal/namespaces/tem/v1alpha1/tem_cli.go

Lines changed: 44 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,15 @@ func temEmailGet() *core.Command {
221221

222222
func temEmailList() *core.Command {
223223
return &core.Command{
224-
Short: `List emails`,
225-
Long: `Retrieve the list of emails sent from a specific domain or for a specific Project or Organization. You must specify the ` + "`" + `region` + "`" + `.`,
224+
Short: `List emails`,
225+
Long: `Retrieve the list of emails sent from a specific domain or for a specific Project or Organization. You must specify the ` + "`" + `region` + "`" + `.
226+
You can filter your emails in ascending or descending order using:
227+
- created_at
228+
- updated_at
229+
- status
230+
- mail_from
231+
- mail_rcpt
232+
- subject.`,
226233
Namespace: "tem",
227234
Resource: "email",
228235
Verb: "list",
@@ -231,68 +238,83 @@ func temEmailList() *core.Command {
231238
ArgSpecs: core.ArgSpecs{
232239
{
233240
Name: "project-id",
234-
Short: `ID of the Project in which to list the emails (optional)`,
241+
Short: `(Optional) ID of the Project in which to list the emails`,
235242
Required: false,
236243
Deprecated: false,
237244
Positional: false,
238245
},
239246
{
240247
Name: "domain-id",
241-
Short: `ID of the domain for which to list the emails (optional)`,
248+
Short: `(Optional) ID of the domain for which to list the emails`,
242249
Required: false,
243250
Deprecated: false,
244251
Positional: false,
245252
},
246253
{
247254
Name: "message-id",
248-
Short: `ID of the message for which to list the emails (optional)`,
249-
Required: false,
250-
Deprecated: false,
251-
Positional: false,
252-
},
253-
{
254-
Name: "subject",
255-
Short: `Subject of the email`,
255+
Short: `(Optional) ID of the message for which to list the emails`,
256256
Required: false,
257257
Deprecated: false,
258258
Positional: false,
259259
},
260260
{
261261
Name: "since",
262-
Short: `List emails created after this date (optional)`,
262+
Short: `(Optional) List emails created after this date`,
263263
Required: false,
264264
Deprecated: false,
265265
Positional: false,
266266
},
267267
{
268268
Name: "until",
269-
Short: `List emails created before this date (optional)`,
269+
Short: `(Optional) List emails created before this date`,
270270
Required: false,
271271
Deprecated: false,
272272
Positional: false,
273273
},
274274
{
275275
Name: "mail-from",
276-
Short: `List emails sent with this ` + "`" + `mail_from` + "`" + ` sender's address (optional)`,
276+
Short: `(Optional) List emails sent with this sender's email address`,
277277
Required: false,
278278
Deprecated: false,
279279
Positional: false,
280280
},
281281
{
282282
Name: "mail-to",
283-
Short: `List emails sent with this ` + "`" + `mail_to` + "`" + ` recipient's address (optional)`,
283+
Short: `(Deprecated) List emails sent to this recipient's email address`,
284+
Required: false,
285+
Deprecated: true,
286+
Positional: false,
287+
},
288+
{
289+
Name: "mail-rcpt",
290+
Short: `(Optional) List emails sent to this recipient's email address`,
284291
Required: false,
285292
Deprecated: false,
286293
Positional: false,
287294
},
288295
{
289296
Name: "statuses.{index}",
290-
Short: `List emails having any of this status (optional)`,
297+
Short: `(Optional) List emails with any of these statuses`,
291298
Required: false,
292299
Deprecated: false,
293300
Positional: false,
294301
EnumValues: []string{"unknown", "new", "sending", "sent", "failed", "canceled"},
295302
},
303+
{
304+
Name: "subject",
305+
Short: `(Optional) List emails with this subject`,
306+
Required: false,
307+
Deprecated: false,
308+
Positional: false,
309+
},
310+
{
311+
Name: "order-by",
312+
Short: `(Optional) List emails corresponding to specific criteria`,
313+
Required: false,
314+
Deprecated: false,
315+
Positional: false,
316+
EnumValues: []string{"created_at_desc", "created_at_asc", "updated_at_desc", "updated_at_asc", "status_desc", "status_asc", "mail_from_desc", "mail_from_asc", "mail_rcpt_desc", "mail_rcpt_asc", "subject_desc", "subject_asc"},
317+
},
296318
core.RegionArgSpec(scw.RegionFrPar, scw.Region(core.AllLocalities)),
297319
},
298320
Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
@@ -327,35 +349,35 @@ func temEmailGetStatistics() *core.Command {
327349
ArgSpecs: core.ArgSpecs{
328350
{
329351
Name: "project-id",
330-
Short: `Number of emails for this Project (optional)`,
352+
Short: `(Optional) Number of emails for this Project`,
331353
Required: false,
332354
Deprecated: false,
333355
Positional: false,
334356
},
335357
{
336358
Name: "domain-id",
337-
Short: `Number of emails sent from this domain (must be coherent with the ` + "`" + `project_id` + "`" + ` and the ` + "`" + `organization_id` + "`" + `) (optional)`,
359+
Short: `(Optional) Number of emails sent from this domain (must be coherent with the ` + "`" + `project_id` + "`" + ` and the ` + "`" + `organization_id` + "`" + `)`,
338360
Required: false,
339361
Deprecated: false,
340362
Positional: false,
341363
},
342364
{
343365
Name: "since",
344-
Short: `Number of emails created after this date (optional)`,
366+
Short: `(Optional) Number of emails created after this date`,
345367
Required: false,
346368
Deprecated: false,
347369
Positional: false,
348370
},
349371
{
350372
Name: "until",
351-
Short: `Number of emails created before this date (optional)`,
373+
Short: `(Optional) Number of emails created before this date`,
352374
Required: false,
353375
Deprecated: false,
354376
Positional: false,
355377
},
356378
{
357379
Name: "mail-from",
358-
Short: `Number of emails sent with this ` + "`" + `mail_from` + "`" + ` sender's address (optional)`,
380+
Short: `(Optional) Number of emails sent with this sender's email address`,
359381
Required: false,
360382
Deprecated: false,
361383
Positional: false,

0 commit comments

Comments
 (0)