Apply suggestion from @celenechang

Signed-off-by: Eliott Bouhana <eliott.bouhana@datadoghq.com>
DataDog · May 24, 2024 · b3b873b · b3b873b
1 parent ccb4e6c
commit b3b873b
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 37 deletions.
diff --git a/apis/datadoghq/v2alpha1/datadogagent_default.go b/apis/datadoghq/v2alpha1/datadogagent_default.go
@@ -73,7 +73,9 @@ const (
 	defaultAdmissionControllerMutateUnlabelled bool   = false
 	defaultAdmissionServiceName                string = "datadog-admission-controller"
 
-	defaultAdmissionASMEnabled bool = false
+	defaultAdmissionASMThreatsEnabled bool = false
+	defaultAdmissionASMSCAEnabled     bool = false
+	defaultAdmissionASMIASTEnabled    bool = false
 
 	defaultOrchestratorExplorerEnabled         bool = true
 	defaultOrchestratorExplorerScrubContainers bool = true
@@ -271,17 +273,17 @@ func defaultFeaturesConfig(ddaSpec *DatadogAgentSpec) {
 	if ddaSpec.Features.ASM.Threats == nil {
 		ddaSpec.Features.ASM.Threats = &ASMThreatsConfig{}
 	}
-	apiutils.DefaultBooleanIfUnset(&ddaSpec.Features.ASM.Threats.Enabled, defaultAdmissionASMEnabled)
+	apiutils.DefaultBooleanIfUnset(&ddaSpec.Features.ASM.Threats.Enabled, defaultAdmissionASMThreatsEnabled)
 
 	if ddaSpec.Features.ASM.SCA == nil {
 		ddaSpec.Features.ASM.SCA = &ASMSCAConfig{}
 	}
-	apiutils.DefaultBooleanIfUnset(&ddaSpec.Features.ASM.SCA.Enabled, defaultAdmissionASMEnabled)
+	apiutils.DefaultBooleanIfUnset(&ddaSpec.Features.ASM.SCA.Enabled, defaultAdmissionASMSCAEnabled)
 
 	if ddaSpec.Features.ASM.IAST == nil {
 		ddaSpec.Features.ASM.IAST = &ASMIASTConfig{}
 	}
-	apiutils.DefaultBooleanIfUnset(&ddaSpec.Features.ASM.IAST.Enabled, defaultAdmissionASMEnabled)
+	apiutils.DefaultBooleanIfUnset(&ddaSpec.Features.ASM.IAST.Enabled, defaultAdmissionASMIASTEnabled)
 
 	// CSPM (Cloud Security Posture Management) Feature
 	if ddaSpec.Features.CSPM == nil {

diff --git a/apis/datadoghq/v2alpha1/datadogagent_default_test.go b/apis/datadoghq/v2alpha1/datadogagent_default_test.go
@@ -197,13 +197,13 @@ func Test_defaultFeatures(t *testing.T) {
 					},
 					ASM: &ASMFeatureConfig{
 						Threats: &ASMThreatsConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMThreatsEnabled),
 						},
 						SCA: &ASMSCAConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMSCAEnabled),
 						},
 						IAST: &ASMIASTConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMIASTEnabled),
 						},
 					},
 					CSPM: &CSPMFeatureConfig{
@@ -499,13 +499,13 @@ func Test_defaultFeatures(t *testing.T) {
 					},
 					ASM: &ASMFeatureConfig{
 						Threats: &ASMThreatsConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMThreatsEnabled),
 						},
 						SCA: &ASMSCAConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMSCAEnabled),
 						},
 						IAST: &ASMIASTConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMIASTEnabled),
 						},
 					},
 					CSPM: &CSPMFeatureConfig{
@@ -625,13 +625,13 @@ func Test_defaultFeatures(t *testing.T) {
 					},
 					ASM: &ASMFeatureConfig{
 						Threats: &ASMThreatsConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMThreatsEnabled),
 						},
 						SCA: &ASMSCAConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMSCAEnabled),
 						},
 						IAST: &ASMIASTConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMIASTEnabled),
 						},
 					},
 					CSPM: &CSPMFeatureConfig{
@@ -746,13 +746,13 @@ func Test_defaultFeatures(t *testing.T) {
 					},
 					ASM: &ASMFeatureConfig{
 						Threats: &ASMThreatsConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMThreatsEnabled),
 						},
 						SCA: &ASMSCAConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMSCAEnabled),
 						},
 						IAST: &ASMIASTConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMIASTEnabled),
 						},
 					},
 					CSPM: &CSPMFeatureConfig{
@@ -867,13 +867,13 @@ func Test_defaultFeatures(t *testing.T) {
 					},
 					ASM: &ASMFeatureConfig{
 						Threats: &ASMThreatsConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMThreatsEnabled),
 						},
 						SCA: &ASMSCAConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMSCAEnabled),
 						},
 						IAST: &ASMIASTConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMIASTEnabled),
 						},
 					},
 					CSPM: &CSPMFeatureConfig{
@@ -997,13 +997,13 @@ func Test_defaultFeatures(t *testing.T) {
 					},
 					ASM: &ASMFeatureConfig{
 						Threats: &ASMThreatsConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMThreatsEnabled),
 						},
 						SCA: &ASMSCAConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMSCAEnabled),
 						},
 						IAST: &ASMIASTConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMIASTEnabled),
 						},
 					},
 					CSPM: &CSPMFeatureConfig{
@@ -1118,13 +1118,13 @@ func Test_defaultFeatures(t *testing.T) {
 					},
 					ASM: &ASMFeatureConfig{
 						Threats: &ASMThreatsConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMThreatsEnabled),
 						},
 						SCA: &ASMSCAConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMSCAEnabled),
 						},
 						IAST: &ASMIASTConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMIASTEnabled),
 						},
 					},
 					CSPM: &CSPMFeatureConfig{
@@ -1242,13 +1242,13 @@ func Test_defaultFeatures(t *testing.T) {
 					},
 					ASM: &ASMFeatureConfig{
 						Threats: &ASMThreatsConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMThreatsEnabled),
 						},
 						SCA: &ASMSCAConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMSCAEnabled),
 						},
 						IAST: &ASMIASTConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMIASTEnabled),
 						},
 					},
 					CSPM: &CSPMFeatureConfig{
@@ -1352,13 +1352,13 @@ func Test_defaultFeatures(t *testing.T) {
 					},
 					ASM: &ASMFeatureConfig{
 						Threats: &ASMThreatsConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMThreatsEnabled),
 						},
 						SCA: &ASMSCAConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMSCAEnabled),
 						},
 						IAST: &ASMIASTConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMIASTEnabled),
 						},
 					},
 					ProcessDiscovery: &ProcessDiscoveryFeatureConfig{
@@ -1486,13 +1486,13 @@ func Test_defaultFeatures(t *testing.T) {
 					},
 					ASM: &ASMFeatureConfig{
 						Threats: &ASMThreatsConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMThreatsEnabled),
 						},
 						SCA: &ASMSCAConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMSCAEnabled),
 						},
 						IAST: &ASMIASTConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMIASTEnabled),
 						},
 					},
 					CSPM: &CSPMFeatureConfig{
@@ -1629,13 +1629,13 @@ func Test_defaultFeatures(t *testing.T) {
 					},
 					ASM: &ASMFeatureConfig{
 						Threats: &ASMThreatsConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMThreatsEnabled),
 						},
 						SCA: &ASMSCAConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMSCAEnabled),
 						},
 						IAST: &ASMIASTConfig{
-							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMEnabled),
+							Enabled: apiutils.NewBoolPointer(defaultAdmissionASMIASTEnabled),
 						},
 					},
 					CSPM: &CSPMFeatureConfig{