resolved merge conflicts

Author: Kaan Yalti

internal/pkg/agent/application/coordinator/coordinator_unit_test.go

@@ -15,25 +15,14 @@ import (
 	"errors"
 	"fmt"
 	"net"
-<<<<<<< HEAD
-	"testing"
-	"time"
-
-=======
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"path/filepath"
-	"strings"
 	"sync"
 	"testing"
 	"time"
 
-	"github.com/elastic/elastic-agent-client/v7/pkg/proto"
+	"github.com/elastic/elastic-agent/internal/pkg/config"
+	"github.com/elastic/elastic-agent/internal/pkg/fleetapi"
 	"github.com/elastic/elastic-agent/internal/pkg/fleetapi/acker"
-	"github.com/elastic/elastic-agent/internal/pkg/testutils"
 
->>>>>>> a7a76f6e1 (Enhancement/5235 use disk space error to set upgrade detail in coordinator (#9392))
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/status"
 	"go.opentelemetry.io/collector/component/componentstatus"
 	"go.opentelemetry.io/collector/confmap"
@@ -45,18 +34,12 @@ import (
 	"github.com/elastic/elastic-agent-libs/logp"
 	"github.com/elastic/elastic-agent/internal/pkg/agent/application/info"
 	"github.com/elastic/elastic-agent/internal/pkg/agent/application/monitoring/reload"
-<<<<<<< HEAD
-=======
-	"github.com/elastic/elastic-agent/internal/pkg/agent/application/paths"
 	"github.com/elastic/elastic-agent/internal/pkg/agent/application/reexec"
-	"github.com/elastic/elastic-agent/internal/pkg/agent/application/secret"
->>>>>>> a7a76f6e1 (Enhancement/5235 use disk space error to set upgrade detail in coordinator (#9392))
 	"github.com/elastic/elastic-agent/internal/pkg/agent/application/upgrade"
 	"github.com/elastic/elastic-agent/internal/pkg/agent/application/upgrade/artifact"
 	upgradeErrors "github.com/elastic/elastic-agent/internal/pkg/agent/application/upgrade/artifact/download/errors"
 	"github.com/elastic/elastic-agent/internal/pkg/agent/application/upgrade/details"
 	"github.com/elastic/elastic-agent/internal/pkg/agent/transpiler"
-	"github.com/elastic/elastic-agent/internal/pkg/config"
 	monitoringCfg "github.com/elastic/elastic-agent/internal/pkg/core/monitoring/config"
 	"github.com/elastic/elastic-agent/pkg/component"
 	"github.com/elastic/elastic-agent/pkg/component/runtime"
@@ -1461,157 +1444,6 @@ func (fs *fakeMonitoringServer) Reset() {
 func (fs *fakeMonitoringServer) Addr() net.Addr {
 	return nil
 }
-<<<<<<< HEAD
-=======
-
-func TestMergeFleetConfig(t *testing.T) {
-	testutils.InitStorage(t)
-
-	cfg := map[string]interface{}{
-		"fleet": map[string]interface{}{
-			"enabled":        true,
-			"kibana":         map[string]interface{}{"host": "demo"},
-			"access_api_key": "123",
-		},
-		"agent": map[string]interface{}{
-			"grpc": map[string]interface{}{
-				"port": uint16(6790),
-			},
-		},
-	}
-
-	path := paths.AgentConfigFile()
-	store, err := storage.NewEncryptedDiskStore(t.Context(), path)
-	require.NoError(t, err)
-
-	rawConfig := config.MustNewConfigFrom(cfg)
-	conf, err := mergeFleetConfig(t.Context(), rawConfig, store)
-	require.NoError(t, err)
-	assert.NotNil(t, conf)
-	assert.Equal(t, conf.Fleet.Enabled, cfg["fleet"].(map[string]interface{})["enabled"])
-	assert.Equal(t, conf.Fleet.AccessAPIKey, cfg["fleet"].(map[string]interface{})["access_api_key"])
-	assert.Equal(t, conf.Settings.GRPC.Port, cfg["agent"].(map[string]interface{})["grpc"].(map[string]interface{})["port"].(uint16))
-}
-
-func TestComputeEnrollOptions(t *testing.T) {
-	testutils.InitStorage(t)
-	tmp := t.TempDir()
-
-	storePath := filepath.Join(tmp, "fleet.enc")
-	cfgPath := filepath.Join(tmp, "elastic-agent.yml")
-
-	cfg := map[string]interface{}{
-		"fleet": map[string]interface{}{
-			"enabled":        true,
-			"access_api_key": "123",
-		},
-		"agent": map[string]interface{}{
-			"grpc": map[string]interface{}{
-				"port": uint16(6790),
-			},
-		},
-	}
-
-	rawAgentConfigData, err := yaml.Marshal(cfg)
-	require.NoError(t, err)
-
-	require.NoError(t, os.WriteFile(cfgPath, rawAgentConfigData, 0644))
-
-	store, err := storage.NewEncryptedDiskStore(t.Context(), storePath)
-	require.NoError(t, err)
-
-	fleetConfig := `fleet:
-  hosts: [localhost:1234]
-  ssl:
-    ca_sha256: ["sha1", "sha2"]
-    verification_mode: none
-  proxy_url: http://proxy.example.com:8080
-  proxy_disable: false
-  proxy_headers:
-    Proxy-Authorization: "Bearer token"
-    Custom-Header: "custom-value"
-  enrollment_token: enrollment-token-123
-  force: true
-  insecure: true
-  agent:
-    id: test-agent-id
-`
-	require.NoError(t, store.Save(bytes.NewReader([]byte(fleetConfig))))
-
-	options, err := computeEnrollOptions(t.Context(), cfgPath, storePath)
-	require.NoError(t, err)
-
-	require.NoError(t, err)
-	assert.NotNil(t, options)
-
-	assert.Equal(t, "123", options.EnrollAPIKey, "EnrollAPIKey mismatch")
-	assert.Equal(t, "http://localhost:1234", options.URL, "URL mismatch")
-
-	assert.Equal(t, []string{"sha1", "sha2"}, options.CASha256, "CASha256 mismatch")
-	assert.Equal(t, true, options.Insecure, "Insecure mismatch")
-	assert.Equal(t, "test-agent-id", options.ID, "ID mismatch")
-	assert.Equal(t, "http://proxy.example.com:8080", options.ProxyURL, "ProxyURL mismatch")
-	assert.Equal(t, false, options.ProxyDisabled, "ProxyDisabled mismatch")
-	expectedProxyHeaders := map[string]string{
-		"Proxy-Authorization": "Bearer token",
-		"Custom-Header":       "custom-value",
-	}
-	assert.Equal(t, expectedProxyHeaders, options.ProxyHeaders, "ProxyHeaders mismatch")
-}
-
-func TestHasEndpoint(t *testing.T) {
-	testCases := []struct {
-		name     string
-		state    State
-		expected bool
-	}{
-		{
-			"endpoint",
-			State{
-				Components: []runtime.ComponentComponentState{
-					{
-						Component: component.Component{
-							InputType: endpoint,
-						},
-					},
-				},
-			},
-			true,
-		},
-		{
-			"no endpoint",
-			State{
-				Components: []runtime.ComponentComponentState{
-					{
-						Component: component.Component{
-							InputType: "not endpoint",
-						},
-					},
-				},
-			},
-			false,
-		},
-
-		{
-			"no component",
-			State{
-				Components: []runtime.ComponentComponentState{},
-			},
-			false,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			c := &Coordinator{
-				state: tc.state,
-			}
-
-			result := c.HasEndpoint()
-			assert.Equal(t, tc.expected, result, "HasEndpoint result mismatch")
-		})
-	}
-}
 
 type mockUpgradeManager struct {
 	upgradeErr error
@@ -1625,7 +1457,7 @@ func (m *mockUpgradeManager) Reload(cfg *config.Config) error {
 	return nil
 }
 
-func (m *mockUpgradeManager) Upgrade(ctx context.Context, version string, rollback bool, sourceURI string, action *fleetapi.ActionUpgrade, details *details.Details, skipVerifyOverride bool, skipDefaultPgp bool, pgpBytes ...string) (_ reexec.ShutdownCallbackFn, err error) {
+func (m *mockUpgradeManager) Upgrade(ctx context.Context, version string, sourceURI string, action *fleetapi.ActionUpgrade, details *details.Details, skipVerifyOverride bool, skipDefaultPgp bool, pgpBytes ...string) (_ reexec.ShutdownCallbackFn, err error) {
 	return nil, m.upgradeErr
 }
 
@@ -1709,4 +1541,3 @@ func TestCoordinator_Upgrade_InsufficientDiskSpaceError(t *testing.T) {
 		},
 	}, upgradeDetails)
 }
->>>>>>> a7a76f6e1 (Enhancement/5235 use disk space error to set upgrade detail in coordinator (#9392))