'recording_mode_overrides' -> 'recording_mode_override'.

hashicorp · Feb 20, 2024 · 6aba792 · 6aba792
1 parent 618b643
commit 6aba792
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 19 deletions.
diff --git a/internal/service/configservice/configuration_recorder.go b/internal/service/configservice/configuration_recorder.go
@@ -108,11 +108,11 @@ func ResourceConfigurationRecorder() *schema.Resource {
 					Schema: map[string]*schema.Schema{
 						"recording_frequency": {
 							Type:         schema.TypeString,
-							Default:      configservice.RecordingFrequencyContinuous,
 							Optional:     true,
+							Default:      configservice.RecordingFrequencyContinuous,
 							ValidateFunc: validation.StringInSlice(configservice.RecordingFrequency_Values(), false),
 						},
-						"recording_mode_overrides": {
+						"recording_mode_override": {
 							Type:     schema.TypeList,
 							Optional: true,
 							// Even though the name is plural, the API only allows one override:
@@ -124,17 +124,17 @@ func ResourceConfigurationRecorder() *schema.Resource {
 										Type:     schema.TypeString,
 										Optional: true,
 									},
+									"recording_frequency": {
+										Type:         schema.TypeString,
+										Required:     true,
+										ValidateFunc: validation.StringInSlice(configservice.RecordingFrequency_Values(), false),
+									},
 									"resource_types": {
 										Type:     schema.TypeSet,
 										Required: true,
 										MinItems: 1,
 										Elem:     &schema.Schema{Type: schema.TypeString},
 									},
-									"recording_frequency": {
-										Type:         schema.TypeString,
-										Required:     true,
-										ValidateFunc: validation.StringInSlice(configservice.RecordingFrequency_Values(), false),
-									},
 								},
 							},
 						},

diff --git a/internal/service/configservice/configuration_recorder_test.go b/internal/service/configservice/configuration_recorder_test.go
@@ -64,7 +64,6 @@ func testAccConfigurationRecorder_disappears(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckConfigurationRecorderExists(ctx, resourceName, &cr),
 					acctest.CheckResourceDisappears(ctx, acctest.Provider, tfconfig.ResourceConfigurationRecorder(), resourceName),
-					acctest.CheckResourceDisappears(ctx, acctest.Provider, tfconfig.ResourceConfigurationRecorder(), resourceName),
 				),
 				ExpectNonEmptyPlan: true,
 			},
@@ -95,10 +94,10 @@ func testAccConfigurationRecorder_allParams(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "recording_group.0.resource_types.#", "2"),
 					resource.TestCheckResourceAttr(resourceName, "recording_mode.#", "1"),
 					resource.TestCheckResourceAttr(resourceName, "recording_mode.0.recording_frequency", "DAILY"),
-					resource.TestCheckResourceAttr(resourceName, "recording_mode.0.recording_mode_overrides.#", "1"),
-					resource.TestCheckResourceAttr(resourceName, "recording_mode.0.recording_mode_overrides.0.recording_frequency", "CONTINUOUS"),
-					resource.TestCheckResourceAttr(resourceName, "recording_mode.0.recording_mode_overrides.0.resource_types.#", "1"),
-					resource.TestCheckResourceAttr(resourceName, "recording_mode.0.recording_mode_overrides.0.resource_types.0", "AWS::EC2::Instance"),
+					resource.TestCheckResourceAttr(resourceName, "recording_mode.0.recording_mode_override.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "recording_mode.0.recording_mode_override.0.recording_frequency", "CONTINUOUS"),
+					resource.TestCheckResourceAttr(resourceName, "recording_mode.0.recording_mode_override.0.resource_types.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "recording_mode.0.recording_mode_override.0.resource_types.0", "AWS::EC2::Instance"),
 					acctest.CheckResourceAttrGlobalARN(resourceName, "role_arn", "iam", fmt.Sprintf("role/%s", rName)),
 				),
 			},
@@ -262,7 +261,7 @@ resource "aws_config_configuration_recorder" "test" {
   recording_mode {
     recording_frequency = "DAILY"
 
-    recording_mode_overrides {
+    recording_mode_override {
       resource_types      = ["AWS::EC2::Instance"]
       recording_frequency = "CONTINUOUS"
     }

diff --git a/internal/service/configservice/flex.go b/internal/service/configservice/flex.go
@@ -107,7 +107,7 @@ func expandRecordingMode(mode map[string]interface{}) *configservice.RecordingMo
 		recordingMode.RecordingFrequency = aws.String(v)
 	}
 
-	if v, ok := mode["recording_mode_overrides"]; ok {
+	if v, ok := mode["recording_mode_override"]; ok {
 		recordingMode.RecordingModeOverrides = expandRecordingModeRecordingModeOverrides(v.([]interface{}))
 	}
 
@@ -310,7 +310,7 @@ func flattenRecordingMode(g *configservice.RecordingMode) []map[string]interface
 	}
 
 	if g.RecordingModeOverrides != nil && len(g.RecordingModeOverrides) > 0 {
-		m["recording_mode_overrides"] = flattenRecordingModeRecordingModeOverrides(g.RecordingModeOverrides)
+		m["recording_mode_override"] = flattenRecordingModeRecordingModeOverrides(g.RecordingModeOverrides)
 	}
 
 	return []map[string]interface{}{m}

diff --git a/internal/service/configservice/remediation_configuration_test.go b/internal/service/configservice/remediation_configuration_test.go
@@ -127,7 +127,6 @@ func testAccRemediationConfiguration_disappears(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckRemediationConfigurationExists(ctx, resourceName, &rc),
 					acctest.CheckResourceDisappears(ctx, acctest.Provider, tfconfigservice.ResourceRemediationConfiguration(), resourceName),
-					acctest.CheckResourceDisappears(ctx, acctest.Provider, tfconfigservice.ResourceRemediationConfiguration(), resourceName),
 				),
 				ExpectNonEmptyPlan: true,
 			},

diff --git a/website/docs/r/config_configuration_recorder.html.markdown b/website/docs/r/config_configuration_recorder.html.markdown
@@ -78,7 +78,7 @@ resource "aws_config_configuration_recorder" "foo" {
   recording_mode {
     recording_frequency = "CONTINUOUS"
 
-    recording_mode_overrides {
+    recording_mode_override {
       description         = "Only record EC2 network interfaces daily"
       resource_types      = ["AWS::EC2::NetworkInterface"]
       recording_frequency = "DAILY"
@@ -115,9 +115,9 @@ This resource supports the following arguments:
 ### recording_mode Configuration Block
 
 * `recording_frequency` - (Required) Default reecording frequency. `CONTINUOUS` or `DAILY`.
-* `recording_mode_overrides` - (Optional) Recording mode overrides. Detailed below.
+* `recording_mode_override` - (Optional) Recording mode overrides. Detailed below.
 
-#### recording_mode_overrides Configuration Block
+#### recording_mode_override Configuration Block
 
 * `description` - (Optional) A description you provide of the override.
 * `resource_types` - (Required) A list that specifies the types of AWS resources for which the override applies to.  See [restrictions in the AWS Docs](https://docs.aws.amazon.com/config/latest/APIReference/API_RecordingModeOverride.html)