Cosmetics.

hashicorp · Apr 18, 2024 · 538c779 · 538c779
1 parent 136f475
commit 538c779
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/internal/service/autoscaling/group.go b/internal/service/autoscaling/group.go
@@ -232,10 +232,6 @@ func resourceGroup() *schema.Resource {
 							Optional: true,
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{
-									"auto_rollback": {
-										Type:     schema.TypeBool,
-										Optional: true,
-									},
 									"alarm_specification": {
 										Type:     schema.TypeList,
 										MaxItems: 1,
@@ -244,10 +240,17 @@ func resourceGroup() *schema.Resource {
 											Schema: map[string]*schema.Schema{
 												"alarms": {
 													Type: schema.TypeList,
+													Elem: &schema.Schema{
+														Type: schema.TypeString,
+													},
 												},
 											},
 										},
 									},
+									"auto_rollback": {
+										Type:     schema.TypeBool,
+										Optional: true,
+									},
 									"checkpoint_delay": {
 										Type:         nullable.TypeNullableInt,
 										Optional:     true,
@@ -3314,12 +3317,12 @@ func expandRefreshPreferences(tfMap map[string]interface{}) *awstypes.RefreshPre
 
 	apiObject := &awstypes.RefreshPreferences{}
 
-	if v, ok := tfMap["auto_rollback"].(bool); ok {
-		apiObject.AutoRollback = aws.Bool(v)
+	if v, ok := tfMap["alarm_specification"].([]interface{}); ok && len(v) > 0 {
+		apiObject.AlarmSpecification = expandAlarmSpecification(v[0].(map[string]interface{}))
 	}
 
-	if v, ok := tfMap["alarm_specification"].([]interface{}); ok && len(v) > 0 {
-		apiObject.AlarmSpecification = expandRefreshAlarmSpecification(v[0].(map[string]interface{}))
+	if v, ok := tfMap["auto_rollback"].(bool); ok {
+		apiObject.AutoRollback = aws.Bool(v)
 	}
 
 	if v, ok := tfMap["checkpoint_delay"].(string); ok {
@@ -3361,7 +3364,7 @@ func expandRefreshPreferences(tfMap map[string]interface{}) *awstypes.RefreshPre
 	return apiObject
 }
 
-func expandRefreshAlarmSpecification(tfMap map[string]interface{}) *awstypes.AlarmSpecification {
+func expandAlarmSpecification(tfMap map[string]interface{}) *awstypes.AlarmSpecification {
 	if tfMap == nil {
 		return nil
 	}