feat(serverless): add support for get-logs (#2919)

Co-authored-by: Rémy Léone <rleone@scaleway.com>

Author: scaleway-bot

cmd/scw/testdata/test-all-usage-container-container-get-logs-usage.golden

@@ -0,0 +1,20 @@
+🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
+🟥🟥🟥 STDERR️️ 🟥🟥🟥️
+List your container logs.
+
+USAGE:
+  scw container container get-logs <container-id ...> [arg=value ...]
+
+ARGS:
+  container-id      
+  [order-by]         (timestamp_desc | timestamp_asc)
+  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw | all)
+
+FLAGS:
+  -h, --help   help for get-logs
+
+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

cmd/scw/testdata/test-all-usage-container-container-usage.golden

@@ -10,6 +10,7 @@ AVAILABLE COMMANDS:
   delete      Delete a container
   deploy      Deploy a container
   get         Get a container
+  get-logs    List your container logs
   list        List all your containers
   update      Update an existing container
 

cmd/scw/testdata/test-all-usage-function-function-get-logs-usage.golden

@@ -0,0 +1,20 @@
+🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
+🟥🟥🟥 STDERR️️ 🟥🟥🟥️
+List your application logs.
+
+USAGE:
+  scw function function get-logs <function-id ...> [arg=value ...]
+
+ARGS:
+  function-id       
+  [order-by]         (timestamp_desc | timestamp_asc)
+  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw | all)
+
+FLAGS:
+  -h, --help   help for get-logs
+
+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

cmd/scw/testdata/test-all-usage-function-function-usage.golden

@@ -11,6 +11,7 @@ AVAILABLE COMMANDS:
   deploy           Deploy a function
   get              Get a function
   get-download-url Get a download URL of a function
+  get-logs         List your application logs
   get-upload-url   Get an upload URL of a function
   list             List all your functions
   update           Update an existing function

cmd/scw/testdata/test-all-usage-function-usage.golden

@@ -9,7 +9,6 @@ AVAILABLE COMMANDS:
   cron        Cron management commands
   domain      Domain management commands
   function    Function management commands
-  logs        Logs management commands
   namespace   Function namespace management commands
   runtime     Runtime management commands
   token       Token management commands

docs/commands/container.md

