Skip to content

fix: prevent deletion of protected logs index (fixes #3470) #3471

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

Open
AndrewCharlesHay wants to merge 2 commits into
base: master
Choose a base branch
from
+10 −0
Open

fix: prevent deletion of protected logs index (fixes #3470) #3471

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecab573
fix: prevent deletion of main logs index (fixes #3470)
AndrewCharlesHay Jan 28, 2026
7b3e34f
feat: replace hardcoded check with prevent_deletion schema field
AndrewCharlesHay Jan 29, 2026
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
10 changes: 10 additions & 0 deletions datadog/resource_datadog_logs_index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ var indexSchema = map[string]*schema.Schema{
Schema: exclusionFilterSchema,
},
},
"prevent_deletion": {
Description: "If true, the logs index cannot be deleted. Defaults to false.",
Type: schema.TypeBool,
Optional: true,
Copy link
Member

@fpighi fpighi Feb 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Having an explicit default here would make it consistent and auto-generated docs would benefit from it too, so the "Defaults to false" description could be removed.

},
}

var exclusionFilterSchema = map[string]*schema.Schema{
Expand Down Expand Up @@ -266,6 +271,11 @@ func resourceDatadogLogsIndexDelete(ctx context.Context, d *schema.ResourceData,

logsIndexMutex.Lock()
defer logsIndexMutex.Unlock()

if v, ok := d.GetOk("prevent_deletion"); ok && v.(bool) {
return diag.Errorf("Deletion of logs index '%s' is prevented by 'prevent_deletion' flag", d.Id())
}

httpResponse, err := apiInstances.GetLogsIndexesApiV1().DeleteLogsIndex(auth, d.Id())
if err != nil {
return utils.TranslateClientErrorDiag(err, httpResponse, "error deleting logs index")
Expand Down