small fixes and add test

DataDog · Nov 3, 2023 · 3c84995 · 3c84995
1 parent 7c3faf7
commit 3c84995
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 40 deletions.
diff --git a/apis/datadoghq/v2alpha1/datadogagent_types.go b/apis/datadoghq/v2alpha1/datadogagent_types.go
@@ -319,19 +319,20 @@ type RemoteConfigurationFeatureConfig struct {
 	Enabled *bool `json:"enabled,omitempty"`
 }
 
-// SBOMFeatureConfig contains SBOM collection global configuration.
+// SBOMFeatureConfig contains SBOM (Software Bill of Materials) collection configuration.
+// SBOM runs in the Agent.
 type SBOMFeatureConfig struct {
 	// Enable this option to activate SBOM collection.
 	// Default: false
 	// +optional
 	Enabled *bool `json:"enabled,omitempty"`
 
-	ContainerImage *SBOMConfig `json:"containerImage,omitempty"`
-	Host           *SBOMConfig `json:"host,omitempty"`
+	ContainerImage *SBOMTypeConfig `json:"containerImage,omitempty"`
+	Host           *SBOMTypeConfig `json:"host,omitempty"`
 }
 
-// SBOMConfig contains configuration for one SBOM collection type.
-type SBOMConfig struct {
+// SBOMTypeConfig contains configuration for a SBOM collection type.
+type SBOMTypeConfig struct {
 	// Enable this option to activate SBOM collection.
 	// Default: false
 	// +optional

diff --git a/apis/datadoghq/v2alpha1/zz_generated.deepcopy.go b/apis/datadoghq/v2alpha1/zz_generated.deepcopy.go
diff --git a/apis/datadoghq/v2alpha1/zz_generated.openapi.go b/apis/datadoghq/v2alpha1/zz_generated.openapi.go
diff --git a/config/crd/bases/v1/datadoghq.com_datadogagents.yaml b/config/crd/bases/v1/datadoghq.com_datadogagents.yaml
@@ -8363,7 +8363,7 @@ spec:
                       description: SBOM collection configuration.
                       properties:
                         containerImage:
-                          description: SBOMConfig contains configuration for one SBOM collection type.
+                          description: SBOMTypeConfig contains configuration for a SBOM collection type.
                           properties:
                             analyzers:
                               description: Analyzers to use for SBOM collection.
@@ -8379,7 +8379,7 @@ spec:
                           description: 'Enable this option to activate SBOM collection. Default: false'
                           type: boolean
                         host:
-                          description: SBOMConfig contains configuration for one SBOM collection type.
+                          description: SBOMTypeConfig contains configuration for a SBOM collection type.
                           properties:
                             analyzers:
                               description: Analyzers to use for SBOM collection.

diff --git a/config/crd/bases/v1beta1/datadoghq.com_datadogagents.yaml b/config/crd/bases/v1beta1/datadoghq.com_datadogagents.yaml
@@ -15913,7 +15913,7 @@ spec:
                       description: SBOM collection configuration.
                       properties:
                         containerImage:
-                          description: SBOMConfig contains configuration for one SBOM collection type.
+                          description: SBOMTypeConfig contains configuration for a SBOM collection type.
                           properties:
                             analyzers:
                               description: Analyzers to use for SBOM collection.
@@ -15929,7 +15929,7 @@ spec:
                           description: 'Enable this option to activate SBOM collection. Default: false'
                           type: boolean
                         host:
-                          description: SBOMConfig contains configuration for one SBOM collection type.
+                          description: SBOMTypeConfig contains configuration for a SBOM collection type.
                           properties:
                             analyzers:
                               description: Analyzers to use for SBOM collection.

diff --git a/controllers/datadogagent/feature/sbom/feature.go b/controllers/datadogagent/feature/sbom/feature.go
@@ -106,22 +106,28 @@ func (f *sbomFeature) ManageNodeAgent(managers feature.PodTemplateManagers) erro
 		Name:  apicommon.DDSBOMEnabled,
 		Value: apiutils.BoolToString(&f.enabled),
 	})
+
 	managers.EnvVar().AddEnvVar(&corev1.EnvVar{
 		Name:  apicommon.DDSBOMContainerImageEnabled,
 		Value: apiutils.BoolToString(&f.containerImageEnabled),
 	})
-	managers.EnvVar().AddEnvVar(&corev1.EnvVar{
-		Name:  apicommon.DDSBOMContainerImageAnalyzers,
-		Value: strings.Join(f.containerImageAnalyzers, " "),
-	})
+	if len(f.containerImageAnalyzers) > 0 {
+		managers.EnvVar().AddEnvVar(&corev1.EnvVar{
+			Name:  apicommon.DDSBOMContainerImageAnalyzers,
+			Value: strings.Join(f.containerImageAnalyzers, " "),
+		})
+	}
+
 	managers.EnvVar().AddEnvVar(&corev1.EnvVar{
 		Name:  apicommon.DDSBOMHostEnabled,
 		Value: apiutils.BoolToString(&f.hostEnabled),
 	})
-	managers.EnvVar().AddEnvVar(&corev1.EnvVar{
-		Name:  apicommon.DDSBOMHostAnalyzers,
-		Value: strings.Join(f.hostAnalyzers, " "),
-	})
+	if len(f.hostAnalyzers) > 0 {
+		managers.EnvVar().AddEnvVar(&corev1.EnvVar{
+			Name:  apicommon.DDSBOMHostAnalyzers,
+			Value: strings.Join(f.hostAnalyzers, " "),
+		})
+	}
 
 	return nil
 }

diff --git a/docs/configuration.v2alpha1.md b/docs/configuration.v2alpha1.md
@@ -122,7 +122,6 @@ spec:
 | features.prometheusScrape.enabled | Enable autodiscovery of pods and services exposing Prometheus metrics. Default: false |
 | features.prometheusScrape.version | Version specifies the version of the OpenMetrics check. Default: 2 |
 | features.remoteConfiguration.enabled | Enable this option to activate Remote Configuration. Default: true |
-| features.remoteConfiguration.enabled | Enable this option to activate Remote Configuration. Default: false |
 | features.sbom.containerImage.analyzers | Analyzers to use for SBOM collection. |
 | features.sbom.containerImage.enabled | Enable this option to activate SBOM collection. Default: false |
 | features.sbom.enabled | Enable this option to activate SBOM collection. Default: false |