Remove occurrences from maintenance window resource.

Author: adcoelho

internal/clients/kibana/maintenance_window.go

@@ -26,12 +26,11 @@ func maintenanceWindowResponseToModel(spaceId string, res *alerting.MaintenanceW
 		unwrappedRecurring := unwrapOptionalField(res.Schedule.Custom.Recurring)
 
 		recurring = &models.MaintenanceWindowScheduleRecurring{
-			End:         unwrappedRecurring.End,
-			Every:       unwrappedRecurring.Every,
-			Occurrences: unwrappedRecurring.Occurrences,
-			OnWeekDay:   &unwrappedRecurring.OnWeekDay,
-			OnMonthDay:  &unwrappedRecurring.OnMonthDay,
-			OnMonth:     &unwrappedRecurring.OnMonth,
+			End:        unwrappedRecurring.End,
+			Every:      unwrappedRecurring.Every,
+			OnWeekDay:  &unwrappedRecurring.OnWeekDay,
+			OnMonthDay: &unwrappedRecurring.OnMonthDay,
+			OnMonth:    &unwrappedRecurring.OnMonth,
 		}
 	}
 
@@ -91,12 +90,11 @@ func CreateMaintenanceWindow(ctx context.Context, apiClient ApiClient, maintenan
 		unwrappedOnMonth := unwrapOptionalField(unwrappedRecurring.OnMonth)
 
 		recurring = &alerting.CreateMaintenanceWindowRequestScheduleCustomRecurring{
-			End:         unwrappedRecurring.End,
-			Every:       unwrappedRecurring.Every,
-			Occurrences: unwrappedRecurring.Occurrences,
-			OnWeekDay:   unwrappedOnWeekDay,
-			OnMonthDay:  unwrappedOnMonthDay,
-			OnMonth:     unwrappedOnMonth,
+			End:        unwrappedRecurring.End,
+			Every:      unwrappedRecurring.Every,
+			OnWeekDay:  unwrappedOnWeekDay,
+			OnMonthDay: unwrappedOnMonthDay,
+			OnMonth:    unwrappedOnMonth,
 		}
 	}
 
@@ -215,12 +213,11 @@ func UpdateMaintenanceWindow(ctx context.Context, apiClient ApiClient, maintenan
 		unwrappedOnMonth := unwrapOptionalField(unwrappedRecurring.OnMonth)
 
 		recurring = &alerting.CreateMaintenanceWindowRequestScheduleCustomRecurring{
-			End:         unwrappedRecurring.End,
-			Every:       unwrappedRecurring.Every,
-			Occurrences: unwrappedRecurring.Occurrences,
-			OnWeekDay:   unwrappedOnWeekDay,
-			OnMonthDay:  unwrappedOnMonthDay,
-			OnMonth:     unwrappedOnMonth,
+			End:        unwrappedRecurring.End,
+			Every:      unwrappedRecurring.Every,
+			OnWeekDay:  unwrappedOnWeekDay,
+			OnMonthDay: unwrappedOnMonthDay,
+			OnMonth:    unwrappedOnMonth,
 		}
 	}
 

internal/clients/kibana/maintenance_window_test.go

@@ -80,12 +80,11 @@ func Test_maintenanceWindowResponseToModel(t *testing.T) {
 						Start:    "1999-02-02T05:00:00.200Z",
 						Timezone: utils.Pointer("Asia/Taipei"),
 						Recurring: &alerting.MaintenanceWindowResponsePropertiesScheduleCustomRecurring{
-							End:         utils.Pointer("2029-05-17T05:05:00.000Z"),
-							Every:       utils.Pointer("20d"),
-							Occurrences: utils.Pointer(float32(30)),
-							OnMonth:     []float32{2},
-							OnMonthDay:  []float32{1},
-							OnWeekDay:   []string{"WE", "TU"},
+							End:        utils.Pointer("2029-05-17T05:05:00.000Z"),
+							Every:      utils.Pointer("20d"),
+							OnMonth:    []float32{2},
+							OnMonthDay: []float32{1},
+							OnWeekDay:  []string{"WE", "TU"},
 						},
 					},
 				},
@@ -107,12 +106,11 @@ func Test_maintenanceWindowResponseToModel(t *testing.T) {
 					Start:    "1999-02-02T05:00:00.200Z",
 					Timezone: utils.Pointer("Asia/Taipei"),
 					Recurring: &models.MaintenanceWindowScheduleRecurring{
-						End:         utils.Pointer("2029-05-17T05:05:00.000Z"),
-						Every:       utils.Pointer("20d"),
-						Occurrences: utils.Pointer(float32(30)),
-						OnMonth:     &[]float32{2},
-						OnMonthDay:  &[]float32{1},
-						OnWeekDay:   &[]string{"WE", "TU"},
+						End:        utils.Pointer("2029-05-17T05:05:00.000Z"),
+						Every:      utils.Pointer("20d"),
+						OnMonth:    &[]float32{2},
+						OnMonthDay: &[]float32{1},
+						OnWeekDay:  &[]string{"WE", "TU"},
 					},
 				},
 				Scope: &models.MaintenanceWindowScope{

internal/kibana/maintenance_window.go

@@ -116,12 +116,6 @@ func ResourceMaintenanceWindow() *schema.Resource {
 										ValidateFunc: validation.IntBetween(1, 12),
 									},
 								},
