Skip to content

Fix misleading fwprovider diagnostics #3646

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
michalmela wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix misleading fwprovider diagnostics #3646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion datadog/fwprovider/data_source_datadog_apm_retention_filters_order.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func (d *datadogApmRetentionFiltersOrderDataSource) Read(ctx context.Context, re

ddResp, _, err := d.Api.ListApmRetentionFilters(d.Auth)
if err != nil {
resp.Diagnostics.Append(utils.FrameworkErrorDiag(err, "error getting datadog team"))
resp.Diagnostics.Append(utils.FrameworkErrorDiag(err, "error listing APM retention filters"))
return
}

Expand Down
2 changes: 1 addition & 1 deletion datadog/fwprovider/resource_datadog_domain_allowlist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func (r *domainAllowlistResource) Read(ctx context.Context, request resource.Rea

resp, httpResp, err := r.Api.GetDomainAllowlist(r.Auth)
if err != nil {
response.Diagnostics.Append(utils.FrameworkErrorDiag(utils.TranslateClientError(err, httpResp, ""), "error getting team permission setting"))
response.Diagnostics.Append(utils.FrameworkErrorDiag(utils.TranslateClientError(err, httpResp, ""), "error getting domain allowlist"))
return
}
if err := utils.CheckForUnparsed(resp); err != nil {
Expand Down
6 changes: 3 additions & 3 deletions datadog/fwprovider/resource_datadog_ip_allowlist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func (r *ipAllowListResource) Read(ctx context.Context, request resource.ReadReq

resp, httpResp, err := r.Api.GetIPAllowlist(r.Auth)
if err != nil {
response.Diagnostics.Append(utils.FrameworkErrorDiag(utils.TranslateClientError(err, httpResp, ""), "error getting team permission setting"))
response.Diagnostics.Append(utils.FrameworkErrorDiag(utils.TranslateClientError(err, httpResp, ""), "error getting IP allowlist"))
return
}
if err := utils.CheckForUnparsed(resp); err != nil {
Expand Down Expand Up @@ -129,7 +129,7 @@ func (r *ipAllowListResource) Create(ctx context.Context, request resource.Creat
ipAllowlistReq, _ := buildIPAllowlistUpdateRequest(state)
resp, httpResp, err := r.Api.UpdateIPAllowlist(r.Auth, *ipAllowlistReq)
if err != nil {
response.Diagnostics.Append(utils.FrameworkErrorDiag(utils.TranslateClientError(err, httpResp, ""), "error updating IP allowlist"))
response.Diagnostics.Append(utils.FrameworkErrorDiag(utils.TranslateClientError(err, httpResp, ""), "error creating IP allowlist"))
return
}

Expand Down Expand Up @@ -158,7 +158,7 @@ func (r *ipAllowListResource) Update(ctx context.Context, request resource.Updat
}
resp, httpResp, err := r.Api.UpdateIPAllowlist(r.Auth, *ipAllowlistReq)
if err != nil {
response.Diagnostics.Append(utils.FrameworkErrorDiag(utils.TranslateClientError(err, httpResp, " error updating IP allowlist"), ""))
response.Diagnostics.Append(utils.FrameworkErrorDiag(utils.TranslateClientError(err, httpResp, "error updating IP allowlist"), ""))
return
}
if err := utils.CheckForUnparsed(resp); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion datadog/fwprovider/resource_datadog_service_account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func (r *serviceAccountResource) Read(ctx context.Context, request resource.Read
state.ID = types.String{}
return
}
response.Diagnostics.Append(utils.FrameworkErrorDiag(err, "error getting user"))
response.Diagnostics.Append(utils.FrameworkErrorDiag(err, "error getting service account"))
return
}
if diags := updateServiceAccountStateV2(ctx, &state, &userResponse); diags.HasError() {
Expand Down
6 changes: 3 additions & 3 deletions datadog/fwprovider/resource_datadog_team.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func (r *teamResource) Create(ctx context.Context, request resource.CreateReques

resp, _, err := r.Api.CreateTeam(r.Auth, *body)
if err != nil {
response.Diagnostics.Append(utils.FrameworkErrorDiag(err, "error retrieving Team"))
response.Diagnostics.Append(utils.FrameworkErrorDiag(err, "error creating Team"))
return
}
if err := utils.CheckForUnparsed(resp); err != nil {
Expand Down Expand Up @@ -157,7 +157,7 @@ func (r *teamResource) Update(ctx context.Context, request resource.UpdateReques

resp, _, err := r.Api.UpdateTeam(r.Auth, id, *body)
if err != nil {
response.Diagnostics.Append(utils.FrameworkErrorDiag(err, "error retrieving Team"))
response.Diagnostics.Append(utils.FrameworkErrorDiag(err, "error updating Team"))
return
}
if err := utils.CheckForUnparsed(resp); err != nil {
Expand All @@ -184,7 +184,7 @@ func (r *teamResource) Delete(ctx context.Context, request resource.DeleteReques
if httpResp != nil && httpResp.StatusCode == 404 {
return
}
response.Diagnostics.Append(utils.FrameworkErrorDiag(err, "error deleting team"))
response.Diagnostics.Append(utils.FrameworkErrorDiag(err, "error deleting Team"))
return
}
}
Expand Down