Merge branch 'main' into feat/firewall-rule-enable-disable

Author: mgajda

.github/workflows/publish.yml

@@ -23,7 +23,7 @@ jobs:
       # - name: Set up QEMU
       #   uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2.2.0
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
       - name: DockerHub Login
         uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
         with:

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Log API requests and responses when using global `--debug` option.
+
 ## [3.27.0] - 2025-12-31
 
 ### Added

go.mod

@@ -9,7 +9,6 @@ require (
 	github.com/UpCloudLtd/upcloud-go-api/v8 v8.33.0
 	github.com/adrg/xdg v0.5.3
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
-	github.com/gemalto/flume v1.0.0
 	github.com/jedib0t/go-pretty/v6 v6.7.8
 	github.com/joho/godotenv v1.5.1
 	github.com/m7shapan/cidr v0.0.0-20200427124835-7eba0889a5d2
@@ -43,8 +42,6 @@ require (
 	github.com/Masterminds/semver/v3 v3.4.0 // indirect
 	github.com/Masterminds/sprig/v3 v3.3.0 // indirect
 	github.com/Masterminds/squirrel v1.5.4 // indirect
-	github.com/ansel1/merry v1.7.0 // indirect
-	github.com/ansel1/merry/v2 v2.1.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/chai2010/gettext-go v1.0.2 // indirect
 	github.com/containerd/containerd v1.7.29 // indirect
@@ -94,7 +91,6 @@ require (
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-runewidth v0.0.16 // indirect
-	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
@@ -125,8 +121,6 @@ require (
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
-	go.uber.org/zap v1.27.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.3 // indirect
 	golang.org/x/net v0.47.0 // indirect
 	golang.org/x/oauth2 v0.30.0 // indirect

go.sum

@@ -9,7 +9,6 @@ import (
 
 	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud"
 	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud/request"
-	"github.com/gemalto/flume"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -40,7 +39,7 @@ func TestDeleteCommand(t *testing.T) {
 			conf := config.New()
 			c := commands.BuildCommand(DeleteCommand(), nil, conf)
 
-			_, err := c.(commands.MultipleArgumentCommand).Execute(commands.NewExecutor(conf, &mService, flume.New("test")), test.arg)
+			_, err := c.(commands.MultipleArgumentCommand).Execute(commands.NewExecutor(conf, &mService, conf.NewLogger("test")), test.arg)
 
 			if test.error != "" {
 				assert.EqualError(t, err, test.error)

internal/commands/account/delete_test.go

@@ -7,7 +7,6 @@ import (
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/config"
 	smock "github.com/UpCloudLtd/upcloud-cli/v3/internal/mock"
 	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud/request"
-	"github.com/gemalto/flume"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -19,7 +18,7 @@ func TestDeleteCommand(t *testing.T) {
 	svc.On("DeleteToken", dr).Once().Return(nil)
 
 	command := commands.BuildCommand(DeleteCommand(), nil, conf)
-	_, err := command.(commands.MultipleArgumentCommand).Execute(commands.NewExecutor(conf, svc, flume.New("test")), dr.ID)
+	_, err := command.(commands.MultipleArgumentCommand).Execute(commands.NewExecutor(conf, svc, conf.NewLogger("test")), dr.ID)
 	assert.NoError(t, err)
 
 	svc.AssertExpectations(t)

internal/commands/account/token/delete_test.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/testutils"
 	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud"
-	"github.com/gemalto/flume"
 	"github.com/jedib0t/go-pretty/v6/text"
 	"github.com/stretchr/testify/assert"
 )
@@ -57,7 +56,7 @@ func TestListCommand(t *testing.T) {
 	conf.Viper().Set(config.KeyOutput, config.ValueOutputHuman)
 
 	command := commands.BuildCommand(ListCommand(), nil, conf)
-	out, err := command.(commands.NoArgumentCommand).ExecuteWithoutArguments(commands.NewExecutor(conf, svc, flume.New("test")))
+	out, err := command.(commands.NoArgumentCommand).ExecuteWithoutArguments(commands.NewExecutor(conf, svc, conf.NewLogger("test")))
 	assert.NoError(t, err)
 
 	buf := bytes.NewBuffer(nil)

internal/commands/account/token/list_test.go

@@ -12,7 +12,6 @@ import (
 	"github.com/UpCloudLtd/upcloud-cli/v3/internal/testutils"
 	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud"
 	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud/request"
-	"github.com/gemalto/flume"
 	"github.com/jedib0t/go-pretty/v6/text"
 	"github.com/stretchr/testify/assert"
 )
@@ -52,7 +51,7 @@ func TestShowCommand(t *testing.T) {
 	conf.Viper().Set(config.KeyOutput, config.ValueOutputHuman)
 
 	command := commands.BuildCommand(ShowCommand(), nil, conf)
-	out, err := command.(commands.MultipleArgumentCommand).Execute(commands.NewExecutor(conf, svc, flume.New("test")), token.ID)
+	out, err := command.(commands.MultipleArgumentCommand).Execute(commands.NewExecutor(conf, svc, conf.NewLogger("test")), token.ID)
 	assert.NoError(t, err)
 
 	buf := bytes.NewBuffer(nil)

internal/commands/account/token/show_test.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud"
 	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud/request"
-	"github.com/gemalto/flume"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -41,7 +40,7 @@ func TestDeleteCommand(t *testing.T) {
 			conf := config.New()
 			c := commands.BuildCommand(DeleteCommand(), nil, conf)
 
-			_, err := c.(commands.MultipleArgumentCommand).Execute(commands.NewExecutor(conf, &mService, flume.New("test")), test.arg)
+			_, err := c.(commands.MultipleArgumentCommand).Execute(commands.NewExecutor(conf, &mService, conf.NewLogger("test")), test.arg)
 
 			if test.error != "" {
 				assert.EqualError(t, err, test.error)

internal/commands/database/delete_test.go

@@ -3,6 +3,7 @@ package commands
 import (
 	"context"
 	"fmt"
+	"log/slog"
 	"os"
 	"os/signal"
 	"time"
@@ -15,7 +16,6 @@ import (
 	internal "github.com/UpCloudLtd/upcloud-cli/v3/internal/service"
 
 	"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud/service"
-	"github.com/gemalto/flume"
 )
 
 // Executor represents the execution context for commands
@@ -51,7 +51,7 @@ type executorImpl struct {
 	Config     *config.Config
 	progress   *progress.Progress
 	service    internal.AllServices
-	logger     flume.Logger
+	logger     *slog.Logger
 	sigIntChan chan os.Signal
 }
 
@@ -153,10 +153,10 @@ func (e executorImpl) All() internal.AllServices {
 }
 
 // NewExecutor creates the default Executor
-func NewExecutor(cfg *config.Config, svc internal.AllServices, logger flume.Logger) Executor {
+func NewExecutor(cfg *config.Config, svc internal.AllServices, logger *slog.Logger) Executor {
 	executor := &executorImpl{
 		Config:     cfg,
-		progress:   progress.NewProgress(config.GetProgressOutputConfig()),
+		progress:   progress.NewProgress(config.GetProgressOutputConfig(cfg)),
 		logger:     logger,
 		service:    svc,
 		sigIntChan: make(chan os.Signal, 1),