-								"occurrences": {
-									Description:  "The total number of recurrences of the schedule.",
-									Type:         schema.TypeInt,
-									Optional:     true,
-									ValidateFunc: validation.IntAtLeast(0),
-								},
 							},
 						},
 					},
@@ -250,11 +244,6 @@ func getScheduleFromResourceData(d *schema.ResourceData) (models.MaintenanceWind
 
 		}
 
-		if v, ok := d.GetOk("custom_schedule.0.recurring.0.occurrences"); ok {
-			occurrences := v.(int)
-			recurring.Occurrences = utils.Pointer(float32(occurrences))
-		}
-
 		schedule.Recurring = &recurring
 	}
 
@@ -402,7 +391,6 @@ func resourceMaintenanceWindowRead(ctx context.Context, d *schema.ResourceData,
 			"on_week_day":  maintenanceWindow.CustomSchedule.Recurring.OnWeekDay,
 			"on_month_day": maintenanceWindow.CustomSchedule.Recurring.OnMonthDay,
 			"on_month":     maintenanceWindow.CustomSchedule.Recurring.OnMonth,
-			"occurrences":  maintenanceWindow.CustomSchedule.Recurring.Occurrences,
 		})
 	} else {
 		recurring = nil

internal/kibana/maintenance_window_test.go

@@ -37,7 +37,6 @@ func TestAccResourceMaintenanceWindow(t *testing.T) {
 					resource.TestCheckResourceAttr("elasticstack_kibana_maintenance_window.test_maintenance_window", "custom_schedule.0.recurring.0.end", "2029-05-17T05:05:00.000Z"),
 					resource.TestCheckResourceAttr("elasticstack_kibana_maintenance_window.test_maintenance_window", "custom_schedule.0.recurring.0.on_week_day.0", "MO"),
 					resource.TestCheckResourceAttr("elasticstack_kibana_maintenance_window.test_maintenance_window", "custom_schedule.0.recurring.0.on_week_day.1", "TU"),
-					resource.TestCheckResourceAttr("elasticstack_kibana_maintenance_window.test_maintenance_window", "custom_schedule.0.recurring.0.occurrences", "0"),
 					resource.TestCheckResourceAttr("elasticstack_kibana_maintenance_window.test_maintenance_window", "scope.0.alerting.0.kql", "_id: '1234'"),
 				),
 			},
@@ -57,7 +56,6 @@ func TestAccResourceMaintenanceWindow(t *testing.T) {
 					resource.TestCheckResourceAttr("elasticstack_kibana_maintenance_window.test_maintenance_window", "custom_schedule.0.recurring.0.on_month_day.2", "3"),
 					resource.TestCheckResourceAttr("elasticstack_kibana_maintenance_window.test_maintenance_window", "custom_schedule.0.recurring.0.on_month.0", "4"),
 					resource.TestCheckResourceAttr("elasticstack_kibana_maintenance_window.test_maintenance_window", "custom_schedule.0.recurring.0.on_month.1", "5"),
-					resource.TestCheckResourceAttr("elasticstack_kibana_maintenance_window.test_maintenance_window", "custom_schedule.0.recurring.0.occurrences", "10"),
 					resource.TestCheckResourceAttr("elasticstack_kibana_maintenance_window.test_maintenance_window", "scope.0.alerting.0.kql", "_id: 'foobar'"),
 				),
 			},
@@ -82,7 +80,6 @@ resource "elasticstack_kibana_maintenance_window" "test_maintenance_window" {
       every       = "20d"
       end         = "2029-05-17T05:05:00.000Z"
       on_week_day = ["MO", "TU"]
-	  occurrences = 0
     }
   }
 
@@ -111,7 +108,6 @@ resource "elasticstack_kibana_maintenance_window" "test_maintenance_window" {
       every        = "21d"
 	  on_month_day = [1, 2, 3]
 	  on_month 	   = [4, 5]
-	  occurrences  = 10
     }
   }
 

internal/models/maintenance_window.go

@@ -25,10 +25,9 @@ type MaintenanceWindowSchedule struct {
 }
 
 type MaintenanceWindowScheduleRecurring struct {
-	End         *string
-	Every       *string
-	OnWeekDay   *[]string
-	OnMonthDay  *[]float32
-	OnMonth     *[]float32
-	Occurrences *float32
+	End        *string
+	Every      *string
+	OnWeekDay  *[]string
+	OnMonthDay *[]float32
+	OnMonth    *[]float32
 }