fix merge conflicts

Author: jkroepke

core/auth/auth.go

@@ -235,9 +235,14 @@ func KeyAuth(cfg *config.Configuration) (http.RoundTripper, error) {
 }
 
 // StackitCliAuth configures the [clients.STACKITCLIFlow] and returns an http.RoundTripper
-func StackitCliAuth(_ *config.Configuration) (http.RoundTripper, error) {
+func StackitCliAuth(cfg *config.Configuration) (http.RoundTripper, error) {
+	cliCfg := clients.STACKITCLIFlowConfig{}
+	if cfg.HTTPClient != nil && cfg.HTTPClient.Transport != nil {
+		cliCfg.HTTPTransport = cfg.HTTPClient.Transport
+	}
+
 	client := &clients.STACKITCLIFlow{}
-	if err := client.Init(&clients.STACKITCLIFlowConfig{}); err != nil {
+	if err := client.Init(&cliCfg); err != nil {
 		return nil, fmt.Errorf("error initializing client: %w", err)
 	}
 

core/clients/stackit_cli_flow.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"errors"
+	"net/http"
 	"os"
 	"os/exec"
 	"runtime"
@@ -17,25 +18,25 @@ type STACKITCLIFlow struct {
 }
 
 // STACKITCLIFlowConfig is the flow config
-type STACKITCLIFlowConfig struct{}
+type STACKITCLIFlowConfig struct {
+	HTTPTransport http.RoundTripper
+}
 
 // GetConfig returns the flow configuration
 func (c *STACKITCLIFlow) GetConfig() STACKITCLIFlowConfig {
 	return STACKITCLIFlowConfig{}
 }
 
-func (c *STACKITCLIFlow) Init(_ *STACKITCLIFlowConfig) error {
+func (c *STACKITCLIFlow) Init(cfg *STACKITCLIFlowConfig) error {
 	token, err := c.getTokenFromCLI()
 	if err != nil {
 		return err
 	}
 
-	c.config = &TokenFlowConfig{
+	return c.TokenFlow.Init(&TokenFlowConfig{
 		ServiceAccountToken: strings.TrimSpace(token),
-	}
-
-	c.configureHTTPClient()
-	return c.validate()
+		HTTPTransport:       cfg.HTTPTransport,
+	})
 }
 
 func (c *STACKITCLIFlow) getTokenFromCLI() (string, error) {

core/clients/stackit_cli_flow_test.go

@@ -1,6 +1,7 @@
 package clients
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"net/http"
@@ -24,23 +25,25 @@ func TestSTACKITCLIFlow_Init(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			ctx := context.TODO()
+
 			c := &STACKITCLIFlow{}
 
-			_, _ = runSTACKITCLICommand(t.Context(), "stackit config profile delete test-stackit-cli-flow-init -y")
-			_, err := runSTACKITCLICommand(t.Context(), "stackit config profile create test-stackit-cli-flow-init")
+			_, _ = runSTACKITCLICommand(ctx, "stackit config profile delete test-stackit-cli-flow-init -y")
+			_, err := runSTACKITCLICommand(ctx, "stackit config profile create test-stackit-cli-flow-init")
 			if err != nil {
 				t.Errorf("runSTACKITCLICommand() error = %v", err)
 				return
 			}
 
-			_, err = runSTACKITCLICommand(t.Context(), "stackit auth activate-service-account --service-account-token="+testServiceAccountToken)
+			_, err = runSTACKITCLICommand(ctx, "stackit auth activate-service-account --service-account-token="+testServiceAccountToken)
 			if err != nil {
 				t.Errorf("runSTACKITCLICommand() error = %v", err)
 				return
 			}
 
 			defer func() {
-				_, _ = runSTACKITCLICommand(t.Context(), "stackit config profile delete test-stackit-cli-flow-init -y")
+				_, _ = runSTACKITCLICommand(ctx, "stackit config profile delete test-stackit-cli-flow-init -y")
 			}()
 
 			if err := c.Init(tt.args.cfg); (err != nil) != tt.wantErr {
@@ -70,21 +73,23 @@ func TestSTACKITCLIFlow_Do(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			_, _ = runSTACKITCLICommand(t.Context(), "stackit config profile delete test-stackit-cli-flow-do -y")
-			_, err := runSTACKITCLICommand(t.Context(), "stackit config profile create test-stackit-cli-flow-do")
+			ctx := context.TODO()
+
+			_, _ = runSTACKITCLICommand(ctx, "stackit config profile delete test-stackit-cli-flow-do -y")
+			_, err := runSTACKITCLICommand(ctx, "stackit config profile create test-stackit-cli-flow-do")
 			if err != nil {
 				t.Errorf("runSTACKITCLICommand() error = %v", err)
 				return
 			}
 
-			_, err = runSTACKITCLICommand(t.Context(), "stackit auth activate-service-account --service-account-token="+testServiceAccountToken)
+			_, err = runSTACKITCLICommand(ctx, "stackit auth activate-service-account --service-account-token="+testServiceAccountToken)
 			if err != nil {
 				t.Errorf("runSTACKITCLICommand() error = %v", err)
 				return
 			}
 
 			defer func() {
-				_, _ = runSTACKITCLICommand(t.Context(), "stackit config profile delete test-stackit-cli-flow-do -y")
+				_, _ = runSTACKITCLICommand(ctx, "stackit config profile delete test-stackit-cli-flow-do -y")
 			}()
 
 			c := &STACKITCLIFlow{}