Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ require (
github.com/google/go-cmp v0.7.0
github.com/google/uuid v1.6.0
github.com/hashicorp/go-azure-helpers v0.76.2
github.com/hashicorp/go-azure-sdk/resource-manager v0.20260407.1111603
github.com/hashicorp/go-azure-sdk/sdk v0.20260407.1111603
github.com/hashicorp/go-azure-sdk/resource-manager v0.20260413.1214256
github.com/hashicorp/go-azure-sdk/sdk v0.20260413.1214256
github.com/hashicorp/go-cty v1.5.0
github.com/hashicorp/go-hclog v1.6.3
github.com/hashicorp/go-multierror v1.1.1
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,10 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-azure-helpers v0.76.2 h1:59isOIbH9GQky32/yReufDWEyb+k8y4wL33FKlMj6zA=
github.com/hashicorp/go-azure-helpers v0.76.2/go.mod h1:K+woaDnRuEg2qyg8pWMLeYhIcH7QAcUGLFlBHoF/WhA=
github.com/hashicorp/go-azure-sdk/resource-manager v0.20260407.1111603 h1:+6ww87+CGth80b/YIrZe4FNhwYTZwDNC+Fbk4wDfTvY=
github.com/hashicorp/go-azure-sdk/resource-manager v0.20260407.1111603/go.mod h1:qmJoaeeX0Wc4NnFZUXni9iKukomO027JgpI9RYi4/G8=
github.com/hashicorp/go-azure-sdk/sdk v0.20260407.1111603 h1:bjrARFvixNJcOyHxK0H0FQ6O/Pj6P4Wov97f60cqEM4=
github.com/hashicorp/go-azure-sdk/sdk v0.20260407.1111603/go.mod h1:f7jjJ/cl52ErcUVFr0XXmY+8Qajgi/AM3QbB6HVw5oc=
github.com/hashicorp/go-azure-sdk/resource-manager v0.20260413.1214256 h1:y1jFPIQ15AupJEOwz7E/0xPA6zwdHU7xbW8QO+JbtwQ=
github.com/hashicorp/go-azure-sdk/resource-manager v0.20260413.1214256/go.mod h1:TARfLr3IXG2lWFuq5hWK3sG5V6Gs9jNg7xEyfdtnUmc=
github.com/hashicorp/go-azure-sdk/sdk v0.20260413.1214256 h1:2DMWQNgeI62ErwCLJFpICx+PFxmoTxKn1Pm19UjDJrw=
github.com/hashicorp/go-azure-sdk/sdk v0.20260413.1214256/go.mod h1:f7jjJ/cl52ErcUVFr0XXmY+8Qajgi/AM3QbB6HVw5oc=
github.com/hashicorp/go-checkpoint v0.5.0 h1:MFYpPZCnQqQTE18jFwSII6eUQrD/oxMFp3mlgcqk5mU=
github.com/hashicorp/go-checkpoint v0.5.0/go.mod h1:7nfLNL10NsxqO4iWuW6tWW0HjZuDrwkBuEQsVcpCOgg=
github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func (d AutomationRunbookDataSource) Read() sdk.ResourceFunc {
}

if contentResp.Model != nil {
state.Content = string(pointer.From(contentResp.Model))
state.Content = pointer.From(contentResp.Model)
}

state.Tags = pointer.From(model.Tags)
Expand Down
6 changes: 3 additions & 3 deletions internal/services/automation/automation_runbook_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@
if v, ok := d.GetOk("content"); ok {
content := v.(string)
draftRunbookID := runbookdraft.NewRunbookID(id.SubscriptionId, id.ResourceGroupName, id.AutomationAccountName, id.RunbookName)
if err := autoCli.RunbookDraft.ReplaceContentThenPoll(ctx, draftRunbookID, []byte(content)); err != nil {
if err := autoCli.RunbookDraft.ReplaceContentThenPoll(ctx, draftRunbookID, content); err != nil {
return fmt.Errorf("setting the draft for %s: %+v", id, err)
}

Expand Down Expand Up @@ -430,8 +430,8 @@
}
}

if v := contentResp.Model; v != nil && *v != nil {
d.Set("content", string(*v))
if v := contentResp.Model; v != nil {
d.Set("content", *v)

Check failure on line 434 in internal/services/automation/automation_runbook_resource.go

View workflow job for this annotation

GitHub Actions / tflint

R002: ResourceData.Set() pointer value dereference is extraneous
Comment thread
sreallymatt marked this conversation as resolved.
Outdated
}

jsMap := make(map[uuid.UUID]jobschedule.JobScheduleProperties)
Expand Down
2 changes: 1 addition & 1 deletion internal/services/monitor/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/hashicorp/go-azure-sdk/resource-manager/insights/2023-03-11/datacollectionruleassociations"
"github.com/hashicorp/go-azure-sdk/resource-manager/insights/2023-03-11/datacollectionrules"
"github.com/hashicorp/go-azure-sdk/resource-manager/insights/2023-03-15-preview/scheduledqueryrules"
"github.com/hashicorp/go-azure-sdk/resource-manager/insights/2023-04-03/azuremonitorworkspaces"
"github.com/hashicorp/go-azure-sdk/resource-manager/monitor/2023-04-03/azuremonitorworkspaces"
"github.com/hashicorp/terraform-provider-azurerm/internal/common"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
"github.com/hashicorp/go-azure-sdk/resource-manager/insights/2023-04-03/azuremonitorworkspaces"
"github.com/hashicorp/go-azure-sdk/resource-manager/monitor/2023-04-03/azuremonitorworkspaces"
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/monitor/monitor_workspace_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-helpers/resourcemanager/commonschema"
"github.com/hashicorp/go-azure-helpers/resourcemanager/location"
"github.com/hashicorp/go-azure-sdk/resource-manager/insights/2023-04-03/azuremonitorworkspaces"
"github.com/hashicorp/go-azure-sdk/resource-manager/monitor/2023-04-03/azuremonitorworkspaces"
"github.com/hashicorp/terraform-provider-azurerm/internal/sdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/go-azure-sdk/resource-manager/insights/2023-04-03/azuremonitorworkspaces"
"github.com/hashicorp/go-azure-sdk/resource-manager/monitor/2023-04-03/azuremonitorworkspaces"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading