IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2025-02-25 18:45:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

Include sensitive metadata from the schema when building the json state output (#33059)

Browse Source 
* include sensitive metadata from the schema when building the json state output

* found another test case
This commit is contained in:
Liam Cervante 2023-04-24 10:52:44 +02:00 committed by GitHub
parent 519a18aedf
commit 14123e277c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 64 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/command/jsonstate/state.go
View File

@ -398,7 +398,11 @@ func marshalResources(resources map[string]*states.Resource, module addrs.Module
current.AttributeValues = marshalAttributeValues(riObj.Value)
s := SensitiveAsBool(riObj.Value)
value, marks := riObj.Value.UnmarkDeepWithPaths()
if schema.ContainsSensitive() {
marks = append(marks, schema.ValueMarks(value, nil)...)
}
s := SensitiveAsBool(value.MarkWithPaths(marks))
v, err := ctyjson.Marshal(s, s.Type())
if err != nil {
return nil, err
@ -445,7 +449,11 @@ func marshalResources(resources map[string]*states.Resource, module addrs.Module
deposed.AttributeValues = marshalAttributeValues(riObj.Value)
s := SensitiveAsBool(riObj.Value)
value, marks := riObj.Value.UnmarkDeepWithPaths()
if schema.ContainsSensitive() {
marks = append(marks, schema.ValueMarks(value, nil)...)
}
s := SensitiveAsBool(value.MarkWithPaths(marks))
v, err := ctyjson.Marshal(s, s.Type())
if err != nil {
return nil, err

54
internal/command/jsonstate/state_test.go
View File

@ -226,7 +226,49 @@ func TestMarshalResources(t *testing.T) {
"foozles": json.RawMessage(`null`),
"woozles": json.RawMessage(`"confuzles"`),
},
SensitiveValues: json.RawMessage("{}"),
SensitiveValues: json.RawMessage("{\"foozles\":true}"),
},
},
false,
},
"single resource_with_sensitive": {
map[string]*states.Resource{
"test_thing.baz": {
Addr: addrs.AbsResource{
Resource: addrs.Resource{
Mode: addrs.ManagedResourceMode,
Type: "test_thing",
Name: "bar",
},
},
Instances: map[addrs.InstanceKey]*states.ResourceInstance{
addrs.NoKey: {
Current: &states.ResourceInstanceObjectSrc{
Status: states.ObjectReady,
AttrsJSON: []byte(`{"woozles":"confuzles","foozles":"sensuzles"}`),
},
},
},
ProviderConfig: addrs.AbsProviderConfig{
Provider: addrs.NewDefaultProvider("test"),
Module: addrs.RootModule,
},
},
},
testSchemas(),
[]Resource{
{
Address: "test_thing.bar",
Mode: "managed",
Type: "test_thing",
Name: "bar",
Index: nil,
ProviderName: "registry.terraform.io/hashicorp/test",
AttributeValues: AttributeValues{
"foozles": json.RawMessage(`"sensuzles"`),
"woozles": json.RawMessage(`"confuzles"`),
},
SensitiveValues: json.RawMessage("{\"foozles\":true}"),
},
},
false,
@ -343,7 +385,7 @@ func TestMarshalResources(t *testing.T) {
"foozles": json.RawMessage(`null`),
"woozles": json.RawMessage(`"confuzles"`),
},
SensitiveValues: json.RawMessage("{}"),
SensitiveValues: json.RawMessage("{\"foozles\":true}"),
},
},
false,
@ -385,7 +427,7 @@ func TestMarshalResources(t *testing.T) {
"foozles": json.RawMessage(`null`),
"woozles": json.RawMessage(`"confuzles"`),
},
SensitiveValues: json.RawMessage("{}"),
SensitiveValues: json.RawMessage("{\"foozles\":true}"),
},
},
false,
@ -430,7 +472,7 @@ func TestMarshalResources(t *testing.T) {
"foozles": json.RawMessage(`null`),
"woozles": json.RawMessage(`"confuzles"`),
},
SensitiveValues: json.RawMessage("{}"),
SensitiveValues: json.RawMessage("{\"foozles\":true}"),
},
},
false,
@ -478,7 +520,7 @@ func TestMarshalResources(t *testing.T) {
"foozles": json.RawMessage(`null`),
"woozles": json.RawMessage(`"confuzles"`),
},
SensitiveValues: json.RawMessage("{}"),
SensitiveValues: json.RawMessage("{\"foozles\":true}"),
},
{
Address: "test_thing.bar",
@ -492,7 +534,7 @@ func TestMarshalResources(t *testing.T) {
"foozles": json.RawMessage(`null`),
"woozles": json.RawMessage(`"confuzles"`),
},
SensitiveValues: json.RawMessage("{}"),
SensitiveValues: json.RawMessage("{\"foozles\":true}"),
},
},
false,

8
internal/command/testdata/show-json/conditions/output-refresh-only.json vendored
View File

@ -56,7 +56,9 @@
"id": "placeheld",
"password": null
},
"sensitive_values": {}
"sensitive_values": {
"password": true
}
},
{
"address": "test_instance.foo",
@ -70,7 +72,9 @@
"id": "placeholder",
"password": null
},
"sensitive_values": {}
"sensitive_values": {
"password": true
}
}
]
}