finishing touch + c/g + doc + lint

Author: Mia-Cross

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

@@ -0,0 +1,20 @@
+🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
+🟩🟩🟩 STDOUT️ 🟩🟩🟩️
+Display the logs of a container from the last 2 hours
+
+USAGE:
+  scw container container logs <container-id ...> [arg=value ...]
+
+ARGS:
+  container-id      ID of the container which logs are to be displayed
+  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+
+FLAGS:
+  -h, --help                help for logs
+      --list-sub-commands   List all subcommands
+
+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

@@ -13,6 +13,9 @@ AVAILABLE COMMANDS:
   redeploy    Redeploy a container
   update      Update the container associated with the specified ID.
 
+UTILITY COMMANDS:
+  logs        Show container logs
+
 FLAGS:
   -h, --help                help for container
       --list-sub-commands   List all subcommands

docs/commands/container.md

@@ -7,6 +7,7 @@ This API allows you to manage your Serverless Containers.
   - [Delete the container associated with the specified ID.](#delete-the-container-associated-with-the-specified-id.)
   - [Get the container associated with the specified ID.](#get-the-container-associated-with-the-specified-id.)
   - [List all containers the caller can access (read permission).](#list-all-containers-the-caller-can-access-(read-permission).)
+  - [Show container logs](#show-container-logs)
   - [Redeploy a container](#redeploy-a-container)
   - [Update the container associated with the specified ID.](#update-the-container-associated-with-the-specified-id.)
 - [Deploy a container](#deploy-a-container)
@@ -159,6 +160,26 @@ scw container container list [arg=value ...]
 
 
 
+### Show container logs
+
+Display the logs of a container from the last 2 hours
+
+**Usage:**
+
+```
+scw container container logs <container-id ...> [arg=value ...]
+```
+
+
+**Args:**
+
+| Name |   | Description |
+|------|---|-------------|
+| container-id |  | ID of the container which logs are to be displayed |
+| region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw` | Region to target. If none is passed will use default region from the config |
+
+
+
 ### Redeploy a container
 
 Performs a rollout of the container by creating new instances with the latest image version and terminating the old instances.

internal/namespaces/container/v1/custom.go

@@ -35,6 +35,13 @@ func GetCommands() *core.Commands {
 	cmds.MustFind("container", "namespace", "update").Override(containerNamespaceUpdateBuilder)
 	cmds.MustFind("container", "namespace", "delete").Override(containerNamespaceDeleteBuilder)
 
+	// Logs and Metrics
+	cmds.Merge(core.NewCommands(
+		containerLogs(),
+		// containerMetrics(), // TODO: coming soon
+	))
+
+	// Deploy
 	if cmdDeploy := containerDeployCommand(); cmdDeploy != nil {
 		cmds.Add(cmdDeploy)
 	}

internal/namespaces/container/v1/custom_container_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
-	container "github.com/scaleway/scaleway-cli/v2/internal/namespaces/container/v1"
+	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/container/v1"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/registry/v1"
 	"github.com/scaleway/scaleway-cli/v2/internal/testhelpers"
 	containerSDK "github.com/scaleway/scaleway-sdk-go/api/container/v1"

…espaces/container/v1beta1/custom_logs.go …l/namespaces/container/v1/custom_logs.gointernal/namespaces/container/v1beta1/custom_logs.go renamed to internal/namespaces/container/v1/custom_logs.go internal/namespaces/container/v1beta1/custom_logs.go renamed to internal/namespaces/container/v1/custom_logs.go

@@ -25,12 +25,12 @@ type containerLogsRequest struct {
 func containerLogs() *core.Command {
 	return &core.Command{
 		Short:     `Show container logs`,
-		Long:      ``, // TODO
+		Long:      `Display the logs of a container from the last 2 hours`,
 		Namespace: "container",
 		Resource:  "container",
 		Verb:      "logs",
-		// Groups:    []string{"workflow"}, // TODO
-		ArgsType: reflect.TypeOf(containerLogsRequest{}),
+		Groups:    []string{"utility"},
+		ArgsType:  reflect.TypeOf(containerLogsRequest{}),
 		ArgSpecs: core.ArgSpecs{
 			{
 				Name:       "container-id",
@@ -41,7 +41,6 @@ func containerLogs() *core.Command {
 				scw.RegionFrPar,
 				scw.RegionNlAms,
 				scw.RegionPlWaw,
-				scw.Region(core.AllLocalities), // TODO: test region=all
 			),
 		},
 		Run: containerLogsRun,
@@ -118,10 +117,10 @@ func buildLokiQuery(datasourceURL, containerID string) (*http.Request, error) {
 		`{resource_type="serverless_container", resource_id="%s"}`,
 		containerID,
 	)
-	start := time.Now().Add(-2 * time.Hour).Format(time.RFC3339) //"2026-01-26T16:00:00Z"
-	end := time.Now().Format(time.RFC3339)                       //"2026-01-26T16:30:00Z"
+	start := time.Now().Add(-2 * time.Hour).Format(time.RFC3339) // TODO: customize timespan ?
+	end := time.Now().Format(time.RFC3339)
 
-	reqURL := fmt.Sprintf("%s/loki/api/v1/query_range", datasourceURL)
+	reqURL := datasourceURL + "/loki/api/v1/query_range"
 
 	formData := url.Values{}
 	formData.Set("query", query)
@@ -165,8 +164,9 @@ func readLokiResponseBody(requestBody io.ReadCloser) ([]LogEntry, error) {
 		return nil, fmt.Errorf("Error parsing JSON: %v\n", err)
 	}
 
-	if len(lokiResp.Data.Result) == 0 { //|| len(lokiResp.Data.Result[0].Values) == 0 {
-		return nil, fmt.Errorf("No results found\n")
+	if len(lokiResp.Data.Result) == 0 {
+		// || len(lokiResp.Data.Result[0].Values) == 0 {    TODO: rework no-data case
+		return nil, errors.New("No results found\n")
 	}
 
 	var response []LogEntry
@@ -209,45 +209,9 @@ func deleteToken(
 func getOrCreateToken(
 	ctx context.Context,
 	cockpitAPI *cockpit.RegionalAPI,
-	region scw.Region, scope cockpit.TokenScope,
+	region scw.Region,
+	scope cockpit.TokenScope,
 ) (*cockpit.Token, bool, error) {
-	// var tokenToUse *cockpit.Token
-
-	readOnlyTokens, err := cockpitAPI.ListTokens(&cockpit.RegionalAPIListTokensRequest{
-		Region: region,
-		// ProjectID:   "",
-		TokenScopes: []cockpit.TokenScope{scope},
-	}, scw.WithAllPages(), scw.WithContext(ctx))
-	if err != nil {
-		return nil, false, err
-	}
-
-	for _, roToken := range readOnlyTokens.Tokens {
-		token, err := cockpitAPI.GetToken(&cockpit.RegionalAPIGetTokenRequest{
-			Region:  region,
-			TokenID: roToken.ID,
-		}, scw.WithContext(ctx))
-		if err != nil {
-			return nil, false, err
-		}
-
-		if token.SecretKey != nil {
-			return token, false, nil
-		}
-	}
-
-	//	fullAccessTokens, err := cockpitAPI.ListTokens(&cockpit.RegionalAPIListTokensRequest{
-	//		Region: region,
-	//		// ProjectID:   "",
-	//		TokenScopes: []cockpit.TokenScope{cockpit.TokenScopeFullAccessLogsRules},
-	//	}, scw.WithAllPages(), scw.WithContext(ctx))
-	//	if err != nil {
-	//		return nil, err
-	//	}
-	//
-	//	if len(fullAccessTokens.Tokens) > 0 {
-	//		tokenToUse = fullAccessTokens.Tokens[0]
-	//	} else {
 	token, err := cockpitAPI.CreateToken(&cockpit.RegionalAPICreateTokenRequest{
 		Region: region,
 		// ProjectID:   "",

…es/container/v1beta1/custom_logs_test.go …espaces/container/v1/custom_logs_test.gointernal/namespaces/container/v1beta1/custom_logs_test.go renamed to internal/namespaces/container/v1/custom_logs_test.go internal/namespaces/container/v1beta1/custom_logs_test.go renamed to internal/namespaces/container/v1/custom_logs_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
-	container "github.com/scaleway/scaleway-cli/v2/internal/namespaces/container/v1beta1"
+	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/container/v1"
 )
 
 func Test_ContainerLogs(t *testing.T) {
@@ -16,7 +16,7 @@ func Test_ContainerLogs(t *testing.T) {
 		BeforeFunc: core.BeforeFuncCombine(
 			createNamespace("Namespace"),
 			core.ExecStoreBeforeCmd("Container", fmt.Sprintf(
-				"scw container container create namespace-id={{ .Namespace.ID }} name=%s registry-image=%s -w",
+				"scw container container create namespace-id={{ .Namespace.ID }} name=%s image=%s -w",
 				core.GetRandomName("test-logs"),
 				image,
 			)),