update process agent API

DataDog · Dec 6, 2024 · 856cefb · 856cefb
1 parent b6aa3e2
commit 856cefb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/cmd/process-agent/subcommands/status/status.go b/cmd/process-agent/subcommands/status/status.go
@@ -28,8 +28,6 @@ import (
 	"github.com/DataDog/datadog-agent/pkg/util/fxutil"
 )
 
-var httpClient = apiutil.GetClient(false)
-
 const (
 	notRunning = `
 =============
@@ -111,6 +109,7 @@ func writeError(log log.Component, w io.Writer, e error) {
 }
 
 func fetchStatus(statusURL string) ([]byte, error) {
+	httpClient := apiutil.GetClient(false)
 	body, err := apiutil.DoGet(httpClient, statusURL, apiutil.LeaveConnectionOpen)
 	if err != nil {
 		return nil, status.NewConnectionError(err)

diff --git a/comp/process/apiserver/apiserver.go b/comp/process/apiserver/apiserver.go
@@ -15,6 +15,7 @@ import (
 	"go.uber.org/fx"
 
 	"github.com/DataDog/datadog-agent/cmd/process-agent/api"
+	"github.com/DataDog/datadog-agent/comp/api/authtoken"
 	log "github.com/DataDog/datadog-agent/comp/core/log/def"
 	pkgconfigsetup "github.com/DataDog/datadog-agent/pkg/config/setup"
 )
@@ -32,6 +33,8 @@ type dependencies struct {
 
 	Log log.Component
 
+	At authtoken.Component
+
 	APIServerDeps api.APIServerDeps
 }
 
@@ -54,6 +57,7 @@ func newApiServer(deps dependencies) Component {
 			ReadTimeout:  timeout,
 			WriteTimeout: timeout,
 			IdleTimeout:  timeout,
+			TLSConfig:    deps.At.GetTLSServerConfig(),
 		},
 	}
 

diff --git a/comp/process/apiserver/apiserver_test.go b/comp/process/apiserver/apiserver_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/fx"
 
+	"github.com/DataDog/datadog-agent/comp/api/authtoken/fetchonlyimpl"
 	"github.com/DataDog/datadog-agent/comp/core"
 	"github.com/DataDog/datadog-agent/comp/core/settings/settingsimpl"
 	"github.com/DataDog/datadog-agent/comp/core/status"
@@ -39,6 +40,7 @@ func TestLifecycle(t *testing.T) {
 		}),
 		statusimpl.Module(),
 		settingsimpl.MockModule(),
+		fetchonlyimpl.MockModule(),
 	))
 
 	assert.Eventually(t, func() bool {

diff --git a/comp/process/bundle_test.go b/comp/process/bundle_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/fx"
 
+	"github.com/DataDog/datadog-agent/comp/api/authtoken/fetchonlyimpl"
 	"github.com/DataDog/datadog-agent/comp/core"
 	configComp "github.com/DataDog/datadog-agent/comp/core/config"
 	log "github.com/DataDog/datadog-agent/comp/core/log/def"
@@ -60,6 +61,7 @@ func TestBundleDependencies(t *testing.T) {
 		rdnsquerier.MockModule(),
 		npcollectorimpl.MockModule(),
 		statsd.MockModule(),
+		fetchonlyimpl.MockModule(),
 	)
 }