Skip to content

Commit

Permalink
Merge branch 'main' into bmm/update-use-cases
Browse files Browse the repository at this point in the history
  • Loading branch information
BrianMMcClain authored Dec 6, 2024
2 parents dafc697 + 0d6c1d3 commit f5d9c89
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 14 deletions.
2 changes: 1 addition & 1 deletion docs/architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ is represented by

The `configs` package contains some low-level functionality for constructing
configuration objects, but the main entry point is in the sub-package
[`configload`](http://localhost:8080/github.com/hashicorp/terraform/internal/configs/configload]),
[`configload`](http://localhost:8080/github.com/hashicorp/terraform/internal/configs/configload),
via
[`configload.Loader`](http://localhost:8080/github.com/hashicorp/terraform/internal/configs/configload#Loader).
A loader deals with all of the details of installing child modules
Expand Down
13 changes: 0 additions & 13 deletions internal/terraform/node_resource_abstract_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -707,19 +707,6 @@ func (n *NodeAbstractResourceInstance) refresh(ctx EvalContext, deposedKey state
ret.Value = newState
ret.Private = resp.Private

// We have no way to exempt provider using the legacy SDK from this check,
// so we can only log inconsistencies with the updated state values.
// In most cases these are not errors anyway, and represent "drift" from
// external changes which will be handled by the subsequent plan.
if errs := objchange.AssertObjectCompatible(schema, priorVal, ret.Value); len(errs) > 0 {
var buf strings.Builder
fmt.Fprintf(&buf, "[WARN] Provider %q produced an unexpected new value for %s during refresh.", n.ResolvedProvider.Provider.String(), absAddr)
for _, err := range errs {
fmt.Fprintf(&buf, "\n - %s", tfdiags.FormatError(err))
}
log.Print(buf.String())
}

// Call post-refresh hook
diags = diags.Append(ctx.Hook(func(h Hook) (HookAction, error) {
return h.PostRefresh(n.HookResourceIdentity(), deposedKey, priorVal, ret.Value)
Expand Down

0 comments on commit f5d9c89

Please sign in to comment.