Skip to content

Addresses #89 config drift during import #90

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
RudyBricks wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Addresses #89 config drift during import #90

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac6d215
Avoid PATCH API call if remote state is in-sync with config
RudyBricks Jan 25, 2026
15f640b
Remove binary
RudyBricks Jan 25, 2026
b98aab2
Avoid PATCH
RudyBricks Jan 25, 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
29 changes: 25 additions & 4 deletions internal/services/msgraph_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ import (
"github.com/microsoft/terraform-provider-msgraph/internal/utils/consistency"
)

const FlagMoveState = "move_state"
const (
FlagMoveState = "move_state"
RemoteBody = "remote_body"
)

// Ensure provider defined types fully satisfy framework interfaces.
var (
Expand Down Expand Up @@ -342,9 +345,18 @@ func (r *MSGraphResource) Update(ctx context.Context, req resource.UpdateRequest
}
} else {
var previousBody interface{}
if err := unmarshalBody(state.Body, &previousBody); err != nil {
resp.Diagnostics.AddError("Invalid body in prior state", fmt.Sprintf(`The state "body" is invalid: %s`, err.Error()))
return
if remoteBytes, _ := req.Private.GetKey(ctx, RemoteBody); len(remoteBytes) > 0 && string(remoteBytes) != "null" {
if err := json.Unmarshal(remoteBytes, &previousBody); err != nil {
tflog.Warn(ctx, fmt.Sprintf("Invalid %q value in private state; falling back to state body: %s", RemoteBody, err.Error()))
previousBody = nil
}
}

if previousBody == nil {
if err := unmarshalBody(state.Body, &previousBody); err != nil {
resp.Diagnostics.AddError("Invalid body in prior state", fmt.Sprintf(`The state "body" is invalid: %s`, err.Error()))
return
}
}

diffOption := utils.UpdateJsonOption{
Expand Down Expand Up @@ -468,6 +480,15 @@ func (r *MSGraphResource) Read(ctx context.Context, req resource.ReadRequest, re
return
}
state.Output = types.DynamicValue(buildOutputFromBody(responseBody, model.ResponseExportValues))
remoteBytes, marshalErr := json.Marshal(responseBody)
if marshalErr != nil {
tflog.Warn(ctx, fmt.Sprintf("Failed to marshal remote response for private state: %s", marshalErr.Error()))
} else {
resp.Diagnostics.Append(resp.Private.SetKey(ctx, RemoteBody, remoteBytes)...)
if resp.Diagnostics.HasError() {
return
}
}

if v, _ := req.Private.GetKey(ctx, FlagMoveState); v != nil && string(v) == "true" {
data, err := json.Marshal(responseBody)
Expand Down