@@ -7,6 +7,7 @@ Containers API.
   - [Delete a container](#delete-a-container)
   - [Deploy a container](#deploy-a-container)
   - [Get a container](#get-a-container)
+  - [List your container logs](#list-your-container-logs)
   - [List all your containers](#list-all-your-containers)
   - [Update an existing container](#update-an-existing-container)
 - [Cron management commands](#cron-management-commands)
@@ -134,6 +135,27 @@ scw container container get <container-id ...> [arg=value ...]
 
 
 
+### List your container logs
+
+List your container logs.
+
+**Usage:**
+
+```
+scw container container get-logs <container-id ...> [arg=value ...]
+```
+
+
+**Args:**
+
+| Name |   | Description |
+|------|---|-------------|
+| container-id | Required |  |
+| order-by | One of: `timestamp_desc`, `timestamp_asc` |  |
+| region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw`, `all` | Region to target. If none is passed will use default region from the config |
+
+
+
 ### List all your containers
 
 List all your containers.

docs/commands/function.md

@@ -19,11 +19,10 @@ Functions API.
   - [Deploy a function](#deploy-a-function)
   - [Get a function](#get-a-function)
   - [Get a download URL of a function](#get-a-download-url-of-a-function)
+  - [List your application logs](#list-your-application-logs)
   - [Get an upload URL of a function](#get-an-upload-url-of-a-function)
   - [List all your functions](#list-all-your-functions)
   - [Update an existing function](#update-an-existing-function)
-- [Logs management commands](#logs-management-commands)
-  - [List your application logs](#list-your-application-logs)
 - [Function namespace management commands](#function-namespace-management-commands)
   - [Create a new namespace](#create-a-new-namespace)
   - [Delete an existing namespace](#delete-an-existing-namespace)
@@ -358,6 +357,27 @@ scw function function get-download-url <function-id ...> [arg=value ...]
 
 
 
+### List your application logs
+
+List your application logs.
+
+**Usage:**
+
+```
+scw function function get-logs <function-id ...> [arg=value ...]
+```
+
+
+**Args:**
+
+| Name |   | Description |
+|------|---|-------------|
+| function-id | Required |  |
+| order-by | One of: `timestamp_desc`, `timestamp_asc` |  |
+| region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw`, `all` | Region to target. If none is passed will use default region from the config |
+
+
+
 ### Get an upload URL of a function
 
 Get an upload URL of a function associated with the given id.
@@ -437,32 +457,6 @@ scw function function update <function-id ...> [arg=value ...]
 
 
 
-## Logs management commands
-
-Logs management commands.
-
-
-### List your application logs
-
-List your application logs.
-
-**Usage:**
-
-```
-scw function logs list [arg=value ...]
-```
-
-
-**Args:**
-
-| Name |   | Description |
-|------|---|-------------|
-| function-id | Required |  |
-| order-by | One of: `timestamp_desc`, `timestamp_asc` |  |
-| region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw`, `all` | Region to target. If none is passed will use default region from the config |
-
-
-
 ## Function namespace management commands
 
 Function namespace management commands.

internal/namespaces/container/v1beta1/container_cli.go

@@ -41,6 +41,7 @@ func GetGeneratedCommands() *core.Commands {
 		containerCronCreate(),
 		containerCronUpdate(),
 		containerCronDelete(),
+		containerContainerGetLogs(),
 		containerDomainList(),
 		containerDomainGet(),
 		containerDomainCreate(),
@@ -941,6 +942,51 @@ func containerCronDelete() *core.Command {
 	}
 }
 
+func containerContainerGetLogs() *core.Command {
+	return &core.Command{
+		Short:     `List your container logs`,
+		Long:      `List your container logs.`,
+		Namespace: "container",
+		Resource:  "container",
+		Verb:      "get-logs",
+		// Deprecated:    false,
+		ArgsType: reflect.TypeOf(container.ListLogsRequest{}),
+		ArgSpecs: core.ArgSpecs{
+			{
+				Name:       "container-id",
+				Required:   true,
+				Deprecated: false,
+				Positional: true,
+			},
+			{
+				Name:       "order-by",
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+				EnumValues: []string{"timestamp_desc", "timestamp_asc"},
+			},
+			core.RegionArgSpec(scw.RegionFrPar, scw.RegionNlAms, scw.RegionPlWaw, scw.Region(core.AllLocalities)),
+		},
+		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
+			request := args.(*container.ListLogsRequest)
+
+			client := core.ExtractClient(ctx)
+			api := container.NewAPI(client)
+			opts := []scw.RequestOption{scw.WithAllPages()}
+			if request.Region == scw.Region(core.AllLocalities) {
+				opts = append(opts, scw.WithRegions(api.Regions()...))
+				request.Region = ""
+			}
+			resp, err := api.ListLogs(request, opts...)
+			if err != nil {
+				return nil, err
+			}
+			return resp.Logs, nil
+
+		},
+	}
+}
+
 func containerDomainList() *core.Command {
 	return &core.Command{
 		Short:     `List all domain name bindings`,

internal/namespaces/function/v1beta1/function_cli.go

@@ -24,7 +24,6 @@ func GetGeneratedCommands() *core.Commands {
 		functionFunction(),
 		functionCron(),
 		functionRuntime(),
-		functionLogs(),
 		functionDomain(),
 		functionToken(),
 		functionNamespaceList(),
@@ -46,7 +45,7 @@ func GetGeneratedCommands() *core.Commands {
 		functionCronCreate(),
 		functionCronUpdate(),
 		functionCronDelete(),
-		functionLogsList(),
+		functionFunctionGetLogs(),
 		functionDomainList(),
 		functionDomainGet(),
 		functionDomainCreate(),
@@ -101,15 +100,6 @@ func functionRuntime() *core.Command {
 	}
 }
 
-func functionLogs() *core.Command {
-	return &core.Command{
-		Short:     `Logs management commands`,
-		Long:      `Logs management commands.`,
-		Namespace: "function",
-		Resource:  "logs",
-	}
-}
-
 func functionDomain() *core.Command {
 	return &core.Command{
 		Short:     `Domain management commands`,
@@ -1063,21 +1053,21 @@ func functionCronDelete() *core.Command {
 	}
 }
 
-func functionLogsList() *core.Command {
+func functionFunctionGetLogs() *core.Command {
 	return &core.Command{
 		Short:     `List your application logs`,
 		Long:      `List your application logs.`,
 		Namespace: "function",
-		Resource:  "logs",
-		Verb:      "list",
+		Resource:  "function",
+		Verb:      "get-logs",
 		// Deprecated:    false,
 		ArgsType: reflect.TypeOf(function.ListLogsRequest{}),
 		ArgSpecs: core.ArgSpecs{
 			{
 				Name:       "function-id",
 				Required:   true,
 				Deprecated: false,
-				Positional: false,
+				Positional: true,
 			},
 			{
 				Name:       "order-by",