Updated dynatrace_vulnerability_settings resource

Author: kishikawa12

dynatrace/api/builtin/appsec/runtimevulnerabilitydetection/schema.json

@@ -57,6 +57,19 @@
 			"nullable": false,
 			"type": "boolean"
 		},
+		"enableResourceAttributeRules": {
+			"description": "When new monitoring rules are enabled, classic rules are disabled. To re-enable classic rules, disable the new monitoring rules.",
+			"displayName": "Enable new monitoring rules",
+			"documentation": "",
+			"maxObjects": 1,
+			"metadata": {
+				"featureFlag": "com.compuware.EnableCaspResourceAttributesSettingsToggle.feature",
+				"maturity": "GENERAL_AVAILABILITY"
+			},
+			"modificationPolicy": "DEFAULT",
+			"nullable": true,
+			"type": "boolean"
+		},
 		"enableRuntimeVulnerabilityDetection": {
 			"default": false,
 			"description": "",
@@ -320,5 +333,5 @@
 			]
 		}
 	},
-	"version": "3.8"
+	"version": "3.9"
 }

dynatrace/api/builtin/appsec/runtimevulnerabilitydetection/service.go

@@ -24,7 +24,7 @@ import (
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/settings/services/settings20"
 )
 
-const SchemaVersion = "3.8"
+const SchemaVersion = "3.9"
 const SchemaID = "builtin:appsec.runtime-vulnerability-detection"
 
 func Service(credentials *rest.Credentials) settings.CRUDService[*runtimevulnerabilitydetection.Settings] {

dynatrace/api/builtin/appsec/runtimevulnerabilitydetection/settings/settings.go

@@ -23,13 +23,14 @@ import (
 )
 
 type Settings struct {
-	EnableCodeLevelVulnerabilityDetection bool            `json:"enableCodeLevelVulnerabilityDetection"` // Enable Code-level Vulnerability Analytics
-	EnableRuntimeVulnerabilityDetection   bool            `json:"enableRuntimeVulnerabilityDetection"`   // Enable Third-party Vulnerability Analytics
-	GlobalMonitoringModeDotNet            MonitoringMode  `json:"globalMonitoringModeDotNet"`            // (v1.290) Global .NET code-level vulnerability detection control defines the default for all process groups. You can use monitoring rules to override the default for certain processes. Possible Values: `MONITORING_OFF`, `MONITORING_ON`
-	GlobalMonitoringModeGo                *MonitoringMode `json:"globalMonitoringModeGo,omitempty"`      // Global Go code-level vulnerability detection control defines the default for all process groups. You can use monitoring rules to override the default for certain processes.
-	GlobalMonitoringModeJava              MonitoringMode  `json:"globalMonitoringModeJava"`              // Global Java code-level vulnerability detection control defines the default for all process groups. You can use monitoring rules to override the default for certain processes. Possible Values: `MONITORING_OFF`, `MONITORING_ON`
-	GlobalMonitoringModeTPV               MonitoringMode  `json:"globalMonitoringModeTPV"`               // Global third-party vulnerability detection control defines the default for all processes. Possible Values: `MONITORING_OFF`, `MONITORING_ON`
-	Technologies                          *Technology     `json:"technologies"`                          // Vulnerability Analytics can be enabled/disabled per supported technology.
+	EnableCodeLevelVulnerabilityDetection bool            `json:"enableCodeLevelVulnerabilityDetection"`  // Enable Code-level Vulnerability Analytics
+	EnableResourceAttributeRules          *bool           `json:"enableResourceAttributeRules,omitempty"` // When new monitoring rules are enabled, classic rules are disabled. To re-enable classic rules, disable the new monitoring rules.
+	EnableRuntimeVulnerabilityDetection   bool            `json:"enableRuntimeVulnerabilityDetection"`    // Enable Third-party Vulnerability Analytics
+	GlobalMonitoringModeDotNet            MonitoringMode  `json:"globalMonitoringModeDotNet"`             // (v1.290) Global .NET code-level vulnerability detection control defines the default for all process groups. You can use monitoring rules to override the default for certain processes. Possible Values: `MONITORING_OFF`, `MONITORING_ON`
+	GlobalMonitoringModeGo                *MonitoringMode `json:"globalMonitoringModeGo,omitempty"`       // Global Go code-level vulnerability detection control defines the default for all process groups. You can use monitoring rules to override the default for certain processes.
+	GlobalMonitoringModeJava              MonitoringMode  `json:"globalMonitoringModeJava"`               // Global Java code-level vulnerability detection control defines the default for all process groups. You can use monitoring rules to override the default for certain processes. Possible Values: `MONITORING_OFF`, `MONITORING_ON`
+	GlobalMonitoringModeTPV               MonitoringMode  `json:"globalMonitoringModeTPV"`                // Global third-party vulnerability detection control defines the default for all processes. Possible Values: `MONITORING_OFF`, `MONITORING_ON`
+	Technologies                          *Technology     `json:"technologies"`                           // Vulnerability Analytics can be enabled/disabled per supported technology.
 }
 
 func (me *Settings) Name() string {
@@ -43,6 +44,11 @@ func (me *Settings) Schema() map[string]*schema.Schema {
 			Description: "Enable Code-level Vulnerability Analytics",
 			Required:    true,
 		},
+		"enable_resource_attribute_rules": {
+			Type:        schema.TypeBool,
+			Description: "When new monitoring rules are enabled, classic rules are disabled. To re-enable classic rules, disable the new monitoring rules.",
+			Optional:    true, // nullable
+		},
 		"enable_runtime_vulnerability_detection": {
 			Type:        schema.TypeBool,
 			Description: "Enable Third-party Vulnerability Analytics",
@@ -88,6 +94,7 @@ func (me *Settings) Schema() map[string]*schema.Schema {
 func (me *Settings) MarshalHCL(properties hcl.Properties) error {
 	return properties.EncodeAll(map[string]any{
 		"enable_code_level_vulnerability_detection": me.EnableCodeLevelVulnerabilityDetection,
+		"enable_resource_attribute_rules":           me.EnableResourceAttributeRules,
 		"enable_runtime_vulnerability_detection":    me.EnableRuntimeVulnerabilityDetection,
 		"global_monitoring_mode_dot_net":            me.GlobalMonitoringModeDotNet,
 		"global_monitoring_mode_go":                 me.GlobalMonitoringModeGo,
@@ -100,6 +107,7 @@ func (me *Settings) MarshalHCL(properties hcl.Properties) error {
 func (me *Settings) UnmarshalHCL(decoder hcl.Decoder) error {
 	err := decoder.DecodeAll(map[string]any{
 		"enable_code_level_vulnerability_detection": &me.EnableCodeLevelVulnerabilityDetection,
+		"enable_resource_attribute_rules":           &me.EnableResourceAttributeRules,
 		"enable_runtime_vulnerability_detection":    &me.EnableRuntimeVulnerabilityDetection,
 		"global_monitoring_mode_dot_net":            &me.GlobalMonitoringModeDotNet,
 		"global_monitoring_mode_go":                 &me.GlobalMonitoringModeGo,