replace duplicate isContainer call (#596)

* replace duplicate isContainer call and introduce IsContainer mocking for Virtualization test

Author: oliveromahony

sdk/config_helpers.go

@@ -856,18 +856,21 @@ func nginxPlusApiCallback(parent *crossplane.Directive, current *crossplane.Dire
 }
 
 func pingStubStatusApiEndpoint(statusAPI string) bool {
-	client := http.Client{Timeout: 50 * time.Millisecond}
+	client := http.Client{Timeout: 1 * time.Second}
 	resp, err := client.Get(statusAPI)
 	if err != nil {
+		log.Debugf("Unable to create client for Stub Status API request: %v", err)
 		return false
 	}
 
 	if resp.StatusCode != 200 {
+		log.Debugf("Stub Status API responded with a %d status code", resp.StatusCode)
 		return false
 	}
 
 	bodyBytes, err := io.ReadAll(resp.Body)
 	if err != nil {
+		log.Debugf("Unable to read Stub Status API response body: %v", err)
 		return false
 	}
 
@@ -882,18 +885,21 @@ func pingStubStatusApiEndpoint(statusAPI string) bool {
 }
 
 func pingNginxPlusApiEndpoint(statusAPI string) bool {
-	client := http.Client{Timeout: 50 * time.Millisecond}
+	client := http.Client{Timeout: 1 * time.Second}
 	resp, err := client.Get(statusAPI)
 	if err != nil {
+		log.Debugf("Unable to create client for NGINX Plus API request: %v", err)
 		return false
 	}
 
 	if resp.StatusCode != 200 {
+		log.Debugf("NGINX Plus API responded with a %d status code", resp.StatusCode)
 		return false
 	}
 
 	bodyBytes, err := io.ReadAll(resp.Body)
 	if err != nil {
+		log.Debugf("Unable to read NGINX Plus API response body: %v", err)
 		return false
 	}
 

src/core/environment.go

@@ -59,6 +59,7 @@ type Environment interface {
 	GetContainerID() (string, error)
 	GetNetOverflow() (float64, error)
 	IsContainer() bool
+	Virtualization() (string, string)
 }
 
 type ConfigApplyMarker interface {
@@ -152,7 +153,7 @@ func (env *EnvironmentType) NewHostInfoWithContext(ctx context.Context, agentVer
 			Uname:               getUnixName(),
 			Partitons:           disks,
 			Network:             env.networks(),
-			Processor:           processors(hostInformation.KernelArch),
+			Processor:           env.processors(hostInformation.KernelArch),
 			Release:             releaseInfo("/etc/os-release"),
 			Tags:                *tags,
 			AgentAccessibleDirs: configDirs,
@@ -729,15 +730,15 @@ func callSyscall(mib []int32) ([]byte, uint64, error) {
 	return buf, length, nil
 }
 
-func processors(architecture string) (res []*proto.CpuInfo) {
+func (env *EnvironmentType) processors(architecture string) (res []*proto.CpuInfo) {
 	log.Debug("Reading CPU information for dataplane host")
 	cpus, err := cpu.Info()
 	if err != nil {
 		log.Warnf("%v", err)
 		return []*proto.CpuInfo{}
 	}
 
-	hypervisor, virtual := virtualization()
+	hypervisor, virtual := env.Virtualization()
 
 	for _, item := range cpus {
 		processor := proto.CpuInfo{
@@ -858,7 +859,7 @@ func formatBytes(bytes int) string {
 	}
 }
 
-func virtualization() (string, string) {
+func (env *EnvironmentType) Virtualization() (string, string) {
 	ctx := context.Background()
 	defer ctx.Done()
 	// doesn't check k8s
@@ -868,7 +869,7 @@ func virtualization() (string, string) {
 		return "", "host"
 	}
 
-	if virtualizationSystem == "docker" || isContainer() {
+	if virtualizationSystem == "docker" || env.IsContainer() {
 		log.Debugf("Virtualization detected as container with role %v", virtualizationRole)
 		return "container", virtualizationRole
 	}

src/core/environment_test.go

@@ -440,33 +440,54 @@ func TestNetworks(t *testing.T) {
 	assert.NotNil(t, networks.Default)
 }
 
+// MockEnvironment is a mock implementation of the Environment interface for testing purposes.
+type MockEnvironment struct {
+	isContainer bool
+}
+
+// IsContainer is a mock function for IsContainer() method.
+func (m *MockEnvironment) IsContainer() bool {
+	// Mock implementation for testing.
+	return m.isContainer
+}
+
+func (m *MockEnvironment) Virtualization() (string, string) {
+	realEnv := &EnvironmentType{}
+	return realEnv.Virtualization()
+}
+
 func TestVirtualization(t *testing.T) {
+	mockEnv := &MockEnvironment{isContainer: false}
+
 	// Test normal VM
-	virtualizationFunc = func(ctx context.Context) (string, string, error) {
+	virtualizationFunc = func(_ context.Context) (string, string, error) {
 		return "LXC", "host", nil
 	}
 
-	virtualizationSystem, virtualizationRole := virtualization()
+	virtualizationSystem, virtualizationRole := mockEnv.Virtualization()
 
 	assert.Equal(t, "LXC", virtualizationSystem)
 	assert.Equal(t, "host", virtualizationRole)
 
 	// Test container
-	virtualizationFunc = func(ctx context.Context) (string, string, error) {
+	virtualizationFunc = func(_ context.Context) (string, string, error) {
 		return "docker", "host", nil
 	}
 
-	virtualizationSystem, virtualizationRole = virtualization()
+	mockEnv.isContainer = true
+
+	virtualizationSystem, virtualizationRole = mockEnv.Virtualization()
 
 	assert.Equal(t, "container", virtualizationSystem)
 	assert.Equal(t, "host", virtualizationRole)
 }
 
 func TestProcessors(t *testing.T) {
-	processorInfo := processors("arm64")
+	env := EnvironmentType{}
+	processorInfo := env.processors("arm64")
 	// at least one network interface
 	assert.GreaterOrEqual(t, processorInfo[0].GetCpus(), int32(1))
-	// non empty architecture
+	// non-empty architecture
 	assert.NotEmpty(t, processorInfo[0].GetArchitecture())
 	assert.Equal(t, "arm64", processorInfo[0].GetArchitecture())
 }