formatting

Author: adcoelho

generated/alerting/api_alerting_mocks.go

@@ -110,7 +110,7 @@ func ruleActionsToActionsInner(ruleActions []models.AlertingRuleAction) []alerti
 		if !alerting.IsNil(action.Frequency) {
 			frequency := alerting.ActionsInnerFrequency{
 				Summary:    action.Frequency.Summary,
-				NotifyWhen: (alerting.NotifyWhen)(action.Frequency.NotifyWhen),
+				NotifyWhen: (alerting.NotifyWhenAction)(action.Frequency.NotifyWhen),
 			}
 
 			if action.Frequency.Throttle != nil {

generated/alerting/model_notify_when_action.go

@@ -19,6 +19,7 @@ func maintenanceWindowResponseToModel(res *alerting.MaintenanceWindowResponsePro
 	}
 
 	return &models.MaintenanceWindow{
+		Id:       res.Id,
 		Title:    res.Title,
 		Enabled:  res.Enabled,
 		Start:    res.Start,

internal/clients/kibana/alerting.go

@@ -13,7 +13,7 @@ import (
 
 func ResourceMaintenanceWindow() *schema.Resource {
 	apikeySchema := map[string]*schema.Schema{
-		"maintenance_window_id": {
+		"id": {
 			Description: "A UUID v1 or v4 to use instead of a randomly generated ID.",
 			Type:        schema.TypeString,
 			Computed:    true,
@@ -48,7 +48,7 @@ func ResourceMaintenanceWindow() *schema.Resource {
 		Description: "Creates a Kibana Maintenance Window.",
 
 		CreateContext: resourceMaintenanceWindowCreate,
-		// UpdateContext: resourceMaintenanceWindowUpdate,
+		UpdateContext: resourceMaintenanceWindowUpdate,
 		ReadContext:   resourceMaintenanceWindowRead,
 		DeleteContext: resourceMaintenanceWindowDelete,
 
@@ -63,16 +63,15 @@ func ResourceMaintenanceWindow() *schema.Resource {
 func getMaintenanceWindowFromResourceData(d *schema.ResourceData, serverVersion *version.Version) (models.MaintenanceWindow, diag.Diagnostics) {
 	var diags diag.Diagnostics
 	maintenanceWindow := models.MaintenanceWindow{
-		MaintenanceWindowID: d.Get("maintenance_window_id").(string),
-		Title:               d.Get("title").(string),
-		Enabled:             d.Get("enabled").(bool),
-		Start:               d.Get("start").(string),
-		Duration:            d.Get("duration").(int),
+		Title:    d.Get("title").(string),
+		Enabled:  d.Get("enabled").(bool),
+		Start:    d.Get("start").(string),
+		Duration: d.Get("duration").(int),
 	}
 
 	// Explicitly set maintenance window id if provided, otherwise we'll use the autogenerated ID from the Kibana API response
-	if maintenanceWindowID := getOrNilString("MaintenanceWindowID", d); maintenanceWindowID != nil && *maintenanceWindowID != "" {
-		maintenanceWindow.MaintenanceWindowID = *maintenanceWindowID
+	if maintenanceWindowID := getOrNilString("id", d); maintenanceWindowID != nil && *maintenanceWindowID != "" {
+		maintenanceWindow.Id = *maintenanceWindowID
 	}
 
 	return maintenanceWindow, diags
@@ -105,13 +104,37 @@ func resourceMaintenanceWindowCreate(ctx context.Context, d *schema.ResourceData
 	return resourceRuleRead(ctx, d, meta)
 }
 
+func resourceMaintenanceWindowUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	client, diags := clients.NewApiClientFromSDKResource(d, meta)
+	if diags.HasError() {
+		return diags
+	}
+
+	serverVersion, diags := client.ServerVersion(ctx)
+	if diags.HasError() {
+		return diags
+	}
+
+	maintenanceWindow, diags := getMaintenanceWindowFromResourceData(d, serverVersion)
+	if diags.HasError() {
+		return diags
+	}
+
+	// DO NOTHING
+	// res, diags := kibana.UpdateAlertingRule(ctx, client, maintenanceWindow)
+	d.SetId(maintenanceWindow.MaintenanceWindowID)
+
+	return resourceRuleRead(ctx, d, meta)
+}
+
 func resourceMaintenanceWindowRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	client, diags := clients.NewApiClientFromSDKResource(d, meta)
 	if diags.HasError() {
 		return diags
 	}
 
 	maintenanceWindow, diags := kibana.GetMaintenanceWindow(ctx, client, d.Id())
+
 	if maintenanceWindow == nil && diags == nil {
 		d.SetId("")
 		return diags
@@ -121,7 +144,7 @@ func resourceMaintenanceWindowRead(ctx context.Context, d *schema.ResourceData,
 	}
 
 	// set the fields
-	if err := d.Set("maintenance_window_id", maintenanceWindow.MaintenanceWindowID); err != nil {
+	if err := d.Set("id", maintenanceWindow.Id); err != nil {
 		return diag.FromErr(err)
 	}
 	if err := d.Set("title", maintenanceWindow.Title); err != nil {

internal/clients/kibana/maintenance_window.go

@@ -1,6 +1,7 @@
 package models
 
 type MaintenanceWindow struct {
+	Id                  string
 	MaintenanceWindowID string
 	Title               string
 	Enabled             bool