windows cgo

pkg/fleet/internal/cdn/cdn.go

@@ -10,7 +10,6 @@ import (
 	"context"
 	"errors"
 	"regexp"
-	"runtime"
 
 	"github.com/DataDog/datadog-agent/pkg/fleet/env"
 )
@@ -42,13 +41,12 @@ type CDN interface {
 // New creates a new CDN.
 func New(env *env.Env, configDBPath string) (CDN, error) {
 	if !env.RemotePolicies {
-		return nil, nil
+		return newNoop()
 	}
 	if env.CDNLocalDirPath != "" {
 		return newLocal(env)
 	}
-	if !env.CDNEnabled && runtime.GOOS != "windows" {
-		// Windows can't use the direct CDN yet as it breaks the static binary build
+	if !env.CDNEnabled {
 		return newDirect(env, configDBPath)
 	}
 	return newRegular(env, configDBPath)

pkg/fleet/internal/cdn/cdn_noop.go

@@ -0,0 +1,37 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2016-present Datadog, Inc.
+
+package cdn
+
+import (
+	"context"
+)
+
+type cdnNoop struct {
+}
+
+type configNoop struct{}
+
+// newNoop creates a new noop CDN.
+func newNoop() (CDN, error) {
+	return &cdnNoop{}, nil
+}
+
+// Get gets the configuration from the CDN.
+func (c *cdnNoop) Get(_ context.Context, _ string) (Config, error) {
+	return &configNoop{}, nil
+}
+
+func (c *cdnNoop) Close() error {
+	return nil
+}
+
+func (c *configNoop) Version() string {
+	return ""
+}
+
+func (c *configNoop) Write(_ string) error {
+	return nil
+}

pkg/util/hostname/fqdn_windows.go

@@ -6,9 +6,7 @@
 package hostname
 
 import (
-	"C"
 	"os"
-	"unsafe"
 
 	"golang.org/x/sys/windows"
 )
@@ -23,7 +21,7 @@ func getSystemFQDN() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	namestring := C.GoString((*C.char)(unsafe.Pointer(he.Name)))
+	namestring := windows.BytePtrToString(he.Name)
 
 	return namestring, nil
 }