Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

azurerm_monitor_diagnostic_setting - wait resource to become ready in creation #27088

Merged
merged 4 commits into from
Aug 19, 2024
Merged

azurerm_monitor_diagnostic_setting - wait resource to become ready in creation #27088

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71df7e5
diagnostic setting wait resource to be ready
teowa Apr 22, 2024
babc8bc
use the deadline from context
teowa Apr 26, 2024
84bd5c7
Merge branch 'main' of github.com:hashicorp/terraform-provider-azurer…
teowa Aug 19, 2024
47c6fb1
link issue
teowa Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 30 additions & 5 deletions internal/services/monitor/monitor_diagnostic_setting_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,26 @@ func resourceMonitorDiagnosticSettingCreate(d *pluginsdk.ResourceData, meta inte
return fmt.Errorf("creating Monitor Diagnostics Setting %q for Resource %q: %+v", id.DiagnosticSettingName, id.ResourceUri, err)
}

deadline, ok := ctx.Deadline()
if !ok {
return fmt.Errorf("internal error: could not retrieve context deadline for %s", id.ID())
}

// https://github.com/Azure/azure-rest-api-specs/issues/30249
log.Printf("[DEBUG] Waiting for Monitor Diagnostic Setting %q for Resource %q to become ready", id.DiagnosticSettingName, id.ResourceUri)
stateConf := &pluginsdk.StateChangeConf{
Pending: []string{"NotFound"},
Target: []string{"Exists"},
Refresh: monitorDiagnosticSettingRefreshFunc(ctx, client, id),
MinTimeout: 5 * time.Second,
ContinuousTargetOccurence: 3,
Timeout: time.Until(deadline),
}

if _, err = stateConf.WaitForStateContext(ctx); err != nil {
return fmt.Errorf("waiting for Monitor Diagnostic Setting %q for Resource %q to become ready: %s", id.DiagnosticSettingName, id.ResourceUri, err)
}

d.SetId(resourceId)

return resourceMonitorDiagnosticSettingRead(d, meta)
Expand Down Expand Up @@ -595,32 +615,37 @@ func resourceMonitorDiagnosticSettingDelete(d *pluginsdk.ResourceData, meta inte
}
}

deadline, ok := ctx.Deadline()
if !ok {
return fmt.Errorf("internal error: could not retrieve context deadline for %s", id.ID())
}

// API appears to be eventually consistent (identified during tainting this resource)
log.Printf("[DEBUG] Waiting for Monitor Diagnostic Setting %q for Resource %q to disappear", id.DiagnosticSettingName, id.ResourceUri)
stateConf := &pluginsdk.StateChangeConf{
Pending: []string{"Exists"},
Target: []string{"NotFound"},
Refresh: monitorDiagnosticSettingDeletedRefreshFunc(ctx, client, *id),
Refresh: monitorDiagnosticSettingRefreshFunc(ctx, client, *id),
MinTimeout: 15 * time.Second,
ContinuousTargetOccurence: 5,
Timeout: d.Timeout(pluginsdk.TimeoutDelete),
Timeout: time.Until(deadline),
}

if _, err = stateConf.WaitForStateContext(ctx); err != nil {
return fmt.Errorf("waiting for Monitor Diagnostic Setting %q for Resource %q to become available: %s", id.DiagnosticSettingName, id.ResourceUri, err)
return fmt.Errorf("waiting for Monitor Diagnostic Setting %q for Resource %q to disappear: %s", id.DiagnosticSettingName, id.ResourceUri, err)
}

return nil
}

func monitorDiagnosticSettingDeletedRefreshFunc(ctx context.Context, client *diagnosticsettings.DiagnosticSettingsClient, targetResourceId diagnosticsettings.ScopedDiagnosticSettingId) pluginsdk.StateRefreshFunc {
func monitorDiagnosticSettingRefreshFunc(ctx context.Context, client *diagnosticsettings.DiagnosticSettingsClient, targetResourceId diagnosticsettings.ScopedDiagnosticSettingId) pluginsdk.StateRefreshFunc {
return func() (interface{}, string, error) {
res, err := client.Get(ctx, targetResourceId)
if err != nil {
if response.WasNotFound(res.HttpResponse) {
return "NotFound", "NotFound", nil
}
return nil, "", fmt.Errorf("issuing read request in monitorDiagnosticSettingDeletedRefreshFunc: %s", err)
return nil, "", fmt.Errorf("issuing read request in monitorDiagnosticSettingRefreshFunc: %s", err)
}

return res, "Exists", nil
Expand Down
Loading