2018-07-21 02:15:29 +02:00
|
|
|
package states
|
|
|
|
|
|
|
|
import (
|
|
|
|
"github.com/zclconf/go-cty/cty"
|
|
|
|
ctyjson "github.com/zclconf/go-cty/cty/json"
|
|
|
|
|
|
|
|
"github.com/hashicorp/terraform/addrs"
|
2019-08-07 01:58:58 +02:00
|
|
|
"github.com/hashicorp/terraform/configs/hcl2shim"
|
2018-07-21 02:15:29 +02:00
|
|
|
)
|
|
|
|
|
|
|
|
// ResourceInstanceObjectSrc is a not-fully-decoded version of
|
|
|
|
// ResourceInstanceObject. Decoding of it can be completed by first handling
|
|
|
|
// any schema migration steps to get to the latest schema version and then
|
|
|
|
// calling method Decode with the implied type of the latest schema.
|
|
|
|
type ResourceInstanceObjectSrc struct {
|
|
|
|
// SchemaVersion is the resource-type-specific schema version number that
|
|
|
|
// was current when either AttrsJSON or AttrsFlat was encoded. Migration
|
|
|
|
// steps are required if this is less than the current version number
|
|
|
|
// reported by the corresponding provider.
|
|
|
|
SchemaVersion uint64
|
|
|
|
|
|
|
|
// AttrsJSON is a JSON-encoded representation of the object attributes,
|
|
|
|
// encoding the value (of the object type implied by the associated resource
|
|
|
|
// type schema) that represents this remote object in Terraform Language
|
|
|
|
// expressions, and is compared with configuration when producing a diff.
|
|
|
|
//
|
|
|
|
// This is retained in JSON format here because it may require preprocessing
|
|
|
|
// before decoding if, for example, the stored attributes are for an older
|
|
|
|
// schema version which the provider must upgrade before use. If the
|
|
|
|
// version is current, it is valid to simply decode this using the
|
|
|
|
// type implied by the current schema, without the need for the provider
|
|
|
|
// to perform an upgrade first.
|
|
|
|
//
|
|
|
|
// When writing a ResourceInstanceObject into the state, AttrsJSON should
|
|
|
|
// always be conformant to the current schema version and the current
|
|
|
|
// schema version should be recorded in the SchemaVersion field.
|
|
|
|
AttrsJSON []byte
|
|
|
|
|
|
|
|
// AttrsFlat is a legacy form of attributes used in older state file
|
|
|
|
// formats, and in the new state format for objects that haven't yet been
|
|
|
|
// upgraded. This attribute is mutually exclusive with Attrs: for any
|
|
|
|
// ResourceInstanceObject, only one of these attributes may be populated
|
|
|
|
// and the other must be nil.
|
|
|
|
//
|
|
|
|
// An instance object with this field populated should be upgraded to use
|
|
|
|
// Attrs at the earliest opportunity, since this legacy flatmap-based
|
|
|
|
// format will be phased out over time. AttrsFlat should not be used when
|
|
|
|
// writing new or updated objects to state; instead, callers must follow
|
|
|
|
// the recommendations in the AttrsJSON documentation above.
|
|
|
|
AttrsFlat map[string]string
|
|
|
|
|
Store sensitive attribute paths in state (#26338)
* Add creation test and simplify in-place test
* Add deletion test
* Start adding marking from state
Start storing paths that should be marked
when pulled out of state. Implements deep
copy for attr paths. This commit also includes some
comment noise from investigations, and fixing the diff test
* Fix apply stripping marks
* Expand diff tests
* Basic apply test
* Update comments on equality checks to clarify current understanding
* Add JSON serialization for sensitive paths
We need to serialize a slice of cty.Path values to be used to re-mark
the sensitive values of a resource instance when loading the state file.
Paths consist of a list of steps, each of which may be either getting an
attribute value by name, or indexing into a collection by string or
number.
To serialize these without building a complex parser for a compact
string form, we render a nested array of small objects, like so:
[
[
{ type: "get_attr", value: "foo" },
{ type: "index", value: { "type": "number", "value": 2 } }
]
]
The above example is equivalent to a path `foo[2]`.
* Format diffs with map types
Comparisons need unmarked values to operate on,
so create unmarked values for those operations. Additionally,
change diff to cover map types
* Remove debugging printing
* Fix bug with marking non-sensitive values
When pulling a sensitive value from state,
we were previously using those marks to remark
the planned new value, but that new value
might *not* be sensitive, so let's not do that
* Fix apply test
Apply was not passing the second state
through to the third pass at apply
* Consistency in checking for length of paths vs inspecting into value
* In apply, don't mark with before paths
* AttrPaths test coverage for DeepCopy
* Revert format changes
Reverts format changes in format/diff for this
branch so those changes can be discussed on a separate PR
* Refactor name of AttrPaths to AttrSensitivePaths
* Rename AttributePaths/attributePaths for naming consistency
Co-authored-by: Alisdair McDiarmid <alisdair@users.noreply.github.com>
2020-09-24 18:40:17 +02:00
|
|
|
// AttrSensitivePaths is an array of paths to mark as sensitive coming out of
|
|
|
|
// state, or to save as sensitive paths when saving state
|
|
|
|
AttrSensitivePaths []cty.PathValueMarks
|
|
|
|
|
2018-07-21 02:15:29 +02:00
|
|
|
// These fields all correspond to the fields of the same name on
|
|
|
|
// ResourceInstanceObject.
|
2019-12-12 20:59:18 +01:00
|
|
|
Private []byte
|
|
|
|
Status ObjectStatus
|
2020-03-23 20:26:18 +01:00
|
|
|
Dependencies []addrs.ConfigResource
|
2019-12-12 20:59:18 +01:00
|
|
|
CreateBeforeDestroy bool
|
2018-07-21 02:15:29 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// Decode unmarshals the raw representation of the object attributes. Pass the
|
|
|
|
// implied type of the corresponding resource type schema for correct operation.
|
|
|
|
//
|
|
|
|
// Before calling Decode, the caller must check that the SchemaVersion field
|
|
|
|
// exactly equals the version number of the schema whose implied type is being
|
|
|
|
// passed, or else the result is undefined.
|
|
|
|
//
|
|
|
|
// The returned object may share internal references with the receiver and
|
|
|
|
// so the caller must not mutate the receiver any further once once this
|
|
|
|
// method is called.
|
|
|
|
func (os *ResourceInstanceObjectSrc) Decode(ty cty.Type) (*ResourceInstanceObject, error) {
|
|
|
|
var val cty.Value
|
|
|
|
var err error
|
|
|
|
if os.AttrsFlat != nil {
|
|
|
|
// Legacy mode. We'll do our best to unpick this from the flatmap.
|
|
|
|
val, err = hcl2shim.HCL2ValueFromFlatmap(os.AttrsFlat, ty)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
val, err = ctyjson.Unmarshal(os.AttrsJSON, ty)
|
Store sensitive attribute paths in state (#26338)
* Add creation test and simplify in-place test
* Add deletion test
* Start adding marking from state
Start storing paths that should be marked
when pulled out of state. Implements deep
copy for attr paths. This commit also includes some
comment noise from investigations, and fixing the diff test
* Fix apply stripping marks
* Expand diff tests
* Basic apply test
* Update comments on equality checks to clarify current understanding
* Add JSON serialization for sensitive paths
We need to serialize a slice of cty.Path values to be used to re-mark
the sensitive values of a resource instance when loading the state file.
Paths consist of a list of steps, each of which may be either getting an
attribute value by name, or indexing into a collection by string or
number.
To serialize these without building a complex parser for a compact
string form, we render a nested array of small objects, like so:
[
[
{ type: "get_attr", value: "foo" },
{ type: "index", value: { "type": "number", "value": 2 } }
]
]
The above example is equivalent to a path `foo[2]`.
* Format diffs with map types
Comparisons need unmarked values to operate on,
so create unmarked values for those operations. Additionally,
change diff to cover map types
* Remove debugging printing
* Fix bug with marking non-sensitive values
When pulling a sensitive value from state,
we were previously using those marks to remark
the planned new value, but that new value
might *not* be sensitive, so let's not do that
* Fix apply test
Apply was not passing the second state
through to the third pass at apply
* Consistency in checking for length of paths vs inspecting into value
* In apply, don't mark with before paths
* AttrPaths test coverage for DeepCopy
* Revert format changes
Reverts format changes in format/diff for this
branch so those changes can be discussed on a separate PR
* Refactor name of AttrPaths to AttrSensitivePaths
* Rename AttributePaths/attributePaths for naming consistency
Co-authored-by: Alisdair McDiarmid <alisdair@users.noreply.github.com>
2020-09-24 18:40:17 +02:00
|
|
|
// Mark the value with paths if applicable
|
|
|
|
if os.AttrSensitivePaths != nil {
|
|
|
|
val = val.MarkWithPaths(os.AttrSensitivePaths)
|
|
|
|
}
|
2018-07-21 02:15:29 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return &ResourceInstanceObject{
|
2019-12-12 20:59:18 +01:00
|
|
|
Value: val,
|
|
|
|
Status: os.Status,
|
|
|
|
Dependencies: os.Dependencies,
|
|
|
|
Private: os.Private,
|
|
|
|
CreateBeforeDestroy: os.CreateBeforeDestroy,
|
2018-07-21 02:15:29 +02:00
|
|
|
}, nil
|
|
|
|
}
|
2018-11-30 19:56:50 +01:00
|
|
|
|
|
|
|
// CompleteUpgrade creates a new ResourceInstanceObjectSrc by copying the
|
|
|
|
// metadata from the receiver and writing in the given new schema version
|
|
|
|
// and attribute value that are presumed to have resulted from upgrading
|
|
|
|
// from an older schema version.
|
|
|
|
func (os *ResourceInstanceObjectSrc) CompleteUpgrade(newAttrs cty.Value, newType cty.Type, newSchemaVersion uint64) (*ResourceInstanceObjectSrc, error) {
|
|
|
|
new := os.DeepCopy()
|
|
|
|
new.AttrsFlat = nil // We always use JSON after an upgrade, even if the source used flatmap
|
|
|
|
|
|
|
|
// This is the same principle as ResourceInstanceObject.Encode, but
|
|
|
|
// avoiding a decode/re-encode cycle because we don't have type info
|
|
|
|
// available for the "old" attributes.
|
|
|
|
newAttrs = cty.UnknownAsNull(newAttrs)
|
|
|
|
src, err := ctyjson.Marshal(newAttrs, newType)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
new.AttrsJSON = src
|
|
|
|
new.SchemaVersion = newSchemaVersion
|
|
|
|
return new, nil
|
|
|
|
}
|