Merge pull request #363 from cloudskiff/new-archi/filtering

Refactoring to filter on Cty.Value

pkg/analyser/analyzer_test.go

@@ -178,8 +178,8 @@ func TestAnalyze(t *testing.T) {
 					FooBar: "foobar",
 					BarFoo: "barfoo",
 					Struct: struct {
-						Baz string `computed:"true"`
+						Baz string `cty:"baz" computed:"true"`
-						Bar string
+						Bar string `cty:"bar"`
 					}{"baz", "bar"},
 				},
 			},
@@ -189,8 +189,8 @@ func TestAnalyze(t *testing.T) {
 					FooBar: "barfoo",
 					BarFoo: "foobar",
 					Struct: struct {
-						Baz string `computed:"true"`
+						Baz string `cty:"baz" computed:"true"`
-						Bar string
+						Bar string `cty:"bar"`
 					}{"bar", "baz"},
 				},
 			},
@@ -201,8 +201,8 @@ func TestAnalyze(t *testing.T) {
 						FooBar: "foobar",
 						BarFoo: "barfoo",
 						Struct: struct {
-							Baz string `computed:"true"`
+							Baz string `cty:"baz" computed:"true"`
-							Bar string
+							Bar string `cty:"bar"`
 						}{"baz", "bar"},
 					},
 				},
@@ -218,8 +218,8 @@ func TestAnalyze(t *testing.T) {
 							FooBar: "foobar",
 							BarFoo: "barfoo",
 							Struct: struct {
-								Baz string `computed:"true"`
+								Baz string `cty:"baz" computed:"true"`
-								Bar string
+								Bar string `cty:"bar"`
 							}{"baz", "bar"},
 						},
 						Changelog: Changelog{
@@ -425,8 +425,8 @@ func TestAnalyze(t *testing.T) {
 					FooBar: "foobar",
 					BarFoo: "barfoo",
 					Struct: struct {
-						Baz string `computed:"true"`
+						Baz string `cty:"baz" computed:"true"`
-						Bar string
+						Bar string `cty:"bar"`
 					}{"baz", "bar"},
 				},
 				&testresource.FakeResource{
@@ -435,8 +435,8 @@ func TestAnalyze(t *testing.T) {
 					FooBar: "foobar",
 					BarFoo: "barfoo",
 					Struct: struct {
-						Baz string `computed:"true"`
+						Baz string `cty:"baz" computed:"true"`
-						Bar string
+						Bar string `cty:"bar"`
 					}{"baz", "bar"},
 				},
 				&testresource.FakeResource{
@@ -445,8 +445,8 @@ func TestAnalyze(t *testing.T) {
 					FooBar: "foobar",
 					BarFoo: "barfoo",
 					Struct: struct {
-						Baz string `computed:"true"`
+						Baz string `cty:"baz" computed:"true"`
-						Bar string
+						Bar string `cty:"bar"`
 					}{"baz", "bar"},
 				},
 				&testresource.FakeResource{
@@ -455,12 +455,12 @@ func TestAnalyze(t *testing.T) {
 					FooBar: "foobar",
 					BarFoo: "barfoo",
 					Struct: struct {
-						Baz string `computed:"true"`
+						Baz string `cty:"baz" computed:"true"`
-						Bar string
+						Bar string `cty:"bar"`
 					}{"baz", "bar"},
 					StructSlice: []struct {
-						String string   `computed:"true"`
+						String string   `cty:"string" computed:"true"`
-						Array  []string `computed:"true"`
+						Array  []string `cty:"array" computed:"true"`
 					}{
 						{"one", []string{"foo"}},
 					},
@@ -473,8 +473,8 @@ func TestAnalyze(t *testing.T) {
 					FooBar: "barfoo",
 					BarFoo: "foobar",
 					Struct: struct {
-						Baz string `computed:"true"`
+						Baz string `cty:"baz" computed:"true"`
-						Bar string
+						Bar string `cty:"bar"`
 					}{"bar", "baz"},
 				},
 				&testresource.FakeResource{
@@ -483,8 +483,8 @@ func TestAnalyze(t *testing.T) {
 					FooBar: "barfoo",
 					BarFoo: "foobar",
 					Struct: struct {
-						Baz string `computed:"true"`
+						Baz string `cty:"baz" computed:"true"`
-						Bar string
+						Bar string `cty:"bar"`
 					}{"bar", "baz"},
 				},
 				&testresource.FakeResource{
@@ -493,8 +493,8 @@ func TestAnalyze(t *testing.T) {
 					FooBar: "barfoo",
 					BarFoo: "foobar",
 					Struct: struct {
-						Baz string `computed:"true"`
+						Baz string `cty:"baz" computed:"true"`
-						Bar string
+						Bar string `cty:"bar"`
 					}{"bar", "baz"},
 				},
 				&testresource.FakeResource{
@@ -503,12 +503,12 @@ func TestAnalyze(t *testing.T) {
 					FooBar: "barfoo",
 					BarFoo: "foobar",
 					Struct: struct {
-						Baz string `computed:"true"`
+						Baz string `cty:"baz" computed:"true"`
-						Bar string
+						Bar string `cty:"bar"`
 					}{"bar", "baz"},
 					StructSlice: []struct {
-						String string   `computed:"true"`
+						String string   `cty:"string" computed:"true"`
-						Array  []string `computed:"true"`
+						Array  []string `cty:"array" computed:"true"`
 					}{
 						{"two", []string{"oof"}},
 					},
@@ -533,12 +533,12 @@ func TestAnalyze(t *testing.T) {
 						FooBar: "foobar",
 						BarFoo: "barfoo",
 						Struct: struct {
-							Baz string `computed:"true"`
+							Baz string `cty:"baz" computed:"true"`
-							Bar string
+							Bar string `cty:"bar"`
 						}{"baz", "bar"},
 						StructSlice: []struct {
-							String string   `computed:"true"`
+							String string   `cty:"string" computed:"true"`
-							Array  []string `computed:"true"`
+							Array  []string `cty:"array" computed:"true"`
 						}{
 							{"one", []string{"foo"}},
 						},
@@ -557,12 +557,12 @@ func TestAnalyze(t *testing.T) {
 							FooBar: "foobar",
 							BarFoo: "barfoo",
 							Struct: struct {
-								Baz string `computed:"true"`
+								Baz string `cty:"baz" computed:"true"`
-								Bar string
+								Bar string `cty:"bar"`
 							}{"baz", "bar"},
 							StructSlice: []struct {
-								String string   `computed:"true"`
+								String string   `cty:"string" computed:"true"`
-								Array  []string `computed:"true"`
+								Array  []string `cty:"array" computed:"true"`
 							}{
 								{"one", []string{"foo"}},
 							},
@@ -668,8 +668,8 @@ func TestAnalyze(t *testing.T) {
 					FooBar: "foobar",
 					BarFoo: "barfoo",
 					Struct: struct {
-						Baz string `computed:"true"`
+						Baz string `cty:"baz" computed:"true"`
-						Bar string
+						Bar string `cty:"bar"`
 					}{"baz", "bar"},
 				},
 				&testresource.FakeResource{
@@ -678,12 +678,12 @@ func TestAnalyze(t *testing.T) {
 					FooBar: "foobar",
 					BarFoo: "barfoo",
 					Struct: struct {
-						Baz string `computed:"true"`
+						Baz string `cty:"baz" computed:"true"`
-						Bar string
+						Bar string `cty:"bar"`
 					}{"baz", "bar"},
 					StructSlice: []struct {
-						String string   `computed:"true"`
+						String string   `cty:"string" computed:"true"`
-						Array  []string `computed:"true"`
+						Array  []string `cty:"array" computed:"true"`
 					}{
 						{"one", []string{"foo"}},
 					},
@@ -696,8 +696,8 @@ func TestAnalyze(t *testing.T) {
 					FooBar: "foobar",
 					BarFoo: "barfoo",
 					Struct: struct {
-						Baz string `computed:"true"`
+						Baz string `cty:"baz" computed:"true"`
-						Bar string
+						Bar string `cty:"bar"`
 					}{"bazdiff", "bardiff"},
 				},
 				&testresource.FakeResource{
@@ -706,12 +706,12 @@ func TestAnalyze(t *testing.T) {
 					FooBar: "foobar",
 					BarFoo: "barfoo",
 					Struct: struct {
-						Baz string `computed:"true"`
+						Baz string `cty:"baz" computed:"true"`
-						Bar string
+						Bar string `cty:"bar"`
 					}{"bazdiff", "bar"},
 					StructSlice: []struct {
-						String string   `computed:"true"`
+						String string   `cty:"string" computed:"true"`
-						Array  []string `computed:"true"`
+						Array  []string `cty:"array" computed:"true"`
 					}{
 						{"onediff", []string{"foo", "diff"}},
 					},
@@ -726,8 +726,8 @@ func TestAnalyze(t *testing.T) {
 						FooBar: "foobar",
 						BarFoo: "barfoo",
 						Struct: struct {
-							Baz string `computed:"true"`
+							Baz string `cty:"baz" computed:"true"`
-							Bar string
+							Bar string `cty:"bar"`
 						}{"baz", "bar"},
 					},
 					&testresource.FakeResource{
@@ -736,12 +736,12 @@ func TestAnalyze(t *testing.T) {
 						FooBar: "foobar",
 						BarFoo: "barfoo",
 						Struct: struct {
-							Baz string `computed:"true"`
+							Baz string `cty:"baz" computed:"true"`
-							Bar string
+							Bar string `cty:"bar"`
 						}{"baz", "bar"},
 						StructSlice: []struct {
-							String string   `computed:"true"`
+							String string   `cty:"string" computed:"true"`
-							Array  []string `computed:"true"`
+							Array  []string `cty:"array" computed:"true"`
 						}{
 							{"one", []string{"foo"}},
 						},
@@ -760,8 +760,8 @@ func TestAnalyze(t *testing.T) {
 							FooBar: "foobar",
 							BarFoo: "barfoo",
 							Struct: struct {
-								Baz string `computed:"true"`
+								Baz string `cty:"baz" computed:"true"`
-								Bar string
+								Bar string `cty:"bar"`
 							}{"baz", "bar"},
 						},
 						Changelog: Changelog{
@@ -798,12 +798,12 @@ func TestAnalyze(t *testing.T) {
 							FooBar: "foobar",
 							BarFoo: "barfoo",
 							Struct: struct {
-								Baz string `computed:"true"`
+								Baz string `cty:"baz" computed:"true"`
-								Bar string
+								Bar string `cty:"bar"`
 							}{"baz", "bar"},
 							StructSlice: []struct {
-								String string   `computed:"true"`
+								String string   `cty:"string" computed:"true"`
-								Array  []string `computed:"true"`
+								Array  []string `cty:"array" computed:"true"`
 							}{
 								{"one", []string{"foo"}},
 							},

pkg/filter/filter_engine.go

@@ -4,8 +4,11 @@ import (
 	"encoding/json"
 	"errors"
 
-	"github.com/cloudskiff/driftctl/pkg/resource"
 	"github.com/jmespath/go-jmespath"
+	"github.com/zclconf/go-cty/cty"
+	ctyjson "github.com/zclconf/go-cty/cty/json"
+
+	"github.com/cloudskiff/driftctl/pkg/resource"
 )
 
 type FilterEngine struct {
@@ -34,7 +37,11 @@ func (e *FilterEngine) Run(resources []resource.Resource) ([]resource.Resource,
 		// We need to serialize all attributes to untyped interface from JMESPath to work
 		// map[string]string and map[string]SomeThing will not work without it
 		// https://github.com/jmespath/go-jmespath/issues/22
-		bytes, _ := json.Marshal(res)
+		ctyVal := res.CtyValue()
+		if ctyVal == nil {
+			ctyVal = &cty.EmptyObjectVal
+		}
+		bytes, _ := ctyjson.Marshal(*ctyVal, ctyVal.Type())
 		var attrs interface{}
 		_ = json.Unmarshal(bytes, &attrs)
 		f := filtrableResource{

pkg/filter/filter_engine_test.go

@@ -5,6 +5,8 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/zclconf/go-cty/cty"
+
 	testresource "github.com/cloudskiff/driftctl/test/resource"
 
 	"github.com/cloudskiff/driftctl/pkg/resource"
@@ -93,130 +95,238 @@ func TestFilterEngine_Run(t *testing.T) {
 		},
 		{
 			name: "filter on resource field",
-			expr: "Attr.BarFoo=='filtered'",
+			expr: "Attr.bar_foo=='filtered'",
 			resources: []resource.Resource{
 				&testresource.FakeResource{},
 				&testresource.FakeResource{
-					BarFoo: "filtered",
+					CtyVal: func() *cty.Value {
+						v := cty.ObjectVal(map[string]cty.Value{
+							"bar_foo": cty.StringVal("filtered"),
+						})
+						return &v
+					}(),
 				},
 			},
 			want: []resource.Resource{
 				&testresource.FakeResource{
-					BarFoo: "filtered",
+					CtyVal: func() *cty.Value {
+						v := cty.ObjectVal(map[string]cty.Value{
+							"bar_foo": cty.StringVal("filtered"),
+						})
+						return &v
+					}(),
 				},
 			},
 		},
 		{
 			name: "filter on resource type and field",
-			expr: "Type=='filtered_resource' && Attr.BarFoo=='filtered'",
+			expr: "Type=='filtered_resource' && Attr.bar_foo=='filtered'",
 			resources: []resource.Resource{
 				&testresource.FakeResource{},
 				&testresource.FakeResource{
-					Type:   "filtered_resource",
+					Type: "filtered_resource",
-					BarFoo: "filtered",
+					CtyVal: func() *cty.Value {
+						v := cty.ObjectVal(map[string]cty.Value{
+							"bar_foo": cty.StringVal("filtered"),
+						})
+						return &v
+					}(),
 				},
 			},
 			want: []resource.Resource{
 				&testresource.FakeResource{
-					Type:   "filtered_resource",
+					Type: "filtered_resource",
-					BarFoo: "filtered",
+					CtyVal: func() *cty.Value {
+						v := cty.ObjectVal(map[string]cty.Value{
+							"bar_foo": cty.StringVal("filtered"),
+						})
+						return &v
+					}(),
 				},
 			},
 		},
 		{
 			name: "filter on resource map of native type field",
-			expr: "Attr.Tags.foo=='foo'",
+			expr: "Attr.tags.foo=='foo'",
 			resources: []resource.Resource{
 				&testresource.FakeResource{
-					Tags: map[string]string{
+					CtyVal: func() *cty.Value {
-						"foo": "bar",
+						v := cty.ObjectVal(map[string]cty.Value{
-						"bar": "foo",
+							"tags": cty.MapVal(map[string]cty.Value{
-					},
+								"foo": cty.StringVal("bar"),
+								"bar": cty.StringVal("foo"),
+							}),
+						})
+						return &v
+					}(),
 				},
 				&testresource.FakeResource{
-					Tags: map[string]string{
+					CtyVal: func() *cty.Value {
-						"foo": "foo",
+						v := cty.ObjectVal(map[string]cty.Value{
-						"bar": "bar",
+							"tags": cty.MapVal(map[string]cty.Value{
-					},
+								"foo": cty.StringVal("foo"),
+								"bar": cty.StringVal("bar"),
+							}),
+						})
+						return &v
+					}(),
 				},
 				&testresource.FakeResource{
-					Tags: map[string]string{
+					CtyVal: func() *cty.Value {
-						"foo": "foo",
+						v := cty.ObjectVal(map[string]cty.Value{
-						"bar": "foo",
+							"tags": cty.MapVal(map[string]cty.Value{
-					},
+								"foo": cty.StringVal("foo"),
+								"bar": cty.StringVal("foo"),
+							}),
+						})
+						return &v
+					}(),
 				},
 			},
 			want: []resource.Resource{
 				&testresource.FakeResource{
-					Tags: map[string]string{
+					CtyVal: func() *cty.Value {
-						"foo": "foo",
+						v := cty.ObjectVal(map[string]cty.Value{
-						"bar": "bar",
+							"tags": cty.MapVal(map[string]cty.Value{
-					},
+								"foo": cty.StringVal("foo"),
+								"bar": cty.StringVal("bar"),
+							}),
+						})
+						return &v
+					}(),
 				},
 				&testresource.FakeResource{
-					Tags: map[string]string{
+					CtyVal: func() *cty.Value {
-						"foo": "foo",
+						v := cty.ObjectVal(map[string]cty.Value{
-						"bar": "foo",
+							"tags": cty.MapVal(map[string]cty.Value{
-					},
+								"foo": cty.StringVal("foo"),
+								"bar": cty.StringVal("foo"),
+							}),
+						})
+						return &v
+					}(),
 				},
 			},
 		},
 		{
 			name: "filter on resource map of custom type field",
-			expr: "Attr.CustomMap.test.Tag=='foo'",
+			expr: "Attr.custom_map.test.tag=='foo'",
 			resources: []resource.Resource{
 				&testresource.FakeResource{
-					CustomMap: map[string]struct{ Tag string }{
+					CtyVal: func() *cty.Value {
-						"test": {
+						v := cty.ObjectVal(map[string]cty.Value{
-							Tag: "foo",
+							"custom_map": cty.MapVal(map[string]cty.Value{
-						},
+								"test": cty.ObjectVal(map[string]cty.Value{
-					},
+									"tag": cty.StringVal("foo"),
+								}),
+							}),
+						})
+						return &v
+					}(),
 				},
 				&testresource.FakeResource{
-					CustomMap: map[string]struct{ Tag string }{
+					CtyVal: func() *cty.Value {
-						"test": {
+						v := cty.ObjectVal(map[string]cty.Value{
-							Tag: "bar",
+							"custom_map": cty.MapVal(map[string]cty.Value{
-						},
+								"test": cty.ObjectVal(map[string]cty.Value{
-					},
+									"tag": cty.StringVal("bar"),
+								}),
+							}),
+						})
+						return &v
+					}(),
 				},
 				&testresource.FakeResource{
-					CustomMap: map[string]struct{ Tag string }{
+					CtyVal: func() *cty.Value {
-						"bar": {
+						v := cty.ObjectVal(map[string]cty.Value{
-							Tag: "foo",
+							"custom_map": cty.MapVal(map[string]cty.Value{
-						},
+								"bar": cty.ObjectVal(map[string]cty.Value{
-					},
+									"tag": cty.StringVal("foo"),
+								}),
+							}),
+						})
+						return &v
+					}(),
 				},
 			},
 			want: []resource.Resource{
 				&testresource.FakeResource{
-					CustomMap: map[string]struct{ Tag string }{
+					CtyVal: func() *cty.Value {
-						"test": {
+						v := cty.ObjectVal(map[string]cty.Value{
-							Tag: "foo",
+							"custom_map": cty.MapVal(map[string]cty.Value{
-						},
+								"test": cty.ObjectVal(map[string]cty.Value{
-					},
+									"tag": cty.StringVal("foo"),
+								}),
+							}),
+						})
+						return &v
+					}(),
 				},
 			},
 		},
 		{
 			name: "filter on resource field array contains",
-			expr: "Attr.Slice[?contains(@, 'd')]",
+			expr: "Attr.slice[?contains(@, 'd')]",
 			resources: []resource.Resource{
 				&testresource.FakeResource{
-					Slice: []string{"a", "b", "c"},
+					CtyVal: func() *cty.Value {
+						v := cty.ObjectVal(map[string]cty.Value{
+							"slice": cty.SetVal([]cty.Value{
+								cty.StringVal("a"),
+								cty.StringVal("b"),
+								cty.StringVal("c"),
+							}),
+						})
+						return &v
+					}(),
 				},
 				&testresource.FakeResource{
-					Slice: []string{"a", "b", "c", "d"},
+					CtyVal: func() *cty.Value {
+						v := cty.ObjectVal(map[string]cty.Value{
+							"slice": cty.SetVal([]cty.Value{
+								cty.StringVal("a"),
+								cty.StringVal("b"),
+								cty.StringVal("c"),
+								cty.StringVal("d"),
+							}),
+						})
+						return &v
+					}(),
 				},
 				&testresource.FakeResource{
-					Slice: []string{"d"},
+					CtyVal: func() *cty.Value {
+						v := cty.ObjectVal(map[string]cty.Value{
+							"slice": cty.SetVal([]cty.Value{
+								cty.StringVal("d"),
+							}),
+						})
+						return &v
+					}(),
 				},
 			},
 			want: []resource.Resource{
 				&testresource.FakeResource{
-					Slice: []string{"a", "b", "c", "d"},
+					CtyVal: func() *cty.Value {
+						v := cty.ObjectVal(map[string]cty.Value{
+							"slice": cty.SetVal([]cty.Value{
+								cty.StringVal("a"),
+								cty.StringVal("b"),
+								cty.StringVal("c"),
+								cty.StringVal("d"),
+							}),
+						})
+						return &v
+					}(),
 				},
 				&testresource.FakeResource{
-					Slice: []string{"d"},
+					CtyVal: func() *cty.Value {
+						v := cty.ObjectVal(map[string]cty.Value{
+							"slice": cty.SetVal([]cty.Value{
+								cty.StringVal("d"),
+							}),
+						})
+						return &v
+					}(),
 				},
 			},
 		},

pkg/iac/terraform/state/test/aws_lambda_event_source_mapping/result.golden.json

@@ -18,7 +18,8 @@
   "State": "Enabled",
   "StateTransitionReason": "USER_INITIATED",
   "Uuid": "13ff66f8-37eb-4ad6-a0a8-594fea72df4f",
-  "DestinationConfig": []
+  "DestinationConfig": [],
+  "CtyVal":{}
  },
  {
   "BatchSize": 1,
@@ -39,6 +40,7 @@
   "State": "Enabled",
   "StateTransitionReason": "USER_INITIATED",
   "Uuid": "4ad7e2b3-79e9-4713-9d9d-5af2c01d9058",
-  "DestinationConfig": []
+  "DestinationConfig": [],
+  "CtyVal":{}
  }
 ]

pkg/iac/terraform/state/test/aws_nat_gateway/result.golden.json

@@ -8,6 +8,7 @@
   "SubnetId": "subnet-44fe0c65",
   "Tags": {
    "Name": "nat1"
-  }
+  },
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/cloudfront_distribution/result.golden.json

@@ -167,6 +167,7 @@
     "MinimumProtocolVersion": "TLSv1",
     "SslSupportMethod": ""
    }
-  ]
+  ],
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/db_instance/result.golden.json

@@ -63,6 +63,7 @@
   ],
   "RestoreToPointInTime": null,
   "S3Import": [],
-  "Timeouts": null
+  "Timeouts": null,
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/db_subnet_group/result.golden.json

@@ -9,7 +9,8 @@
       "subnet-63c5f90a",
       "subnet-d81e8695"
     ],
-    "Tags": null
+    "Tags": null,
+    "CtyVal": {}
   },
   {
     "Arn": "arn:aws:rds:eu-west-3:929327065333:subgrp:foo",
@@ -21,6 +22,7 @@
       "subnet-49f9ae32",
       "subnet-63c5f90a"
     ],
-    "Tags": null
+    "Tags": null,
+    "CtyVal": {}
   }
 ]

pkg/iac/terraform/state/test/dynamodb_table/result.golden.json

@@ -57,7 +57,8 @@
     "AttributeName": "",
     "Enabled": false
    }
-  ]
+  ],
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:dynamodb:us-east-1:526954929923:table/example",
@@ -101,6 +102,7 @@
     "AttributeName": "",
     "Enabled": false
    }
-  ]
+  ],
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/ec2_ami/result.golden.json

@@ -1 +1 @@
-[{"Architecture":"x86_64","Arn":"arn:aws:ec2:eu-west-3::image/ami-06668cf793e254604","Description":"","EnaSupport":true,"Id":"ami-06668cf793e254604","ImageLocation":"047081014315/Test","KernelId":"","ManageEbsSnapshots":null,"Name":"Test","RamdiskId":"","RootDeviceName":"/dev/xvda","RootSnapshotId":"snap-00672558cecd93a61","SriovNetSupport":"simple","Tags":{},"VirtualizationType":"hvm","EbsBlockDevice":[{"DeleteOnTermination":true,"DeviceName":"/dev/xvda","Encrypted":false,"Iops":0,"SnapshotId":"snap-00672558cecd93a61","VolumeSize":8,"VolumeType":"gp2"}],"EphemeralBlockDevice":[],"Timeouts":{"Create":null,"Delete":null,"Update":null}}]
+[{"Architecture":"x86_64","Arn":"arn:aws:ec2:eu-west-3::image/ami-06668cf793e254604","Description":"","EnaSupport":true,"Id":"ami-06668cf793e254604","ImageLocation":"047081014315/Test","KernelId":"","ManageEbsSnapshots":null,"Name":"Test","RamdiskId":"","RootDeviceName":"/dev/xvda","RootSnapshotId":"snap-00672558cecd93a61","SriovNetSupport":"simple","Tags":{},"VirtualizationType":"hvm","EbsBlockDevice":[{"DeleteOnTermination":true,"DeviceName":"/dev/xvda","Encrypted":false,"Iops":0,"SnapshotId":"snap-00672558cecd93a61","VolumeSize":8,"VolumeType":"gp2"}],"EphemeralBlockDevice":[],"Timeouts":{"Create":null,"Delete":null,"Update":null},"CtyVal":{}}]

pkg/iac/terraform/state/test/ec2_ebs_snapshot/result.golden.json

@@ -1 +1 @@
-[{"Arn":"arn:aws:ec2:eu-west-3:047081014315:volume/vol-01ddc91d3d9d1318b","AvailabilityZone":"eu-west-3a","Encrypted":false,"Id":"vol-01ddc91d3d9d1318b","Iops":100,"KmsKeyId":"","MultiAttachEnabled":false,"OutpostArn":"","Size":8,"SnapshotId":"","Tags":{"Name":"HelloWorld"},"Type":"gp2"},{"Arn":"arn:aws:ec2:eu-west-3::snapshot/snap-071ccff0167f3e841","DataEncryptionKeyId":"","Description":"","Encrypted":false,"Id":"snap-071ccff0167f3e841","KmsKeyId":"","OwnerAlias":"","OwnerId":"047081014315","Tags":{"Name":"HelloWorld_snap"},"VolumeId":"vol-01ddc91d3d9d1318b","VolumeSize":10,"Timeouts":null}]
+[{"Arn":"arn:aws:ec2:eu-west-3:047081014315:volume/vol-01ddc91d3d9d1318b","AvailabilityZone":"eu-west-3a","Encrypted":false,"Id":"vol-01ddc91d3d9d1318b","Iops":100,"KmsKeyId":"","MultiAttachEnabled":false,"OutpostArn":"","Size":8,"SnapshotId":"","Tags":{"Name":"HelloWorld"},"Type":"gp2","CtyVal":{}},{"Arn":"arn:aws:ec2:eu-west-3::snapshot/snap-071ccff0167f3e841","DataEncryptionKeyId":"","Description":"","Encrypted":false,"Id":"snap-071ccff0167f3e841","KmsKeyId":"","OwnerAlias":"","OwnerId":"047081014315","Tags":{"Name":"HelloWorld_snap"},"VolumeId":"vol-01ddc91d3d9d1318b","VolumeSize":10,"Timeouts":null,"CtyVal":{}}]

pkg/iac/terraform/state/test/ec2_ebs_volume/result.golden.json

@@ -1 +1 @@
-[{"Arn":"arn:aws:ec2:eu-west-3:047081014315:volume/vol-01ddc91d3d9d1318b","AvailabilityZone":"eu-west-3a","Encrypted":false,"Id":"vol-01ddc91d3d9d1318b","Iops":100,"KmsKeyId":"","MultiAttachEnabled":false,"OutpostArn":"","Size":8,"SnapshotId":"","Tags":{"Name":"HelloWorld"},"Type":"gp2"}]
+[{"Arn":"arn:aws:ec2:eu-west-3:047081014315:volume/vol-01ddc91d3d9d1318b","AvailabilityZone":"eu-west-3a","Encrypted":false,"Id":"vol-01ddc91d3d9d1318b","Iops":100,"KmsKeyId":"","MultiAttachEnabled":false,"OutpostArn":"","Size":8,"SnapshotId":"","Tags":{"Name":"HelloWorld"},"Type":"gp2","CtyVal":{}}]

pkg/iac/terraform/state/test/ec2_eip/result.golden.json

@@ -17,6 +17,7 @@
   "PublicIpv4Pool": "amazon",
   "Tags": null,
   "Vpc": true,
-  "Timeouts": null
+  "Timeouts": null,
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/ec2_eip_association/result.golden.json

@@ -17,7 +17,8 @@
   "PublicIpv4Pool": "amazon",
   "Tags": {},
   "Vpc": true,
-  "Timeouts": null
+  "Timeouts": null,
+  "CtyVal": {}
  },
  {
   "AllocationId": "eipalloc-017d5267e4dda73f1",
@@ -26,6 +27,7 @@
   "InstanceId": "i-0d3650a23f4e45dc0",
   "NetworkInterfaceId": "eni-0f35ce5577bbab251",
   "PrivateIpAddress": "172.31.22.12",
-  "PublicIp": "35.180.239.105"
+  "PublicIp": "35.180.239.105",
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/ec2_instance/result.golden.json

@@ -1 +1 @@
-[{"Ami":"ami-0697b068b80d79421","Arn":"arn:aws:ec2:eu-west-3:047081014315:instance/i-0d3650a23f4e45dc0","AssociatePublicIpAddress":true,"AvailabilityZone":"eu-west-3b","CpuCoreCount":1,"CpuThreadsPerCore":2,"DisableApiTermination":false,"EbsOptimized":false,"GetPasswordData":false,"Hibernation":false,"HostId":null,"IamInstanceProfile":"","Id":"i-0d3650a23f4e45dc0","InstanceInitiatedShutdownBehavior":null,"InstanceState":"running","InstanceType":"t3.nano","Ipv6AddressCount":0,"Ipv6Addresses":[],"KeyName":"","Monitoring":false,"OutpostArn":"","PasswordData":"","PlacementGroup":"","PrimaryNetworkInterfaceId":"eni-0f35ce5577bbab251","PrivateDns":"ip-172-31-22-12.eu-west-3.compute.internal","PrivateIp":"172.31.22.12","PublicDns":"ec2-35-180-126-180.eu-west-3.compute.amazonaws.com","PublicIp":"35.180.126.180","SecondaryPrivateIps":[],"SecurityGroups":["default"],"SourceDestCheck":true,"SubnetId":"subnet-fdfdda86","Tags":null,"Tenancy":"default","UserData":null,"UserDataBase64":null,"VolumeTags":{},"VpcSecurityGroupIds":["sg-9e0204ff"],"CreditSpecification":[{"CpuCredits":"unlimited"}],"EbsBlockDevice":null,"EphemeralBlockDevice":[],"MetadataOptions":[{"HttpEndpoint":"enabled","HttpPutResponseHopLimit":1,"HttpTokens":"optional"}],"NetworkInterface":[],"RootBlockDevice":[{"DeleteOnTermination":true,"DeviceName":"/dev/xvda","Encrypted":false,"Iops":100,"KmsKeyId":"","VolumeId":"vol-081c7272a57a09db1","VolumeSize":8,"VolumeType":"gp2"}],"Timeouts":null}]
+[{"Ami":"ami-0697b068b80d79421","Arn":"arn:aws:ec2:eu-west-3:047081014315:instance/i-0d3650a23f4e45dc0","AssociatePublicIpAddress":true,"AvailabilityZone":"eu-west-3b","CpuCoreCount":1,"CpuThreadsPerCore":2,"DisableApiTermination":false,"EbsOptimized":false,"GetPasswordData":false,"Hibernation":false,"HostId":null,"IamInstanceProfile":"","Id":"i-0d3650a23f4e45dc0","InstanceInitiatedShutdownBehavior":null,"InstanceState":"running","InstanceType":"t3.nano","Ipv6AddressCount":0,"Ipv6Addresses":[],"KeyName":"","Monitoring":false,"OutpostArn":"","PasswordData":"","PlacementGroup":"","PrimaryNetworkInterfaceId":"eni-0f35ce5577bbab251","PrivateDns":"ip-172-31-22-12.eu-west-3.compute.internal","PrivateIp":"172.31.22.12","PublicDns":"ec2-35-180-126-180.eu-west-3.compute.amazonaws.com","PublicIp":"35.180.126.180","SecondaryPrivateIps":[],"SecurityGroups":["default"],"SourceDestCheck":true,"SubnetId":"subnet-fdfdda86","Tags":null,"Tenancy":"default","UserData":null,"UserDataBase64":null,"VolumeTags":{},"VpcSecurityGroupIds":["sg-9e0204ff"],"CreditSpecification":[{"CpuCredits":"unlimited"}],"EbsBlockDevice":null,"EphemeralBlockDevice":[],"MetadataOptions":[{"HttpEndpoint":"enabled","HttpPutResponseHopLimit":1,"HttpTokens":"optional"}],"NetworkInterface":[],"RootBlockDevice":[{"DeleteOnTermination":true,"DeviceName":"/dev/xvda","Encrypted":false,"Iops":100,"KmsKeyId":"","VolumeId":"vol-081c7272a57a09db1","VolumeSize":8,"VolumeType":"gp2"}],"Timeouts":null,"CtyVal":{}}]

pkg/iac/terraform/state/test/ec2_key_pair/result.golden.json

@@ -1 +1 @@
-[{"Arn":"arn:aws:ec2:eu-west-3:047081014315:key-pair/test","Fingerprint":"b1:fb:1c:2a:f1:f9:7e:98:44:5f:0c:57:5a:47:31:af:77:a5:f2:ba","Id":"test","KeyName":"test","KeyNamePrefix":null,"KeyPairId":"key-05080f65a4735790b","PublicKey":null,"Tags":{"test":"lol2"}}]
+[{"Arn":"arn:aws:ec2:eu-west-3:047081014315:key-pair/test","Fingerprint":"b1:fb:1c:2a:f1:f9:7e:98:44:5f:0c:57:5a:47:31:af:77:a5:f2:ba","Id":"test","KeyName":"test","KeyNamePrefix":null,"KeyPairId":"key-05080f65a4735790b","PublicKey":null,"Tags":{"test":"lol2"},"CtyVal":{}}]

pkg/iac/terraform/state/test/ecr_repository/result.golden.json

@@ -18,6 +18,7 @@
     "ScanOnPush": true
    }
   ],
-  "Timeouts": null
+  "Timeouts": null,
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/github_branch_protection/result.golden.json

@@ -27,7 +27,8 @@
     ],
     "Strict": false
    }
-  ]
+  ],
+  "CtyVal": {}
  },
  {
   "AllowsDeletions": true,
@@ -57,7 +58,8 @@
     ],
     "Strict": false
    }
-  ]
+  ],
+  "CtyVal": {}
  },
  {
   "AllowsDeletions": true,
@@ -85,6 +87,7 @@
     ],
     "Strict": false
    }
-  ]
+  ],
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/github_membership/result.golden.json

@@ -3,12 +3,14 @@
   "Etag": "W/\"2d1cae5b1a58be39bd09bad91fb225b3b589ddc47ff101cf4b8a86d3d8b6f65d\"",
   "Id": "driftctl-test:driftctl-acceptance-tester",
   "Role": "admin",
-  "Username": "driftctl-acceptance-tester"
+  "Username": "driftctl-acceptance-tester",
+  "CtyVal": {}
  },
  {
   "Etag": "W/\"d2a4eb901334f41629f5ead98a4b6e02489ae2f13b2152630f00e4dfa6488586\"",
   "Id": "driftctl-test:eliecharra",
   "Role": "admin",
-  "Username": "eliecharra"
+  "Username": "eliecharra",
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/github_repository/result.golden.json

@@ -33,7 +33,8 @@
   "Visibility": "private",
   "VulnerabilityAlerts": false,
   "Pages": [],
-  "Template": []
+  "Template": [],
+  "CtyVal": {}
  },
  {
   "AllowMergeCommit": true,
@@ -69,6 +70,7 @@
   "Visibility": "public",
   "VulnerabilityAlerts": false,
   "Pages": [],
-  "Template": []
+  "Template": [],
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/github_team/result.golden.json

@@ -10,7 +10,8 @@
   "NodeId": "MDQ6VGVhbTQ1NTY3MTU=",
   "ParentTeamId": null,
   "Privacy": "closed",
-  "Slug": "team1"
+  "Slug": "team1",
+  "CtyVal": {}
  },
  {
   "CreateDefaultMaintainer": false,
@@ -23,7 +24,8 @@
   "NodeId": "MDQ6VGVhbTQ1NTY3MTk=",
   "ParentTeamId": null,
   "Privacy": "secret",
-  "Slug": "team2"
+  "Slug": "team2",
+  "CtyVal": {}
  },
  {
   "CreateDefaultMaintainer": false,
@@ -36,6 +38,7 @@
   "NodeId": "MDQ6VGVhbTQ1NTY3NDc=",
   "ParentTeamId": 4556715,
   "Privacy": "closed",
-  "Slug": "new-team-with-parent"
+  "Slug": "new-team-with-parent",
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/github_team_membership/result.golden.json

@@ -4,13 +4,15 @@
   "Id": "4564046:wbeuil",
   "Role": "member",
   "TeamId": "4564046",
-  "Username": "wbeuil"
+  "Username": "wbeuil",
+  "CtyVal": {}
  },
  {
   "Etag": "W/\"1ecb16111126288558af7851ad1fb6eb99a57393235bd0600bf39c85dcd98563\"",
   "Id": "4564046:driftctl-acceptance-tester",
   "Role": "maintainer",
   "TeamId": "4564046",
-  "Username": "driftctl-acceptance-tester"
+  "Username": "driftctl-acceptance-tester",
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/iam_access_key_multiple/result.golden.json

@@ -7,7 +7,8 @@
   "Path": "/",
   "PermissionsBoundary": null,
   "Tags": {},
-  "UniqueId": "AIDA5QYBVVD27TBHIJVSL"
+  "UniqueId": "AIDA5QYBVVD27TBHIJVSL",
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:iam::929327065333:user/test-driftctl2",
@@ -17,7 +18,8 @@
   "Path": "/",
   "PermissionsBoundary": null,
   "Tags": {},
-  "UniqueId": "AIDA5QYBVVD2RVTK3ODPO"
+  "UniqueId": "AIDA5QYBVVD2RVTK3ODPO",
+  "CtyVal": {}
  },
  {
   "EncryptedSecret": null,
@@ -27,7 +29,8 @@
   "Secret": null,
   "SesSmtpPasswordV4": null,
   "Status": "Active",
-  "User": "test-driftctl"
+  "User": "test-driftctl",
+  "CtyVal": {}
  },
  {
   "EncryptedSecret": null,
@@ -37,7 +40,8 @@
   "Secret": null,
   "SesSmtpPasswordV4": null,
   "Status": "Active",
-  "User": "test-driftctl"
+  "User": "test-driftctl",
+  "CtyVal": {}
  },
  {
   "EncryptedSecret": null,
@@ -47,7 +51,8 @@
   "Secret": null,
   "SesSmtpPasswordV4": null,
   "Status": "Active",
-  "User": "test-driftctl2"
+  "User": "test-driftctl2",
+  "CtyVal": {}
  },
  {
   "EncryptedSecret": null,
@@ -57,6 +62,7 @@
   "Secret": null,
   "SesSmtpPasswordV4": null,
   "Status": "Active",
-  "User": "test-driftctl2"
+  "User": "test-driftctl2",
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/iam_policy_multiple/result.golden.json

@@ -6,7 +6,8 @@
   "Name": "policy-2",
   "NamePrefix": null,
   "Path": "/",
-  "Policy": "{\"Statement\":[{\"Action\":\"ec2:*\",\"Effect\":\"Allow\",\"Resource\":\"*\",\"Sid\":\"EC2Admin\"}],\"Version\":\"2012-10-17\"}"
+  "Policy": "{\"Statement\":[{\"Action\":\"ec2:*\",\"Effect\":\"Allow\",\"Resource\":\"*\",\"Sid\":\"EC2Admin\"}],\"Version\":\"2012-10-17\"}",
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:iam::929327065333:policy/policy-0",
@@ -15,7 +16,8 @@
   "Name": "policy-0",
   "NamePrefix": null,
   "Path": "/",
-  "Policy": "{\"Statement\":[{\"Action\":\"ec2:*\",\"Effect\":\"Allow\",\"Resource\":\"*\",\"Sid\":\"EC2Admin\"}],\"Version\":\"2012-10-17\"}"
+  "Policy": "{\"Statement\":[{\"Action\":\"ec2:*\",\"Effect\":\"Allow\",\"Resource\":\"*\",\"Sid\":\"EC2Admin\"}],\"Version\":\"2012-10-17\"}",
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:iam::929327065333:policy/policy-1",
@@ -24,6 +26,7 @@
   "Name": "policy-1",
   "NamePrefix": null,
   "Path": "/",
-  "Policy": "{\"Statement\":[{\"Action\":\"ec2:*\",\"Effect\":\"Allow\",\"Resource\":\"*\",\"Sid\":\"EC2Admin\"}],\"Version\":\"2012-10-17\"}"
+  "Policy": "{\"Statement\":[{\"Action\":\"ec2:*\",\"Effect\":\"Allow\",\"Resource\":\"*\",\"Sid\":\"EC2Admin\"}],\"Version\":\"2012-10-17\"}",
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/iam_role_multiple/result.golden.json

@@ -14,7 +14,8 @@
   "Tags": {
    "foo": "bar0"
   },
-  "UniqueId": "AROA5QYBVVD24YSTJXHHO"
+  "UniqueId": "AROA5QYBVVD24YSTJXHHO",
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:iam::929327065333:role/test/test_role_1",
@@ -31,7 +32,8 @@
   "Tags": {
    "foo": "bar1"
   },
-  "UniqueId": "AROA5QYBVVD2UGXJCEDXF"
+  "UniqueId": "AROA5QYBVVD2UGXJCEDXF",
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:iam::929327065333:role/test/test_role_2",
@@ -48,6 +50,7 @@
   "Tags": {
    "foo": "bar2"
   },
-  "UniqueId": "AROA5QYBVVD2WGP2ZEG73"
+  "UniqueId": "AROA5QYBVVD2WGP2ZEG73",
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/iam_role_policy_attachment/result.golden.json

@@ -12,7 +12,8 @@
   "Path": "/",
   "PermissionsBoundary": null,
   "Tags": {},
-  "UniqueId": "AROAXVMHWD4BXFUYMSDRB"
+  "UniqueId": "AROAXVMHWD4BXFUYMSDRB",
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:iam::526954929923:role/test-role",
@@ -27,7 +28,8 @@
   "Path": "/",
   "PermissionsBoundary": null,
   "Tags": {},
-  "UniqueId": "AROAXVMHWD4BRFKSROAS3"
+  "UniqueId": "AROAXVMHWD4BRFKSROAS3",
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:iam::526954929923:policy/test-policy",
@@ -36,7 +38,8 @@
   "Name": "test-policy",
   "NamePrefix": null,
   "Path": "/",
-  "Policy": "{\"Statement\":[{\"Action\":[\"ec2:Describe*\"],\"Effect\":\"Allow\",\"Resource\":\"*\"}],\"Version\":\"2012-10-17\"}"
+  "Policy": "{\"Statement\":[{\"Action\":[\"ec2:Describe*\"],\"Effect\":\"Allow\",\"Resource\":\"*\"}],\"Version\":\"2012-10-17\"}",
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:iam::526954929923:policy/test-policy3",
@@ -45,7 +48,8 @@
   "Name": "test-policy3",
   "NamePrefix": null,
   "Path": "/",
-  "Policy": "{\"Statement\":[{\"Action\":[\"ec2:Describe*\"],\"Effect\":\"Allow\",\"Resource\":\"*\"}],\"Version\":\"2012-10-17\"}"
+  "Policy": "{\"Statement\":[{\"Action\":[\"ec2:Describe*\"],\"Effect\":\"Allow\",\"Resource\":\"*\"}],\"Version\":\"2012-10-17\"}",
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:iam::526954929923:policy/test-policy2",
@@ -54,7 +58,8 @@
   "Name": "test-policy2",
   "NamePrefix": null,
   "Path": "/",
-  "Policy": "{\"Statement\":[{\"Action\":[\"ec2:Describe*\"],\"Effect\":\"Allow\",\"Resource\":\"*\"}],\"Version\":\"2012-10-17\"}"
+  "Policy": "{\"Statement\":[{\"Action\":[\"ec2:Describe*\"],\"Effect\":\"Allow\",\"Resource\":\"*\"}],\"Version\":\"2012-10-17\"}",
+  "CtyVal": {}
  },
  {
   "Groups": [],
@@ -65,7 +70,8 @@
    "test-role",
    "test-role2"
   ],
-  "Users": []
+  "Users": [],
+  "CtyVal": {}
  },
  {
   "Groups": [],
@@ -75,7 +81,8 @@
   "Roles": [
    "test-role"
   ],
-  "Users": []
+  "Users": [],
+  "CtyVal": {}
  },
  {
   "Groups": [],
@@ -85,7 +92,8 @@
   "Roles": [
    "test-role"
   ],
-  "Users": []
+  "Users": [],
+  "CtyVal": {}
  },
  {
   "Groups": [],
@@ -95,7 +103,8 @@
   "Roles": [
    "test-role2"
   ],
-  "Users": []
+  "Users": [],
+  "CtyVal": {}
  },
  {
   "Groups": [],
@@ -105,6 +114,7 @@
   "Roles": [
    "test-role2"
   ],
-  "Users": []
+  "Users": [],
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/iam_role_policy_multiple/result.golden.json

@@ -12,7 +12,8 @@
   "Path": "/",
   "PermissionsBoundary": null,
   "Tags": null,
-  "UniqueId": "AROA5QYBVVD2U6C7MVZRS"
+  "UniqueId": "AROA5QYBVVD2U6C7MVZRS",
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:iam::929327065333:role/test_role_1",
@@ -27,48 +28,55 @@
   "Path": "/",
   "PermissionsBoundary": null,
   "Tags": null,
-  "UniqueId": "AROA5QYBVVD26ZIDQHGWV"
+  "UniqueId": "AROA5QYBVVD26ZIDQHGWV",
+  "CtyVal": {}
  },
  {
   "Id": "test_role_0:policy-role0-2",
   "Name": "policy-role0-2",
   "NamePrefix": null,
   "Policy": "{\n    \"Version\": \"2012-10-17\",\n    \"Statement\": [\n        {\n            \"Sid\": \"VisualEditor0\",\n            \"Effect\": \"Allow\",\n            \"Action\": \"account:*\",\n            \"Resource\": \"*\"\n        }\n    ]\n}\n",
-  "Role": "test_role_0"
+  "Role": "test_role_0",
+  "CtyVal": {}
  },
  {
   "Id": "test_role_0:policy-role0-0",
   "Name": "policy-role0-0",
   "NamePrefix": null,
   "Policy": "{\n    \"Version\": \"2012-10-17\",\n    \"Statement\": [\n        {\n            \"Sid\": \"VisualEditor0\",\n            \"Effect\": \"Allow\",\n            \"Action\": \"account:*\",\n            \"Resource\": \"*\"\n        }\n    ]\n}\n",
-  "Role": "test_role_0"
+  "Role": "test_role_0",
+  "CtyVal": {}
  },
  {
   "Id": "test_role_0:policy-role0-1",
   "Name": "policy-role0-1",
   "NamePrefix": null,
   "Policy": "{\n    \"Version\": \"2012-10-17\",\n    \"Statement\": [\n        {\n            \"Sid\": \"VisualEditor0\",\n            \"Effect\": \"Allow\",\n            \"Action\": \"account:*\",\n            \"Resource\": \"*\"\n        }\n    ]\n}\n",
-  "Role": "test_role_0"
+  "Role": "test_role_0",
+  "CtyVal": {}
  },
  {
   "Id": "test_role_1:policy-role1-0",
   "Name": "policy-role1-0",
   "NamePrefix": null,
   "Policy": "{\n    \"Version\": \"2012-10-17\",\n    \"Statement\": [\n        {\n            \"Sid\": \"VisualEditor0\",\n            \"Effect\": \"Allow\",\n            \"Action\": \"account:*\",\n            \"Resource\": \"*\"\n        }\n    ]\n}\n",
-  "Role": "test_role_1"
+  "Role": "test_role_1",
+  "CtyVal": {}
  },
  {
   "Id": "test_role_1:policy-role1-1",
   "Name": "policy-role1-1",
   "NamePrefix": null,
   "Policy": "{\n    \"Version\": \"2012-10-17\",\n    \"Statement\": [\n        {\n            \"Sid\": \"VisualEditor0\",\n            \"Effect\": \"Allow\",\n            \"Action\": \"account:*\",\n            \"Resource\": \"*\"\n        }\n    ]\n}\n",
-  "Role": "test_role_1"
+  "Role": "test_role_1",
+  "CtyVal": {}
  },
  {
   "Id": "test_role_1:policy-role1-2",
   "Name": "policy-role1-2",
   "NamePrefix": null,
   "Policy": "{\n    \"Version\": \"2012-10-17\",\n    \"Statement\": [\n        {\n            \"Sid\": \"VisualEditor0\",\n            \"Effect\": \"Allow\",\n            \"Action\": \"account:*\",\n            \"Resource\": \"*\"\n        }\n    ]\n}\n",
-  "Role": "test_role_1"
+  "Role": "test_role_1",
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/iam_user_multiple/result.golden.json

@@ -9,7 +9,8 @@
   "Tags": {
    "foo": "bar"
   },
-  "UniqueId": "AIDA5QYBVVD2ZWIW56NWS"
+  "UniqueId": "AIDA5QYBVVD2ZWIW56NWS",
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:iam::929327065333:user/test/test-driftctl-1",
@@ -21,7 +22,8 @@
   "Tags": {
    "foo": "bar"
   },
-  "UniqueId": "AIDA5QYBVVD2UMP6CZEGZ"
+  "UniqueId": "AIDA5QYBVVD2UMP6CZEGZ",
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:iam::929327065333:user/test/test-driftctl-2",
@@ -33,6 +35,7 @@
   "Tags": {
    "foo": "bar"
   },
-  "UniqueId": "AIDA5QYBVVD23ZWIILRUW"
+  "UniqueId": "AIDA5QYBVVD23ZWIILRUW",
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/iam_user_policy_attachment/result.golden.json

@@ -7,7 +7,8 @@
   "Path": "/system/",
   "PermissionsBoundary": null,
   "Tags": {},
-  "UniqueId": "AIDAXVMHWD4B7BHWL7YKF"
+  "UniqueId": "AIDAXVMHWD4B7BHWL7YKF",
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:iam::526954929923:user/system/loadbalancer3",
@@ -17,7 +18,8 @@
   "Path": "/system/",
   "PermissionsBoundary": null,
   "Tags": {},
-  "UniqueId": "AIDAXVMHWD4BUICVKAIIT"
+  "UniqueId": "AIDAXVMHWD4BUICVKAIIT",
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:iam::526954929923:user/system/loadbalancer2",
@@ -27,7 +29,8 @@
   "Path": "/system/",
   "PermissionsBoundary": null,
   "Tags": {},
-  "UniqueId": "AIDAXVMHWD4BTVLVQM236"
+  "UniqueId": "AIDAXVMHWD4BTVLVQM236",
+  "CtyVal": {}
  },
  {
   "Groups": [],
@@ -37,7 +40,8 @@
   "Roles": [],
   "Users": [
    "loadbalancer"
-  ]
+  ],
+  "CtyVal": {}
  },
  {
   "Groups": [],
@@ -47,7 +51,8 @@
   "Roles": [],
   "Users": [
    "loadbalancer3"
-  ]
+  ],
+  "CtyVal": {}
  },
  {
   "Groups": [],
@@ -57,7 +62,8 @@
   "Roles": [],
   "Users": [
    "loadbalancer3"
-  ]
+  ],
+  "CtyVal": {}
  },
  {
   "Groups": [],
@@ -67,7 +73,8 @@
   "Roles": [],
   "Users": [
    "loadbalancer"
-  ]
+  ],
+  "CtyVal": {}
  },
  {
   "Groups": [],
@@ -77,7 +84,8 @@
   "Roles": [],
   "Users": [
    "loadbalancer3"
-  ]
+  ],
+  "CtyVal": {}
  },
  {
   "Groups": [],
@@ -87,7 +95,8 @@
   "Roles": [],
   "Users": [
    "loadbalancer"
-  ]
+  ],
+  "CtyVal": {}
  },
  {
   "Groups": [],
@@ -97,7 +106,8 @@
   "Roles": [],
   "Users": [
    "loadbalancer2"
-  ]
+  ],
+  "CtyVal": {}
  },
  {
   "Groups": [],
@@ -107,7 +117,8 @@
   "Roles": [],
   "Users": [
    "loadbalancer2"
-  ]
+  ],
+  "CtyVal": {}
  },
  {
   "Groups": [],
@@ -117,7 +128,8 @@
   "Roles": [],
   "Users": [
    "loadbalancer2"
-  ]
+  ],
+  "CtyVal": {}
  },
  {
   "EncryptedSecret": null,
@@ -127,7 +139,8 @@
   "Secret": null,
   "SesSmtpPasswordV4": null,
   "Status": "Active",
-  "User": "loadbalancer2"
+  "User": "loadbalancer2",
+  "CtyVal": {}
  },
  {
   "EncryptedSecret": null,
@@ -137,7 +150,8 @@
   "Secret": null,
   "SesSmtpPasswordV4": null,
   "Status": "Active",
-  "User": "loadbalancer"
+  "User": "loadbalancer",
+  "CtyVal": {}
  },
  {
   "EncryptedSecret": null,
@@ -147,7 +161,8 @@
   "Secret": null,
   "SesSmtpPasswordV4": null,
   "Status": "Active",
-  "User": "loadbalancer3"
+  "User": "loadbalancer3",
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:iam::526954929923:policy/test3",
@@ -156,7 +171,8 @@
   "Name": "test3",
   "NamePrefix": null,
   "Path": "/",
-  "Policy": "{\"Statement\":[{\"Action\":[\"ec2:Describe*\"],\"Effect\":\"Allow\",\"Resource\":\"*\"}],\"Version\":\"2012-10-17\"}"
+  "Policy": "{\"Statement\":[{\"Action\":[\"ec2:Describe*\"],\"Effect\":\"Allow\",\"Resource\":\"*\"}],\"Version\":\"2012-10-17\"}",
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:iam::526954929923:policy/test",
@@ -165,7 +181,8 @@
   "Name": "test",
   "NamePrefix": null,
   "Path": "/",
-  "Policy": "{\"Statement\":[{\"Action\":[\"ec2:Describe*\"],\"Effect\":\"Allow\",\"Resource\":\"*\"}],\"Version\":\"2012-10-17\"}"
+  "Policy": "{\"Statement\":[{\"Action\":[\"ec2:Describe*\"],\"Effect\":\"Allow\",\"Resource\":\"*\"}],\"Version\":\"2012-10-17\"}",
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:iam::526954929923:policy/test2",
@@ -174,7 +191,8 @@
   "Name": "test2",
   "NamePrefix": null,
   "Path": "/",
-  "Policy": "{\"Statement\":[{\"Action\":[\"ec2:Describe*\"],\"Effect\":\"Allow\",\"Resource\":\"*\"}],\"Version\":\"2012-10-17\"}"
+  "Policy": "{\"Statement\":[{\"Action\":[\"ec2:Describe*\"],\"Effect\":\"Allow\",\"Resource\":\"*\"}],\"Version\":\"2012-10-17\"}",
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:iam::526954929923:policy/test4",
@@ -183,7 +201,8 @@
   "Name": "test4",
   "NamePrefix": null,
   "Path": "/",
-  "Policy": "{\"Statement\":[{\"Action\":[\"ec2:Describe*\"],\"Effect\":\"Allow\",\"Resource\":\"*\"}],\"Version\":\"2012-10-17\"}"
+  "Policy": "{\"Statement\":[{\"Action\":[\"ec2:Describe*\"],\"Effect\":\"Allow\",\"Resource\":\"*\"}],\"Version\":\"2012-10-17\"}",
+  "CtyVal": {}
  },
  {
   "Groups": [],
@@ -194,6 +213,7 @@
   "Users": [
    "loadbalancer",
    "loadbalancer2"
-  ]
+  ],
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/iam_user_policy_multiple/result.golden.json

@@ -7,7 +7,8 @@
   "Path": "/system/",
   "PermissionsBoundary": null,
   "Tags": null,
-  "UniqueId": "AIDAXVMHWD4BUICVKAIIT"
+  "UniqueId": "AIDAXVMHWD4BUICVKAIIT",
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:iam::526954929923:user/system/loadbalancer2",
@@ -17,7 +18,8 @@
   "Path": "/system/",
   "PermissionsBoundary": null,
   "Tags": null,
-  "UniqueId": "AIDAXVMHWD4BTVLVQM236"
+  "UniqueId": "AIDAXVMHWD4BTVLVQM236",
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:iam::526954929923:user/system/loadbalancer",
@@ -27,91 +29,104 @@
   "Path": "/system/",
   "PermissionsBoundary": null,
   "Tags": null,
-  "UniqueId": "AIDAXVMHWD4B7BHWL7YKF"
+  "UniqueId": "AIDAXVMHWD4B7BHWL7YKF",
+  "CtyVal": {}
  },
  {
   "Id": "loadbalancer3:test34",
   "Name": "test34",
   "NamePrefix": null,
   "Policy": "{\n  \"Version\": \"2012-10-17\",\n  \"Statement\": [\n    {\n      \"Action\": [\n        \"ec2:Describe*\"\n      ],\n      \"Effect\": \"Allow\",\n      \"Resource\": \"*\"\n    }\n  ]\n}\n",
-  "User": "loadbalancer3"
+  "User": "loadbalancer3",
+  "CtyVal": {}
  },
  {
   "Id": "loadbalancer:test4",
   "Name": "test4",
   "NamePrefix": null,
   "Policy": "{\n  \"Version\": \"2012-10-17\",\n  \"Statement\": [\n    {\n      \"Action\": [\n        \"ec2:Describe*\"\n      ],\n      \"Effect\": \"Allow\",\n      \"Resource\": \"*\"\n    }\n  ]\n}\n",
-  "User": "loadbalancer"
+  "User": "loadbalancer",
+  "CtyVal": {}
  },
  {
   "Id": "loadbalancer2:test23",
   "Name": "test23",
   "NamePrefix": null,
   "Policy": "{\n  \"Version\": \"2012-10-17\",\n  \"Statement\": [\n    {\n      \"Action\": [\n        \"ec2:Describe*\"\n      ],\n      \"Effect\": \"Allow\",\n      \"Resource\": \"*\"\n    }\n  ]\n}\n",
-  "User": "loadbalancer2"
+  "User": "loadbalancer2",
+  "CtyVal": {}
  },
  {
   "Id": "loadbalancer:test2",
   "Name": "test2",
   "NamePrefix": null,
   "Policy": "{\n  \"Version\": \"2012-10-17\",\n  \"Statement\": [\n    {\n      \"Action\": [\n        \"ec2:Describe*\"\n      ],\n      \"Effect\": \"Allow\",\n      \"Resource\": \"*\"\n    }\n  ]\n}\n",
-  "User": "loadbalancer"
+  "User": "loadbalancer",
+  "CtyVal": {}
  },
  {
   "Id": "loadbalancer2:test22",
   "Name": "test22",
   "NamePrefix": null,
   "Policy": "{\n  \"Version\": \"2012-10-17\",\n  \"Statement\": [\n    {\n      \"Action\": [\n        \"ec2:Describe*\"\n      ],\n      \"Effect\": \"Allow\",\n      \"Resource\": \"*\"\n    }\n  ]\n}\n",
-  "User": "loadbalancer2"
+  "User": "loadbalancer2",
+  "CtyVal": {}
  },
  {
   "Id": "loadbalancer3:test32",
   "Name": "test32",
   "NamePrefix": null,
   "Policy": "{\n  \"Version\": \"2012-10-17\",\n  \"Statement\": [\n    {\n      \"Action\": [\n        \"ec2:Describe*\"\n      ],\n      \"Effect\": \"Allow\",\n      \"Resource\": \"*\"\n    }\n  ]\n}\n",
-  "User": "loadbalancer3"
+  "User": "loadbalancer3",
+  "CtyVal": {}
  },
  {
   "Id": "loadbalancer:test3",
   "Name": "test3",
   "NamePrefix": null,
   "Policy": "{\n  \"Version\": \"2012-10-17\",\n  \"Statement\": [\n    {\n      \"Action\": [\n        \"ec2:Describe*\"\n      ],\n      \"Effect\": \"Allow\",\n      \"Resource\": \"*\"\n    }\n  ]\n}\n",
-  "User": "loadbalancer"
+  "User": "loadbalancer",
+  "CtyVal": {}
  },
  {
   "Id": "loadbalancer2:test24",
   "Name": "test24",
   "NamePrefix": null,
   "Policy": "{\n  \"Version\": \"2012-10-17\",\n  \"Statement\": [\n    {\n      \"Action\": [\n        \"ec2:Describe*\"\n      ],\n      \"Effect\": \"Allow\",\n      \"Resource\": \"*\"\n    }\n  ]\n}\n",
-  "User": "loadbalancer2"
+  "User": "loadbalancer2",
+  "CtyVal": {}
  },
  {
   "Id": "loadbalancer3:test3",
   "Name": "test3",
   "NamePrefix": null,
   "Policy": "{\n  \"Version\": \"2012-10-17\",\n  \"Statement\": [\n    {\n      \"Action\": [\n        \"ec2:Describe*\"\n      ],\n      \"Effect\": \"Allow\",\n      \"Resource\": \"*\"\n    }\n  ]\n}\n",
-  "User": "loadbalancer3"
+  "User": "loadbalancer3",
+  "CtyVal": {}
  },
  {
   "Id": "loadbalancer3:test33",
   "Name": "test33",
   "NamePrefix": null,
   "Policy": "{\n  \"Version\": \"2012-10-17\",\n  \"Statement\": [\n    {\n      \"Action\": [\n        \"ec2:Describe*\"\n      ],\n      \"Effect\": \"Allow\",\n      \"Resource\": \"*\"\n    }\n  ]\n}\n",
-  "User": "loadbalancer3"
+  "User": "loadbalancer3",
+  "CtyVal": {}
  },
  {
   "Id": "loadbalancer:test",
   "Name": "test",
   "NamePrefix": null,
   "Policy": "{\n  \"Version\": \"2012-10-17\",\n  \"Statement\": [\n    {\n      \"Action\": [\n        \"ec2:Describe*\"\n      ],\n      \"Effect\": \"Allow\",\n      \"Resource\": \"*\"\n    }\n  ]\n}\n",
-  "User": "loadbalancer"
+  "User": "loadbalancer",
+  "CtyVal": {}
  },
  {
   "Id": "loadbalancer2:test2",
   "Name": "test2",
   "NamePrefix": null,
   "Policy": "{\n  \"Version\": \"2012-10-17\",\n  \"Statement\": [\n    {\n      \"Action\": [\n        \"ec2:Describe*\"\n      ],\n      \"Effect\": \"Allow\",\n      \"Resource\": \"*\"\n    }\n  ]\n}\n",
-  "User": "loadbalancer2"
+  "User": "loadbalancer2",
+  "CtyVal": {}
  },
  {
   "EncryptedSecret": null,
@@ -121,7 +136,8 @@
   "Secret": null,
   "SesSmtpPasswordV4": null,
   "Status": "Active",
-  "User": "loadbalancer2"
+  "User": "loadbalancer2",
+  "CtyVal": {}
  },
  {
   "EncryptedSecret": null,
@@ -131,7 +147,8 @@
   "Secret": null,
   "SesSmtpPasswordV4": null,
   "Status": "Active",
-  "User": "loadbalancer"
+  "User": "loadbalancer",
+  "CtyVal": {}
  },
  {
   "EncryptedSecret": null,
@@ -141,6 +158,7 @@
   "Secret": null,
   "SesSmtpPasswordV4": null,
   "Status": "Active",
-  "User": "loadbalancer3"
+  "User": "loadbalancer3",
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/internet_gateway/result.golden.json

@@ -6,6 +6,7 @@
   "Tags": {
    "Name": "main"
   },
-  "VpcId": "vpc-0f3ac2b7909b6bedd"
+  "VpcId": "vpc-0f3ac2b7909b6bedd",
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/kms_alias/result.golden.json

@@ -5,7 +5,8 @@
   "Name": "alias/bar",
   "NamePrefix": null,
   "TargetKeyArn": "arn:aws:kms:eu-west-3:047081014315:key/341b2d76-feab-4911-b5de-fbdd92b21aa7",
-  "TargetKeyId": "341b2d76-feab-4911-b5de-fbdd92b21aa7"
+  "TargetKeyId": "341b2d76-feab-4911-b5de-fbdd92b21aa7",
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:kms:eu-west-3:047081014315:alias/baz20210225124429210500000001",
@@ -13,7 +14,8 @@
   "Name": null,
   "NamePrefix": "alias/baz",
   "TargetKeyArn": "arn:aws:kms:eu-west-3:047081014315:key/341b2d76-feab-4911-b5de-fbdd92b21aa7",
-  "TargetKeyId": "341b2d76-feab-4911-b5de-fbdd92b21aa7"
+  "TargetKeyId": "341b2d76-feab-4911-b5de-fbdd92b21aa7",
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:kms:eu-west-3:047081014315:alias/foo",
@@ -21,6 +23,7 @@
   "Name": "alias/foo",
   "NamePrefix": null,
   "TargetKeyArn": "arn:aws:kms:eu-west-3:047081014315:key/341b2d76-feab-4911-b5de-fbdd92b21aa7",
-  "TargetKeyId": "341b2d76-feab-4911-b5de-fbdd92b21aa7"
+  "TargetKeyId": "341b2d76-feab-4911-b5de-fbdd92b21aa7",
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/kms_key/result.golden.json

@@ -10,7 +10,8 @@
   "KeyId": "8ee21d91-c000-428c-8032-235aac55da36",
   "KeyUsage": "SIGN_VERIFY",
   "Policy": "{\"Id\":\"key-consolepolicy-3\",\"Statement\":[{\"Action\":\"kms:*\",\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::047081014315:root\"},\"Resource\":\"*\",\"Sid\":\"Enable IAM User Permissions\"},{\"Action\":[\"kms:DescribeKey\",\"kms:GetPublicKey\",\"kms:Sign\",\"kms:Verify\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::047081014315:user/admin\"},\"Resource\":\"*\",\"Sid\":\"Allow use of the key\"},{\"Action\":[\"kms:CreateGrant\",\"kms:ListGrants\",\"kms:RevokeGrant\"],\"Condition\":{\"Bool\":{\"kms:GrantIsForAWSResource\":\"true\"}},\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::047081014315:user/admin\"},\"Resource\":\"*\",\"Sid\":\"Allow attachment of persistent resources\"}],\"Version\":\"2012-10-17\"}",
-  "Tags": {}
+  "Tags": {},
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:kms:eu-west-3:047081014315:key/5d765f32-bfdc-4610-b6ab-f82db5d0601b",
@@ -25,7 +26,8 @@
   "Policy": "{\"Id\":\"key-default-1\",\"Statement\":[{\"Action\":\"kms:*\",\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::047081014315:root\"},\"Resource\":\"*\",\"Sid\":\"Enable IAM User Permissions\"}],\"Version\":\"2012-10-17\"}",
   "Tags": {
    "Foo": "true"
-  }
+  },
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:kms:eu-west-3:047081014315:key/89d2c023-ea53-40a5-b20a-d84905c622d7",
@@ -38,6 +40,7 @@
   "KeyId": "89d2c023-ea53-40a5-b20a-d84905c622d7",
   "KeyUsage": "ENCRYPT_DECRYPT",
   "Policy": "{\"Id\":\"key-default-1\",\"Statement\":[{\"Action\":\"kms:*\",\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::047081014315:root\"},\"Resource\":\"*\",\"Sid\":\"Enable IAM User Permissions\"}],\"Version\":\"2012-10-17\"}",
-  "Tags": {}
+  "Tags": {},
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/lambda_function/result.golden.json

@@ -39,7 +39,8 @@
     "Mode": "PassThrough"
    }
   ],
-  "VpcConfig": []
+  "VpcConfig": [],
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:lambda:eu-west-3:047081014315:function:foo",
@@ -81,6 +82,7 @@
     "Mode": "PassThrough"
    }
   ],
-  "VpcConfig": []
+  "VpcConfig": [],
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/module.iam_iam-user/result.golden.json

@@ -7,7 +7,8 @@
   "Path": "/",
   "PermissionsBoundary": null,
   "Tags": null,
-  "UniqueId": "AIDA5QYBVVD22N3IK6SAR"
+  "UniqueId": "AIDA5QYBVVD22N3IK6SAR",
+  "CtyVal": {}
  },
  {
   "EncryptedSecret": null,
@@ -17,6 +18,7 @@
   "Secret": null,
   "SesSmtpPasswordV4": null,
   "Status": "Active",
-  "User": "MODULE-USER"
+  "User": "MODULE-USER",
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/route/result.golden.json

@@ -17,7 +17,8 @@
   "TransitGatewayId": null,
   "VpcEndpointId": null,
   "VpcPeeringConnectionId": null,
-  "Timeouts": null
+  "Timeouts": null,
+  "CtyVal": {}
  },
  {
   "DestinationCidrBlock": null,
@@ -37,6 +38,7 @@
   "TransitGatewayId": null,
   "VpcEndpointId": null,
   "VpcPeeringConnectionId": null,
-  "Timeouts": null
+  "Timeouts": null,
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/route53_health_check/result.golden.json

@@ -22,7 +22,8 @@
   "Tags": {
    "Name": "tf-test-health-check"
   },
-  "Type": "HTTP"
+  "Type": "HTTP",
+  "CtyVal": {}
  },
  {
   "ChildHealthThreshold": 0,
@@ -45,6 +46,7 @@
   "ResourcePath": "/",
   "SearchString": "MoAdiB",
   "Tags": null,
-  "Type": "HTTPS_STR_MATCH"
+  "Type": "HTTPS_STR_MATCH",
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/route53_record/result.golden.json

@@ -13,7 +13,8 @@
   ],
   "Tags": null,
   "ZoneId": "Z09368953G729AFEX5048",
-  "Vpc": []
+  "Vpc": [],
+  "CtyVal": {}
  },
  {
   "AllowOverwrite": true,
@@ -36,7 +37,8 @@
   "FailoverRoutingPolicy": [],
   "GeolocationRoutingPolicy": [],
   "LatencyRoutingPolicy": [],
-  "WeightedRoutingPolicy": []
+  "WeightedRoutingPolicy": [],
+  "CtyVal": {}
  },
  {
   "AllowOverwrite": null,
@@ -56,6 +58,7 @@
   "FailoverRoutingPolicy": [],
   "GeolocationRoutingPolicy": [],
   "LatencyRoutingPolicy": [],
-  "WeightedRoutingPolicy": []
+  "WeightedRoutingPolicy": [],
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/route53_record_multiples/result.golden.json

@@ -13,7 +13,8 @@
   ],
   "Tags": {},
   "ZoneId": "Z1035360GLIB82T1EH2G",
-  "Vpc": []
+  "Vpc": [],
+  "CtyVal": {}
  },
  {
   "Comment": "Managed by Terraform",
@@ -29,7 +30,8 @@
   ],
   "Tags": {},
   "ZoneId": "Z10347383HV75H96J919W",
-  "Vpc": []
+  "Vpc": [],
+  "CtyVal": {}
  },
  {
   "AllowOverwrite": true,
@@ -52,7 +54,8 @@
   "FailoverRoutingPolicy": [],
   "GeolocationRoutingPolicy": [],
   "LatencyRoutingPolicy": [],
-  "WeightedRoutingPolicy": []
+  "WeightedRoutingPolicy": [],
+  "CtyVal": {}
  },
  {
   "AllowOverwrite": null,
@@ -72,7 +75,8 @@
   "FailoverRoutingPolicy": [],
   "GeolocationRoutingPolicy": [],
   "LatencyRoutingPolicy": [],
-  "WeightedRoutingPolicy": []
+  "WeightedRoutingPolicy": [],
+  "CtyVal": {}
  },
  {
   "AllowOverwrite": null,
@@ -92,7 +96,8 @@
   "FailoverRoutingPolicy": [],
   "GeolocationRoutingPolicy": [],
   "LatencyRoutingPolicy": [],
-  "WeightedRoutingPolicy": []
+  "WeightedRoutingPolicy": [],
+  "CtyVal": {}
  },
  {
   "AllowOverwrite": null,
@@ -112,7 +117,8 @@
   "FailoverRoutingPolicy": [],
   "GeolocationRoutingPolicy": [],
   "LatencyRoutingPolicy": [],
-  "WeightedRoutingPolicy": []
+  "WeightedRoutingPolicy": [],
+  "CtyVal": {}
  },
  {
   "AllowOverwrite": null,
@@ -132,7 +138,8 @@
   "FailoverRoutingPolicy": [],
   "GeolocationRoutingPolicy": [],
   "LatencyRoutingPolicy": [],
-  "WeightedRoutingPolicy": []
+  "WeightedRoutingPolicy": [],
+  "CtyVal": {}
  },
  {
   "AllowOverwrite": null,
@@ -152,7 +159,8 @@
   "FailoverRoutingPolicy": [],
   "GeolocationRoutingPolicy": [],
   "LatencyRoutingPolicy": [],
-  "WeightedRoutingPolicy": []
+  "WeightedRoutingPolicy": [],
+  "CtyVal": {}
  },
  {
   "AllowOverwrite": null,
@@ -172,7 +180,8 @@
   "FailoverRoutingPolicy": [],
   "GeolocationRoutingPolicy": [],
   "LatencyRoutingPolicy": [],
-  "WeightedRoutingPolicy": []
+  "WeightedRoutingPolicy": [],
+  "CtyVal": {}
  },
  {
   "AllowOverwrite": null,
@@ -192,7 +201,8 @@
   "FailoverRoutingPolicy": [],
   "GeolocationRoutingPolicy": [],
   "LatencyRoutingPolicy": [],
-  "WeightedRoutingPolicy": []
+  "WeightedRoutingPolicy": [],
+  "CtyVal": {}
  },
  {
   "AllowOverwrite": null,
@@ -212,6 +222,7 @@
   "FailoverRoutingPolicy": [],
   "GeolocationRoutingPolicy": [],
   "LatencyRoutingPolicy": [],
-  "WeightedRoutingPolicy": []
+  "WeightedRoutingPolicy": [],
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/route53_zone/result.golden.json

@@ -13,6 +13,7 @@
   ],
   "Tags": null,
   "ZoneId": "Z09368953G729AFEX5048",
-  "Vpc": []
+  "Vpc": [],
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/route_assoc/result.golden.json

@@ -3,24 +3,28 @@
   "GatewayId": null,
   "Id": "rtbassoc-01957791b2cfe6ea4",
   "RouteTableId": "rtb-05aa6c5673311a17b",
-  "SubnetId": "subnet-0e93dbfa2e5dd8282"
+  "SubnetId": "subnet-0e93dbfa2e5dd8282",
+  "CtyVal": {}
  },
  {
   "GatewayId": null,
   "Id": "rtbassoc-0809598f92dbec03b",
   "RouteTableId": "rtb-05aa6c5673311a17b",
-  "SubnetId": "subnet-05185af647b2eeda3"
+  "SubnetId": "subnet-05185af647b2eeda3",
+  "CtyVal": {}
  },
  {
   "GatewayId": null,
   "Id": "rtbassoc-0b4f97ea57490e213",
   "RouteTableId": "rtb-05aa6c5673311a17b",
-  "SubnetId": "subnet-0fd966efd884d0362"
+  "SubnetId": "subnet-0fd966efd884d0362",
+  "CtyVal": {}
  },
  {
   "GatewayId": "igw-0238f6e09185ac954",
   "Id": "rtbassoc-0a79ccacfceb4944b",
   "RouteTableId": "rtb-09df7cc9d16de9f8f",
-  "SubnetId": null
+  "SubnetId": null,
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/route_table/result.golden.json

@@ -17,7 +17,8 @@
   "Ipv6CidrBlock": "",
   "MainRouteTableId": "rtb-9642cde8",
   "OwnerId": "929327065333",
-  "Tags": null
+  "Tags": null,
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:ec2:us-east-1:929327065333:vpc/vpc-0a5666c0cfc366714",
@@ -37,7 +38,8 @@
   "Ipv6CidrBlock": "",
   "MainRouteTableId": "rtb-0aa0a93a2960854a1",
   "OwnerId": "929327065333",
-  "Tags": {}
+  "Tags": {},
+  "CtyVal": {}
  },
  {
   "DefaultRouteTableId": "rtb-9642cde8",
@@ -46,7 +48,8 @@
   "PropagatingVgws": null,
   "Route": null,
   "Tags": null,
-  "VpcId": "vpc-41d1d13b"
+  "VpcId": "vpc-41d1d13b",
+  "CtyVal": {}
  },
  {
   "Id": "rtb-0232602f0f07748fc",
@@ -83,6 +86,7 @@
   "Tags": {
    "Name": "rr"
   },
-  "VpcId": "vpc-0a5666c0cfc366714"
+  "VpcId": "vpc-0a5666c0cfc366714",
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/s3_full/result.golden.json

@@ -29,7 +29,8 @@
     "MfaDelete": false
    }
   ],
-  "Website": []
+  "Website": [],
+  "CtyVal": {}
  },
  {
   "AccelerationStatus": "",
@@ -61,7 +62,8 @@
     "MfaDelete": false
    }
   ],
-  "Website": []
+  "Website": [],
+  "CtyVal": {}
  },
  {
   "AccelerationStatus": "",
@@ -93,7 +95,8 @@
     "MfaDelete": false
    }
   ],
-  "Website": []
+  "Website": [],
+  "CtyVal": {}
  },
  {
   "Bucket": "bucket-martin-test-drift",
@@ -120,7 +123,8 @@
      }
     ]
    }
-  ]
+  ],
+  "CtyVal": {}
  },
  {
   "Bucket": "bucket-martin-test-drift",
@@ -147,7 +151,8 @@
      }
     ]
    }
-  ]
+  ],
+  "CtyVal": {}
  },
  {
   "Bucket": "bucket-martin-test-drift2",
@@ -174,7 +179,8 @@
      }
     ]
    }
-  ]
+  ],
+  "CtyVal": {}
  },
  {
   "Bucket": "bucket-martin-test-drift2",
@@ -201,7 +207,8 @@
      }
     ]
    }
-  ]
+  ],
+  "CtyVal": {}
  },
  {
   "Bucket": "bucket-martin-test-drift3",
@@ -228,7 +235,8 @@
      }
     ]
    }
-  ]
+  ],
+  "CtyVal": {}
  },
  {
   "Bucket": "bucket-martin-test-drift3",
@@ -255,7 +263,8 @@
      }
     ]
    }
-  ]
+  ],
+  "CtyVal": {}
  },
  {
   "Bucket": "bucket-martin-test-drift",
@@ -282,7 +291,8 @@
    {
     "Frequency": "Daily"
    }
-  ]
+  ],
+  "CtyVal": {}
  },
  {
   "Bucket": "bucket-martin-test-drift3",
@@ -309,7 +319,8 @@
    {
     "Frequency": "Daily"
    }
-  ]
+  ],
+  "CtyVal": {}
  },
  {
   "Bucket": "bucket-martin-test-drift2",
@@ -336,7 +347,8 @@
    {
     "Frequency": "Daily"
    }
-  ]
+  ],
+  "CtyVal": {}
  },
  {
   "Bucket": "bucket-martin-test-drift",
@@ -363,7 +375,8 @@
    {
     "Frequency": "Daily"
    }
-  ]
+  ],
+  "CtyVal": {}
  },
  {
   "Bucket": "bucket-martin-test-drift3",
@@ -390,7 +403,8 @@
    {
     "Frequency": "Daily"
    }
-  ]
+  ],
+  "CtyVal": {}
  },
  {
   "Bucket": "bucket-martin-test-drift2",
@@ -417,43 +431,50 @@
    {
     "Frequency": "Daily"
    }
-  ]
+  ],
+  "CtyVal": {}
  },
  {
   "Bucket": "bucket-martin-test-drift",
   "Id": "bucket-martin-test-drift:Metrics2_Bucket1",
   "Name": "Metrics2_Bucket1",
-  "Filter": []
+  "Filter": [],
+  "CtyVal": {}
  },
  {
   "Bucket": "bucket-martin-test-drift3",
   "Id": "bucket-martin-test-drift3:Metrics2_Bucket3",
   "Name": "Metrics2_Bucket3",
-  "Filter": []
+  "Filter": [],
+  "CtyVal": {}
  },
  {
   "Bucket": "bucket-martin-test-drift2",
   "Id": "bucket-martin-test-drift2:Metrics_Bucket2",
   "Name": "Metrics_Bucket2",
-  "Filter": []
+  "Filter": [],
+  "CtyVal": {}
  },
  {
   "Bucket": "bucket-martin-test-drift",
   "Id": "bucket-martin-test-drift:Metrics_Bucket1",
   "Name": "Metrics_Bucket1",
-  "Filter": []
+  "Filter": [],
+  "CtyVal": {}
  },
  {
   "Bucket": "bucket-martin-test-drift2",
   "Id": "bucket-martin-test-drift2:Metrics2_Bucket2",
   "Name": "Metrics2_Bucket2",
-  "Filter": []
+  "Filter": [],
+  "CtyVal": {}
  },
  {
   "Bucket": "bucket-martin-test-drift3",
   "Id": "bucket-martin-test-drift3:Metrics_Bucket3",
   "Name": "Metrics_Bucket3",
-  "Filter": []
+  "Filter": [],
+  "CtyVal": {}
  },
  {
   "Bucket": "bucket-martin-test-drift",
@@ -479,7 +500,8 @@
    }
   ],
   "Queue": [],
-  "Topic": []
+  "Topic": [],
+  "CtyVal": {}
  },
  {
   "Bucket": "bucket-martin-test-drift3",
@@ -505,21 +527,25 @@
    }
   ],
   "Queue": [],
-  "Topic": []
+  "Topic": [],
+  "CtyVal": {}
  },
  {
   "Bucket": "bucket-martin-test-drift3",
   "Id": "bucket-martin-test-drift3",
-  "Policy": "{\"Statement\":[{\"Action\":\"s3:GetObject\",\"Effect\":\"Allow\",\"Principal\":\"*\",\"Resource\":\"arn:aws:s3:::bucket-martin-test-drift3/*\",\"Sid\":\"PublicReadGetObject\"}],\"Version\":\"2012-10-17\"}"
+  "Policy": "{\"Statement\":[{\"Action\":\"s3:GetObject\",\"Effect\":\"Allow\",\"Principal\":\"*\",\"Resource\":\"arn:aws:s3:::bucket-martin-test-drift3/*\",\"Sid\":\"PublicReadGetObject\"}],\"Version\":\"2012-10-17\"}",
+  "CtyVal": {}
  },
  {
   "Bucket": "bucket-martin-test-drift",
   "Id": "bucket-martin-test-drift",
-  "Policy": "{\"Statement\":[{\"Action\":\"s3:GetObject\",\"Effect\":\"Allow\",\"Principal\":\"*\",\"Resource\":\"arn:aws:s3:::bucket-martin-test-drift/*\",\"Sid\":\"PublicReadGetObject\"}],\"Version\":\"2012-10-17\"}"
+  "Policy": "{\"Statement\":[{\"Action\":\"s3:GetObject\",\"Effect\":\"Allow\",\"Principal\":\"*\",\"Resource\":\"arn:aws:s3:::bucket-martin-test-drift/*\",\"Sid\":\"PublicReadGetObject\"}],\"Version\":\"2012-10-17\"}",
+  "CtyVal": {}
  },
  {
   "Bucket": "bucket-martin-test-drift2",
   "Id": "bucket-martin-test-drift2",
-  "Policy": "{\"Statement\":[{\"Action\":\"s3:GetObject\",\"Effect\":\"Allow\",\"Principal\":\"*\",\"Resource\":\"arn:aws:s3:::bucket-martin-test-drift2/*\",\"Sid\":\"PublicReadGetObject\"}],\"Version\":\"2012-10-17\"}"
+  "Policy": "{\"Statement\":[{\"Action\":\"s3:GetObject\",\"Effect\":\"Allow\",\"Principal\":\"*\",\"Resource\":\"arn:aws:s3:::bucket-martin-test-drift2/*\",\"Sid\":\"PublicReadGetObject\"}],\"Version\":\"2012-10-17\"}",
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/sns_topic/result.golden.json

@@ -20,7 +20,8 @@
   "SqsFailureFeedbackRoleArn": "",
   "SqsSuccessFeedbackRoleArn": "",
   "SqsSuccessFeedbackSampleRate": 0,
-  "Tags": {}
+  "Tags": {},
+  "CtyVal": {}
  },
  {
   "ApplicationFailureFeedbackRoleArn": "",
@@ -43,7 +44,8 @@
   "SqsFailureFeedbackRoleArn": "",
   "SqsSuccessFeedbackRoleArn": "",
   "SqsSuccessFeedbackSampleRate": 0,
-  "Tags": {}
+  "Tags": {},
+  "CtyVal": {}
  },
  {
   "ApplicationFailureFeedbackRoleArn": "",
@@ -66,6 +68,7 @@
   "SqsFailureFeedbackRoleArn": "",
   "SqsSuccessFeedbackRoleArn": "",
   "SqsSuccessFeedbackSampleRate": 0,
-  "Tags": {}
+  "Tags": {},
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/sns_topic_policy/result.golden.json

@@ -2,11 +2,13 @@
  {
   "Arn": "arn:aws:sns:us-east-1:526954929923:my-topic-with-policy2",
   "Id": "arn:aws:sns:us-east-1:526954929923:my-topic-with-policy2",
-  "Policy": "{\"Id\":\"__default_policy_ID\",\"Statement\":[{\"Action\":[\"SNS:Subscribe\",\"SNS:SetTopicAttributes\",\"SNS:RemovePermission\",\"SNS:Receive\",\"SNS:Publish\",\"SNS:ListSubscriptionsByTopic\",\"SNS:GetTopicAttributes\",\"SNS:DeleteTopic\",\"SNS:AddPermission\"],\"Condition\":{\"StringEquals\":{\"AWS:SourceOwner\":[]}},\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"*\"},\"Resource\":\"arn:aws:sns:us-east-1:526954929923:my-topic-with-policy\",\"Sid\":\"__default_statement_ID\"}],\"Version\":\"2012-10-17\"}"
+  "Policy": "{\"Id\":\"__default_policy_ID\",\"Statement\":[{\"Action\":[\"SNS:Subscribe\",\"SNS:SetTopicAttributes\",\"SNS:RemovePermission\",\"SNS:Receive\",\"SNS:Publish\",\"SNS:ListSubscriptionsByTopic\",\"SNS:GetTopicAttributes\",\"SNS:DeleteTopic\",\"SNS:AddPermission\"],\"Condition\":{\"StringEquals\":{\"AWS:SourceOwner\":[]}},\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"*\"},\"Resource\":\"arn:aws:sns:us-east-1:526954929923:my-topic-with-policy\",\"Sid\":\"__default_statement_ID\"}],\"Version\":\"2012-10-17\"}",
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:sns:us-east-1:526954929923:my-topic-with-policy",
   "Id": "arn:aws:sns:us-east-1:526954929923:my-topic-with-policy",
-  "Policy": "{\"Id\":\"__default_policy_ID\",\"Statement\":[{\"Action\":[\"SNS:Subscribe\",\"SNS:SetTopicAttributes\",\"SNS:RemovePermission\",\"SNS:Receive\",\"SNS:Publish\",\"SNS:ListSubscriptionsByTopic\",\"SNS:GetTopicAttributes\",\"SNS:DeleteTopic\",\"SNS:AddPermission\"],\"Condition\":{\"StringEquals\":{\"AWS:SourceOwner\":[]}},\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"*\"},\"Resource\":\"arn:aws:sns:us-east-1:526954929923:my-topic-with-policy\",\"Sid\":\"__default_statement_ID\"}],\"Version\":\"2012-10-17\"}"
+  "Policy": "{\"Id\":\"__default_policy_ID\",\"Statement\":[{\"Action\":[\"SNS:Subscribe\",\"SNS:SetTopicAttributes\",\"SNS:RemovePermission\",\"SNS:Receive\",\"SNS:Publish\",\"SNS:ListSubscriptionsByTopic\",\"SNS:GetTopicAttributes\",\"SNS:DeleteTopic\",\"SNS:AddPermission\"],\"Condition\":{\"StringEquals\":{\"AWS:SourceOwner\":[]}},\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"*\"},\"Resource\":\"arn:aws:sns:us-east-1:526954929923:my-topic-with-policy\",\"Sid\":\"__default_statement_ID\"}],\"Version\":\"2012-10-17\"}",
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/sns_topic_subscription/result.golden.json

@@ -9,7 +9,8 @@
   "Id": "arn:aws:sns:us-east-1:526954929923:user-updates-topic:b6e66147-2b31-4486-8d4b-2a2272264c8e",
   "Protocol": "sqs",
   "RawMessageDelivery": false,
-  "TopicArn": "arn:aws:sns:us-east-1:526954929923:user-updates-topic"
+  "TopicArn": "arn:aws:sns:us-east-1:526954929923:user-updates-topic",
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:sns:us-east-1:526954929923:user-updates-topic2:c0f794c5-a009-4db4-9147-4c55959787fa",
@@ -21,6 +22,7 @@
   "Id": "arn:aws:sns:us-east-1:526954929923:user-updates-topic2:c0f794c5-a009-4db4-9147-4c55959787fa",
   "Protocol": "sqs",
   "RawMessageDelivery": false,
-  "TopicArn": "arn:aws:sns:us-east-1:526954929923:user-updates-topic2"
+  "TopicArn": "arn:aws:sns:us-east-1:526954929923:user-updates-topic2",
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/sqs_queue/result.golden.json

@@ -15,7 +15,8 @@
   "ReceiveWaitTimeSeconds": 0,
   "RedrivePolicy": "",
   "Tags": {},
-  "VisibilityTimeoutSeconds": 30
+  "VisibilityTimeoutSeconds": 30,
+  "CtyVal": {}
  },
  {
   "Arn": "arn:aws:sqs:eu-west-3:047081014315:foo",
@@ -33,6 +34,7 @@
   "ReceiveWaitTimeSeconds": 0,
   "RedrivePolicy": "",
   "Tags": {},
-  "VisibilityTimeoutSeconds": 30
+  "VisibilityTimeoutSeconds": 30,
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/sqs_queue_policy/result.golden.json

@@ -2,6 +2,7 @@
  {
   "Id": "https://sqs.eu-west-3.amazonaws.com/047081014315/bar.fifo",
   "Policy": "{\"Id\":\"MYSQSPOLICY\",\"Statement\":[{\"Action\":\"sqs:SendMessage\",\"Effect\":\"Allow\",\"Principal\":\"*\",\"Resource\":\"arn:aws:sqs:eu-west-3:047081014315:bar.fifo\",\"Sid\":\"Stmt1611769527792\"}],\"Version\":\"2012-10-17\"}",
-  "QueueUrl": "https://sqs.eu-west-3.amazonaws.com/047081014315/bar.fifo"
+  "QueueUrl": "https://sqs.eu-west-3.amazonaws.com/047081014315/bar.fifo",
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/unsupported_attribute/result.golden.json

@@ -71,6 +71,7 @@
     "VolumeType": "gp2"
    }
   ],
-  "Timeouts": null
+  "Timeouts": null,
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/unsupported_provider/result.golden.json

@@ -29,6 +29,7 @@
         "MfaDelete": false
       }
     ],
-    "Website": []
+    "Website": [],
+    "CtyVal": {}
   }
 ]

pkg/iac/terraform/state/test/vpc_security_group/result.golden.json

@@ -13,6 +13,7 @@
    "Name": "Foo SG"
   },
   "VpcId": "vpc-618f6e09",
-  "Timeouts": null
+  "Timeouts": null,
+  "CtyVal": {}
  }
 ]

pkg/iac/terraform/state/test/vpc_security_group_rule/result.golden.json

@@ -15,7 +15,8 @@
   "Self": false,
   "SourceSecurityGroupId": null,
   "ToPort": 0,
-  "Type": "egress"
+  "Type": "egress",
+  "CtyVal": {}
  },
  {
   "CidrBlocks": [
@@ -33,7 +34,8 @@
   "Self": false,
   "SourceSecurityGroupId": null,
   "ToPort": 0,
-  "Type": "egress"
+  "Type": "egress",
+  "CtyVal": {}
  },
  {
   "CidrBlocks": [],
@@ -49,7 +51,8 @@
   "Self": false,
   "SourceSecurityGroupId": null,
   "ToPort": 0,
-  "Type": "ingress"
+  "Type": "ingress",
+  "CtyVal": {}
  },
  {
   "CidrBlocks": [],
@@ -65,7 +68,8 @@
   "Self": false,
   "SourceSecurityGroupId": null,
   "ToPort": 0,
-  "Type": "ingress"
+  "Type": "ingress",
+  "CtyVal": {}
  },
  {
   "CidrBlocks": [
@@ -81,7 +85,8 @@
   "Self": false,
   "SourceSecurityGroupId": null,
   "ToPort": 0,
-  "Type": "egress"
+  "Type": "egress",
+  "CtyVal": {}
  },
  {
   "CidrBlocks": [],
@@ -95,7 +100,8 @@
   "Self": true,
   "SourceSecurityGroupId": "sg-0254c038e32f25530",
   "ToPort": 65535,
-  "Type": "ingress"
+  "Type": "ingress",
+  "CtyVal": {}
  },
  {
   "CidrBlocks": [],
@@ -109,7 +115,8 @@
   "Self": true,
   "SourceSecurityGroupId": "sg-0254c038e32f25530",
   "ToPort": 0,
-  "Type": "ingress"
+  "Type": "ingress",
+  "CtyVal": {}
  },
  {
   "CidrBlocks": [
@@ -127,7 +134,8 @@
   "Self": false,
   "SourceSecurityGroupId": null,
   "ToPort": 0,
-  "Type": "egress"
+  "Type": "egress",
+  "CtyVal": {}
  },
  {
   "CidrBlocks": [
@@ -144,7 +152,8 @@
   "Self": false,
   "SourceSecurityGroupId": null,
   "ToPort": 0,
-  "Type": "ingress"
+  "Type": "ingress",
+  "CtyVal": {}
  },
  {
   "CidrBlocks": [
@@ -160,7 +169,8 @@
   "Self": false,
   "SourceSecurityGroupId": null,
   "ToPort": 0,
-  "Type": "ingress"
+  "Type": "ingress",
+  "CtyVal": {}
  },
  {
   "CidrBlocks": [
@@ -176,6 +186,7 @@
   "Self": false,
   "SourceSecurityGroupId": null,
   "ToPort": 0,
-  "Type": "egress"
+  "Type": "egress",
+  "CtyVal": {}
  }
 ]

pkg/resource/aws/aws_ami.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsAmiResourceType = "aws_ami"
 
 type AwsAmi struct {
@@ -37,6 +39,7 @@ type AwsAmi struct {
 		Delete *string `cty:"delete"`
 		Update *string `cty:"update"`
 	} `cty:"timeouts" diff:"-"`
+	CtyVal *cty.Value `diff:"-"`
 }
 
 func (r *AwsAmi) TerraformId() string {
@@ -46,3 +49,7 @@ func (r *AwsAmi) TerraformId() string {
 func (r *AwsAmi) TerraformType() string {
 	return AwsAmiResourceType
 }
+
+func (r *AwsAmi) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_cloudfront_distribution.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsCloudfrontDistributionResourceType = "aws_cloudfront_distribution"
 
 type AwsCloudfrontDistribution struct {
@@ -139,6 +141,7 @@ type AwsCloudfrontDistribution struct {
 		MinimumProtocolVersion       *string `cty:"minimum_protocol_version"`
 		SslSupportMethod             *string `cty:"ssl_support_method"`
 	} `cty:"viewer_certificate"`
+	CtyVal *cty.Value `diff:"-"`
 }
 
 func (r *AwsCloudfrontDistribution) TerraformId() string {
@@ -148,3 +151,7 @@ func (r *AwsCloudfrontDistribution) TerraformId() string {
 func (r *AwsCloudfrontDistribution) TerraformType() string {
 	return AwsCloudfrontDistributionResourceType
 }
+
+func (r *AwsCloudfrontDistribution) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_db_instance.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsDbInstanceResourceType = "aws_db_instance"
 
 type AwsDbInstance struct {
@@ -81,6 +83,7 @@ type AwsDbInstance struct {
 		Delete *string `cty:"delete"`
 		Update *string `cty:"update"`
 	} `cty:"timeouts" diff:"-"`
+	CtyVal *cty.Value `diff:"-"`
 }
 
 func (r *AwsDbInstance) TerraformId() string {
@@ -90,3 +93,7 @@ func (r *AwsDbInstance) TerraformId() string {
 func (r *AwsDbInstance) TerraformType() string {
 	return AwsDbInstanceResourceType
 }
+
+func (r *AwsDbInstance) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_db_subnet_group.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsDbSubnetGroupResourceType = "aws_db_subnet_group"
 
 type AwsDbSubnetGroup struct {
@@ -11,6 +13,7 @@ type AwsDbSubnetGroup struct {
 	NamePrefix  *string           `cty:"name_prefix" computed:"true" diff:"-"`
 	SubnetIds   []string          `cty:"subnet_ids"`
 	Tags        map[string]string `cty:"tags"`
+	CtyVal      *cty.Value        `diff:"-"`
 }
 
 func (r *AwsDbSubnetGroup) TerraformId() string {
@@ -20,3 +23,7 @@ func (r *AwsDbSubnetGroup) TerraformId() string {
 func (r *AwsDbSubnetGroup) TerraformType() string {
 	return AwsDbSubnetGroupResourceType
 }
+
+func (r *AwsDbSubnetGroup) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_default_route_table.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsDefaultRouteTableResourceType = "aws_default_route_table"
 
 type AwsDefaultRouteTable struct {
@@ -20,8 +22,9 @@ type AwsDefaultRouteTable struct {
 		VpcEndpointId          *string `cty:"vpc_endpoint_id"`
 		VpcPeeringConnectionId *string `cty:"vpc_peering_connection_id"`
 	} `cty:"route" computed:"true"`
-	Tags  map[string]string `cty:"tags"`
+	Tags   map[string]string `cty:"tags"`
-	VpcId *string           `cty:"vpc_id" computed:"true"`
+	VpcId  *string           `cty:"vpc_id" computed:"true"`
+	CtyVal *cty.Value        `diff:"-"`
 }
 
 func (r *AwsDefaultRouteTable) TerraformId() string {
@@ -31,3 +34,7 @@ func (r *AwsDefaultRouteTable) TerraformId() string {
 func (r *AwsDefaultRouteTable) TerraformType() string {
 	return AwsDefaultRouteTableResourceType
 }
+
+func (r *AwsDefaultRouteTable) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_default_security_group.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsDefaultSecurityGroupResourceType = "aws_default_security_group"
 
 type AwsDefaultSecurityGroup struct {
@@ -34,6 +36,7 @@ type AwsDefaultSecurityGroup struct {
 	RevokeRulesOnDelete *bool             `cty:"revoke_rules_on_delete" diff:"-"`
 	Tags                map[string]string `cty:"tags"`
 	VpcId               *string           `cty:"vpc_id" computed:"true"`
+	CtyVal              *cty.Value        `diff:"-"`
 }
 
 func (r *AwsDefaultSecurityGroup) TerraformId() string {
@@ -43,3 +46,7 @@ func (r *AwsDefaultSecurityGroup) TerraformId() string {
 func (r *AwsDefaultSecurityGroup) TerraformType() string {
 	return AwsDefaultSecurityGroupResourceType
 }
+
+func (r *AwsDefaultSecurityGroup) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_default_subnet.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsDefaultSubnetResourceType = "aws_default_subnet"
 
 type AwsDefaultSubnet struct {
@@ -21,6 +23,7 @@ type AwsDefaultSubnet struct {
 		Create *string `cty:"create"`
 		Delete *string `cty:"delete"`
 	} `cty:"timeouts" diff:"-"`
+	CtyVal *cty.Value `diff:"-"`
 }
 
 func (r *AwsDefaultSubnet) TerraformId() string {
@@ -30,3 +33,7 @@ func (r *AwsDefaultSubnet) TerraformId() string {
 func (r *AwsDefaultSubnet) TerraformType() string {
 	return AwsDefaultSubnetResourceType
 }
+
+func (r *AwsDefaultSubnet) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_default_vpc.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsDefaultVpcResourceType = "aws_default_vpc"
 
 type AwsDefaultVpc struct {
@@ -22,6 +24,7 @@ type AwsDefaultVpc struct {
 	MainRouteTableId             *string           `cty:"main_route_table_id" computed:"true"`
 	OwnerId                      *string           `cty:"owner_id" computed:"true"`
 	Tags                         map[string]string `cty:"tags"`
+	CtyVal                       *cty.Value        `diff:"-"`
 }
 
 func (r *AwsDefaultVpc) TerraformId() string {
@@ -31,3 +34,7 @@ func (r *AwsDefaultVpc) TerraformId() string {
 func (r *AwsDefaultVpc) TerraformType() string {
 	return AwsDefaultVpcResourceType
 }
+
+func (r *AwsDefaultVpc) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_dynamodb_table.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsDynamodbTableResourceType = "aws_dynamodb_table"
 
 type AwsDynamodbTable struct {
@@ -55,6 +57,7 @@ type AwsDynamodbTable struct {
 		AttributeName *string `cty:"attribute_name"`
 		Enabled       *bool   `cty:"enabled"`
 	} `cty:"ttl"`
+	CtyVal *cty.Value `diff:"-"`
 }
 
 func (r *AwsDynamodbTable) TerraformId() string {
@@ -64,3 +67,7 @@ func (r *AwsDynamodbTable) TerraformId() string {
 func (r *AwsDynamodbTable) TerraformType() string {
 	return AwsDynamodbTableResourceType
 }
+
+func (r *AwsDynamodbTable) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_ebs_snapshot.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsEbsSnapshotResourceType = "aws_ebs_snapshot"
 
 type AwsEbsSnapshot struct {
@@ -19,6 +21,7 @@ type AwsEbsSnapshot struct {
 		Create *string `cty:"create"`
 		Delete *string `cty:"delete"`
 	} `cty:"timeouts" diff:"-"`
+	CtyVal *cty.Value `diff:"-"`
 }
 
 func (r *AwsEbsSnapshot) TerraformId() string {
@@ -28,3 +31,7 @@ func (r *AwsEbsSnapshot) TerraformId() string {
 func (r *AwsEbsSnapshot) TerraformType() string {
 	return AwsEbsSnapshotResourceType
 }
+
+func (r *AwsEbsSnapshot) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_ebs_volume.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsEbsVolumeResourceType = "aws_ebs_volume"
 
 type AwsEbsVolume struct {
@@ -16,6 +18,7 @@ type AwsEbsVolume struct {
 	SnapshotId         *string           `cty:"snapshot_id" diff:"-" computed:"true"`
 	Tags               map[string]string `cty:"tags"`
 	Type               *string           `cty:"type" computed:"true"`
+	CtyVal             *cty.Value        `cty:"-" diff:"-"`
 }
 
 func (r *AwsEbsVolume) TerraformId() string {
@@ -25,3 +28,7 @@ func (r *AwsEbsVolume) TerraformId() string {
 func (r *AwsEbsVolume) TerraformType() string {
 	return AwsEbsVolumeResourceType
 }
+
+func (r *AwsEbsVolume) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_ecr_repository.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsEcrRepositoryResourceType = "aws_ecr_repository"
 
 type AwsEcrRepository struct {
@@ -21,6 +23,7 @@ type AwsEcrRepository struct {
 	Timeouts *struct {
 		Delete *string `cty:"delete"`
 	} `cty:"timeouts" diff:"-"`
+	CtyVal *cty.Value `diff:"-"`
 }
 
 func (r *AwsEcrRepository) TerraformId() string {
@@ -30,3 +33,7 @@ func (r *AwsEcrRepository) TerraformId() string {
 func (r *AwsEcrRepository) TerraformType() string {
 	return AwsEcrRepositoryResourceType
 }
+
+func (r *AwsEcrRepository) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_eip.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsEipResourceType = "aws_eip"
 
 type AwsEip struct {
@@ -26,6 +28,7 @@ type AwsEip struct {
 		Read   *string `cty:"read"`
 		Update *string `cty:"update"`
 	} `cty:"timeouts" diff:"-"`
+	CtyVal *cty.Value `diff:"-"`
 }
 
 func (r *AwsEip) TerraformId() string {
@@ -35,3 +38,7 @@ func (r *AwsEip) TerraformId() string {
 func (r *AwsEip) TerraformType() string {
 	return AwsEipResourceType
 }
+
+func (r *AwsEip) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_eip_association.go

@@ -1,16 +1,19 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsEipAssociationResourceType = "aws_eip_association"
 
 type AwsEipAssociation struct {
-	AllocationId       *string `cty:"allocation_id" computed:"true"`
+	AllocationId       *string    `cty:"allocation_id" computed:"true"`
-	AllowReassociation *bool   `cty:"allow_reassociation"`
+	AllowReassociation *bool      `cty:"allow_reassociation"`
-	Id                 string  `cty:"id" computed:"true"`
+	Id                 string     `cty:"id" computed:"true"`
-	InstanceId         *string `cty:"instance_id" computed:"true"`
+	InstanceId         *string    `cty:"instance_id" computed:"true"`
-	NetworkInterfaceId *string `cty:"network_interface_id" computed:"true"`
+	NetworkInterfaceId *string    `cty:"network_interface_id" computed:"true"`
-	PrivateIpAddress   *string `cty:"private_ip_address" computed:"true"`
+	PrivateIpAddress   *string    `cty:"private_ip_address" computed:"true"`
-	PublicIp           *string `cty:"public_ip" computed:"true"`
+	PublicIp           *string    `cty:"public_ip" computed:"true"`
+	CtyVal             *cty.Value `diff:"-"`
 }
 
 func (r *AwsEipAssociation) TerraformId() string {
@@ -20,3 +23,7 @@ func (r *AwsEipAssociation) TerraformId() string {
 func (r *AwsEipAssociation) TerraformType() string {
 	return AwsEipAssociationResourceType
 }
+
+func (r *AwsEipAssociation) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_iam_access_key.go

@@ -1,17 +1,20 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsIamAccessKeyResourceType = "aws_iam_access_key"
 
 type AwsIamAccessKey struct {
-	EncryptedSecret   *string `cty:"encrypted_secret" computed:"true"`
+	EncryptedSecret   *string    `cty:"encrypted_secret" computed:"true"`
-	Id                string  `cty:"id" computed:"true"`
+	Id                string     `cty:"id" computed:"true"`
-	KeyFingerprint    *string `cty:"key_fingerprint" computed:"true"`
+	KeyFingerprint    *string    `cty:"key_fingerprint" computed:"true"`
-	PgpKey            *string `cty:"pgp_key"`
+	PgpKey            *string    `cty:"pgp_key"`
-	Secret            *string `cty:"secret" computed:"true"`
+	Secret            *string    `cty:"secret" computed:"true"`
-	SesSmtpPasswordV4 *string `cty:"ses_smtp_password_v4" computed:"true"`
+	SesSmtpPasswordV4 *string    `cty:"ses_smtp_password_v4" computed:"true"`
-	Status            *string `cty:"status" computed:"true"`
+	Status            *string    `cty:"status" computed:"true"`
-	User              *string `cty:"user"`
+	User              *string    `cty:"user"`
+	CtyVal            *cty.Value `diff:"-"`
 }
 
 func (r *AwsIamAccessKey) TerraformId() string {
@@ -21,3 +24,7 @@ func (r *AwsIamAccessKey) TerraformId() string {
 func (r *AwsIamAccessKey) TerraformType() string {
 	return AwsIamAccessKeyResourceType
 }
+
+func (r *AwsIamAccessKey) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_iam_policy.go

@@ -1,16 +1,19 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsIamPolicyResourceType = "aws_iam_policy"
 
 type AwsIamPolicy struct {
-	Arn         *string `cty:"arn" computed:"true"`
+	Arn         *string    `cty:"arn" computed:"true"`
-	Description *string `cty:"description"`
+	Description *string    `cty:"description"`
-	Id          string  `cty:"id" computed:"true"`
+	Id          string     `cty:"id" computed:"true"`
-	Name        *string `cty:"name" computed:"true"`
+	Name        *string    `cty:"name" computed:"true"`
-	NamePrefix  *string `cty:"name_prefix" diff:"-"`
+	NamePrefix  *string    `cty:"name_prefix" diff:"-"`
-	Path        *string `cty:"path"`
+	Path        *string    `cty:"path"`
-	Policy      *string `cty:"policy" jsonstring:"true"`
+	Policy      *string    `cty:"policy" jsonstring:"true"`
+	CtyVal      *cty.Value `diff:"-"`
 }
 
 func (r *AwsIamPolicy) TerraformId() string {
@@ -20,3 +23,7 @@ func (r *AwsIamPolicy) TerraformId() string {
 func (r *AwsIamPolicy) TerraformType() string {
 	return AwsIamPolicyResourceType
 }
+
+func (r *AwsIamPolicy) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_iam_policy_attachment.go

@@ -1,15 +1,18 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsIamPolicyAttachmentResourceType = "aws_iam_policy_attachment"
 
 type AwsIamPolicyAttachment struct {
-	Groups    *[]string `cty:"groups"`
+	Groups    *[]string  `cty:"groups"`
-	Id        string    `cty:"id" diff:"Id, identifier" computed:"true"`
+	Id        string     `cty:"id" diff:"Id, identifier" computed:"true"`
-	Name      *string   `cty:"name" diff:"-"`
+	Name      *string    `cty:"name" diff:"-"`
-	PolicyArn *string   `cty:"policy_arn"`
+	PolicyArn *string    `cty:"policy_arn"`
-	Roles     *[]string `cty:"roles"`
+	Roles     *[]string  `cty:"roles"`
-	Users     *[]string `cty:"users"`
+	Users     *[]string  `cty:"users"`
+	CtyVal    *cty.Value `diff:"-"`
 }
 
 func (r *AwsIamPolicyAttachment) TerraformId() string {
@@ -19,3 +22,7 @@ func (r *AwsIamPolicyAttachment) TerraformId() string {
 func (r *AwsIamPolicyAttachment) TerraformType() string {
 	return AwsIamPolicyAttachmentResourceType
 }
+
+func (r *AwsIamPolicyAttachment) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_iam_role.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsIamRoleResourceType = "aws_iam_role"
 
 type AwsIamRole struct {
@@ -17,6 +19,7 @@ type AwsIamRole struct {
 	PermissionsBoundary *string           `cty:"permissions_boundary"`
 	Tags                map[string]string `cty:"tags"`
 	UniqueId            *string           `cty:"unique_id" computed:"true"`
+	CtyVal              *cty.Value        `diff:"-"`
 }
 
 func (r *AwsIamRole) TerraformId() string {
@@ -26,3 +29,7 @@ func (r *AwsIamRole) TerraformId() string {
 func (r *AwsIamRole) TerraformType() string {
 	return AwsIamRoleResourceType
 }
+
+func (r *AwsIamRole) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_iam_role_policy.go

@@ -1,14 +1,17 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsIamRolePolicyResourceType = "aws_iam_role_policy"
 
 type AwsIamRolePolicy struct {
-	Id         string  `cty:"id" computed:"true"`
+	Id         string     `cty:"id" computed:"true"`
-	Name       *string `cty:"name" computed:"true"`
+	Name       *string    `cty:"name" computed:"true"`
-	NamePrefix *string `cty:"name_prefix"`
+	NamePrefix *string    `cty:"name_prefix"`
-	Policy     *string `cty:"policy" jsonstring:"true"`
+	Policy     *string    `cty:"policy" jsonstring:"true"`
-	Role       *string `cty:"role"`
+	Role       *string    `cty:"role"`
+	CtyVal     *cty.Value `diff:"-"`
 }
 
 func (r *AwsIamRolePolicy) TerraformId() string {
@@ -18,3 +21,7 @@ func (r *AwsIamRolePolicy) TerraformId() string {
 func (r *AwsIamRolePolicy) TerraformType() string {
 	return AwsIamRolePolicyResourceType
 }
+
+func (r *AwsIamRolePolicy) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_iam_role_policy_attachment.go

@@ -1,12 +1,15 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsIamRolePolicyAttachmentResourceType = "aws_iam_role_policy_attachment"
 
 type AwsIamRolePolicyAttachment struct {
-	Id        string  `cty:"id" computed:"true"`
+	Id        string     `cty:"id" computed:"true"`
-	PolicyArn *string `cty:"policy_arn"`
+	PolicyArn *string    `cty:"policy_arn"`
-	Role      *string `cty:"role"`
+	Role      *string    `cty:"role"`
+	CtyVal    *cty.Value `diff:"-"`
 }
 
 func (r *AwsIamRolePolicyAttachment) TerraformId() string {
@@ -16,3 +19,7 @@ func (r *AwsIamRolePolicyAttachment) TerraformId() string {
 func (r *AwsIamRolePolicyAttachment) TerraformType() string {
 	return AwsIamRolePolicyAttachmentResourceType
 }
+
+func (r *AwsIamRolePolicyAttachment) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_iam_user.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsIamUserResourceType = "aws_iam_user"
 
 type AwsIamUser struct {
@@ -12,6 +14,7 @@ type AwsIamUser struct {
 	PermissionsBoundary *string           `cty:"permissions_boundary"`
 	Tags                map[string]string `cty:"tags"`
 	UniqueId            *string           `cty:"unique_id" computed:"true"`
+	CtyVal              *cty.Value        `diff:"-"`
 }
 
 func (r *AwsIamUser) TerraformId() string {
@@ -21,3 +24,7 @@ func (r *AwsIamUser) TerraformId() string {
 func (r *AwsIamUser) TerraformType() string {
 	return AwsIamUserResourceType
 }
+
+func (r *AwsIamUser) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_iam_user_policy.go

@@ -1,14 +1,17 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsIamUserPolicyResourceType = "aws_iam_user_policy"
 
 type AwsIamUserPolicy struct {
-	Id         string  `cty:"id" computed:"true"`
+	Id         string     `cty:"id" computed:"true"`
-	Name       *string `cty:"name" computed:"true"`
+	Name       *string    `cty:"name" computed:"true"`
-	NamePrefix *string `cty:"name_prefix"`
+	NamePrefix *string    `cty:"name_prefix"`
-	Policy     *string `cty:"policy" jsonstring:"true"`
+	Policy     *string    `cty:"policy" jsonstring:"true"`
-	User       *string `cty:"user"`
+	User       *string    `cty:"user"`
+	CtyVal     *cty.Value `diff:"-"`
 }
 
 func (r *AwsIamUserPolicy) TerraformId() string {
@@ -18,3 +21,7 @@ func (r *AwsIamUserPolicy) TerraformId() string {
 func (r *AwsIamUserPolicy) TerraformType() string {
 	return AwsIamUserPolicyResourceType
 }
+
+func (r *AwsIamUserPolicy) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_iam_user_policy_attachment.go

@@ -1,12 +1,15 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsIamUserPolicyAttachmentResourceType = "aws_iam_user_policy_attachment"
 
 type AwsIamUserPolicyAttachment struct {
-	Id        string  `cty:"id" computed:"true"`
+	Id        string     `cty:"id" computed:"true"`
-	PolicyArn *string `cty:"policy_arn"`
+	PolicyArn *string    `cty:"policy_arn"`
-	User      *string `cty:"user"`
+	User      *string    `cty:"user"`
+	CtyVal    *cty.Value `diff:"-"`
 }
 
 func (r *AwsIamUserPolicyAttachment) TerraformId() string {
@@ -16,3 +19,7 @@ func (r *AwsIamUserPolicyAttachment) TerraformId() string {
 func (r *AwsIamUserPolicyAttachment) TerraformType() string {
 	return AwsIamUserPolicyAttachmentResourceType
 }
+
+func (r *AwsIamUserPolicyAttachment) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_instance.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsInstanceResourceType = "aws_instance"
 
 type AwsInstance struct {
@@ -86,6 +88,7 @@ type AwsInstance struct {
 		Delete *string `cty:"delete"`
 		Update *string `cty:"update"`
 	} `cty:"timeouts" diff:"-"`
+	CtyVal *cty.Value `diff:"-"`
 }
 
 func (r *AwsInstance) TerraformId() string {
@@ -95,3 +98,7 @@ func (r *AwsInstance) TerraformId() string {
 func (r *AwsInstance) TerraformType() string {
 	return AwsInstanceResourceType
 }
+
+func (r *AwsInstance) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_internet_gateway.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsInternetGatewayResourceType = "aws_internet_gateway"
 
 type AwsInternetGateway struct {
@@ -9,6 +11,7 @@ type AwsInternetGateway struct {
 	OwnerId *string           `cty:"owner_id" computed:"true"`
 	Tags    map[string]string `cty:"tags"`
 	VpcId   *string           `cty:"vpc_id"`
+	CtyVal  *cty.Value        `diff:"-"`
 }
 
 func (r *AwsInternetGateway) TerraformId() string {
@@ -18,3 +21,7 @@ func (r *AwsInternetGateway) TerraformId() string {
 func (r *AwsInternetGateway) TerraformType() string {
 	return AwsInternetGatewayResourceType
 }
+
+func (r *AwsInternetGateway) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_key_pair.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsKeyPairResourceType = "aws_key_pair"
 
 type AwsKeyPair struct {
@@ -12,6 +14,7 @@ type AwsKeyPair struct {
 	KeyPairId     *string           `cty:"key_pair_id" computed:"true"`
 	PublicKey     *string           `cty:"public_key" diff:"-"`
 	Tags          map[string]string `cty:"tags"`
+	CtyVal        *cty.Value        `diff:"-"`
 }
 
 func (r *AwsKeyPair) TerraformId() string {
@@ -21,3 +24,7 @@ func (r *AwsKeyPair) TerraformId() string {
 func (r *AwsKeyPair) TerraformType() string {
 	return AwsKeyPairResourceType
 }
+
+func (r *AwsKeyPair) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_kms_alias.go

@@ -1,15 +1,18 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsKmsAliasResourceType = "aws_kms_alias"
 
 type AwsKmsAlias struct {
-	Arn          *string `cty:"arn" computed:"true"`
+	Arn          *string    `cty:"arn" computed:"true"`
-	Id           string  `cty:"id" computed:"true"`
+	Id           string     `cty:"id" computed:"true"`
-	Name         *string `cty:"name" diff:"-"`
+	Name         *string    `cty:"name" diff:"-"`
-	NamePrefix   *string `cty:"name_prefix" diff:"-"`
+	NamePrefix   *string    `cty:"name_prefix" diff:"-"`
-	TargetKeyArn *string `cty:"target_key_arn" computed:"true"`
+	TargetKeyArn *string    `cty:"target_key_arn" computed:"true"`
-	TargetKeyId  *string `cty:"target_key_id"`
+	TargetKeyId  *string    `cty:"target_key_id"`
+	CtyVal       *cty.Value `diff:"-"`
 }
 
 func (r *AwsKmsAlias) TerraformId() string {
@@ -19,3 +22,7 @@ func (r *AwsKmsAlias) TerraformId() string {
 func (r *AwsKmsAlias) TerraformType() string {
 	return AwsKmsAliasResourceType
 }
+
+func (r *AwsKmsAlias) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_kms_key.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsKmsKeyResourceType = "aws_kms_key"
 
 type AwsKmsKey struct {
@@ -15,6 +17,7 @@ type AwsKmsKey struct {
 	KeyUsage              *string           `cty:"key_usage"`
 	Policy                *string           `cty:"policy" jsonstring:"true" computed:"true"`
 	Tags                  map[string]string `cty:"tags"`
+	CtyVal                *cty.Value        `diff:"-"`
 }
 
 func (r *AwsKmsKey) TerraformId() string {
@@ -24,3 +27,7 @@ func (r *AwsKmsKey) TerraformId() string {
 func (r *AwsKmsKey) TerraformType() string {
 	return AwsKmsKeyResourceType
 }
+
+func (r *AwsKmsKey) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_lambda_event_source_mapping.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsLambdaEventSourceMappingResourceType = "aws_lambda_event_source_mapping"
 
 type AwsLambdaEventSourceMapping struct {
@@ -27,6 +29,7 @@ type AwsLambdaEventSourceMapping struct {
 			DestinationArn *string `cty:"destination_arn"`
 		} `cty:"on_failure"`
 	} `cty:"destination_config"`
+	CtyVal *cty.Value `diff:"-"`
 }
 
 func (r *AwsLambdaEventSourceMapping) TerraformId() string {
@@ -36,3 +39,7 @@ func (r *AwsLambdaEventSourceMapping) TerraformId() string {
 func (r *AwsLambdaEventSourceMapping) TerraformType() string {
 	return AwsLambdaEventSourceMappingResourceType
 }
+
+func (r *AwsLambdaEventSourceMapping) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_lambda_function.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsLambdaFunctionResourceType = "aws_lambda_function"
 
 type AwsLambdaFunction struct {
@@ -59,6 +61,7 @@ type AwsLambdaFunction struct {
 		SubnetIds        []string `cty:"subnet_ids"`
 		VpcId            *string  `cty:"vpc_id" computed:"true"`
 	} `cty:"vpc_config"`
+	CtyVal *cty.Value `diff:"-"`
 }
 
 func (r *AwsLambdaFunction) TerraformId() string {
@@ -68,3 +71,7 @@ func (r *AwsLambdaFunction) TerraformId() string {
 func (r *AwsLambdaFunction) TerraformType() string {
 	return AwsLambdaFunctionResourceType
 }
+
+func (r *AwsLambdaFunction) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_nat_gateway.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsNatGatewayResourceType = "aws_nat_gateway"
 
 type AwsNatGateway struct {
@@ -11,6 +13,7 @@ type AwsNatGateway struct {
 	PublicIp           *string           `cty:"public_ip" computed:"true"`
 	SubnetId           *string           `cty:"subnet_id"`
 	Tags               map[string]string `cty:"tags"`
+	CtyVal             *cty.Value        `diff:"-"`
 }
 
 func (r *AwsNatGateway) TerraformId() string {
@@ -20,3 +23,7 @@ func (r *AwsNatGateway) TerraformId() string {
 func (r *AwsNatGateway) TerraformType() string {
 	return AwsNatGatewayResourceType
 }
+
+func (r *AwsNatGateway) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_route.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsRouteResourceType = "aws_route"
 
 type AwsRoute struct {
@@ -25,6 +27,7 @@ type AwsRoute struct {
 		Create *string `cty:"create"`
 		Delete *string `cty:"delete"`
 	} `cty:"timeouts" diff:"-"`
+	CtyVal *cty.Value `diff:"-"`
 }
 
 func (r *AwsRoute) TerraformId() string {
@@ -34,3 +37,7 @@ func (r *AwsRoute) TerraformId() string {
 func (r *AwsRoute) TerraformType() string {
 	return AwsRouteResourceType
 }
+
+func (r *AwsRoute) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_route53_health_check.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsRoute53HealthCheckResourceType = "aws_route53_health_check"
 
 type AwsRoute53HealthCheck struct {
@@ -25,6 +27,7 @@ type AwsRoute53HealthCheck struct {
 	SearchString                 *string           `cty:"search_string"`
 	Tags                         map[string]string `cty:"tags"`
 	Type                         *string           `cty:"type"`
+	CtyVal                       *cty.Value        `diff:"-"`
 }
 
 func (r *AwsRoute53HealthCheck) TerraformId() string {
@@ -34,3 +37,7 @@ func (r *AwsRoute53HealthCheck) TerraformId() string {
 func (r *AwsRoute53HealthCheck) TerraformType() string {
 	return AwsRoute53HealthCheckResourceType
 }
+
+func (r *AwsRoute53HealthCheck) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_route53_record.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsRoute53RecordResourceType = "aws_route53_record"
 
 type AwsRoute53Record struct {
@@ -34,6 +36,7 @@ type AwsRoute53Record struct {
 	WeightedRoutingPolicy *[]struct {
 		Weight *int `cty:"weight"`
 	} `cty:"weighted_routing_policy"`
+	CtyVal *cty.Value `diff:"-"`
 }
 
 func (r *AwsRoute53Record) TerraformId() string {
@@ -43,3 +46,7 @@ func (r *AwsRoute53Record) TerraformId() string {
 func (r *AwsRoute53Record) TerraformType() string {
 	return AwsRoute53RecordResourceType
 }
+
+func (r *AwsRoute53Record) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_route53_zone.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsRoute53ZoneResourceType = "aws_route53_zone"
 
 type AwsRoute53Zone struct {
@@ -16,6 +18,7 @@ type AwsRoute53Zone struct {
 		VpcId     *string `cty:"vpc_id"`
 		VpcRegion *string `cty:"vpc_region" computed:"true"`
 	} `cty:"vpc"`
+	CtyVal *cty.Value `diff:"-"`
 }
 
 func (r *AwsRoute53Zone) TerraformId() string {
@@ -25,3 +28,7 @@ func (r *AwsRoute53Zone) TerraformId() string {
 func (r *AwsRoute53Zone) TerraformType() string {
 	return AwsRoute53ZoneResourceType
 }
+
+func (r *AwsRoute53Zone) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_route_table.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsRouteTableResourceType = "aws_route_table"
 
 type AwsRouteTable struct {
@@ -20,8 +22,9 @@ type AwsRouteTable struct {
 		VpcEndpointId          *string `cty:"vpc_endpoint_id"`
 		VpcPeeringConnectionId *string `cty:"vpc_peering_connection_id"`
 	} `cty:"route" computed:"true" diff:"-"`
-	Tags  map[string]string `cty:"tags"`
+	Tags   map[string]string `cty:"tags"`
-	VpcId *string           `cty:"vpc_id"`
+	VpcId  *string           `cty:"vpc_id"`
+	CtyVal *cty.Value        `diff:"-"`
 }
 
 func (r *AwsRouteTable) TerraformId() string {
@@ -31,3 +34,7 @@ func (r *AwsRouteTable) TerraformId() string {
 func (r *AwsRouteTable) TerraformType() string {
 	return AwsRouteTableResourceType
 }
+
+func (r *AwsRouteTable) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_route_table_association.go

@@ -1,13 +1,16 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsRouteTableAssociationResourceType = "aws_route_table_association"
 
 type AwsRouteTableAssociation struct {
-	GatewayId    *string `cty:"gateway_id"`
+	GatewayId    *string    `cty:"gateway_id"`
-	Id           string  `cty:"id" computed:"true"`
+	Id           string     `cty:"id" computed:"true"`
-	RouteTableId *string `cty:"route_table_id"`
+	RouteTableId *string    `cty:"route_table_id"`
-	SubnetId     *string `cty:"subnet_id"`
+	SubnetId     *string    `cty:"subnet_id"`
+	CtyVal       *cty.Value `diff:"-"`
 }
 
 func (r *AwsRouteTableAssociation) TerraformId() string {
@@ -17,3 +20,7 @@ func (r *AwsRouteTableAssociation) TerraformId() string {
 func (r *AwsRouteTableAssociation) TerraformType() string {
 	return AwsRouteTableAssociationResourceType
 }
+
+func (r *AwsRouteTableAssociation) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_s3_bucket.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsS3BucketResourceType = "aws_s3_bucket"
 
 type AwsS3Bucket struct {
@@ -116,6 +118,7 @@ type AwsS3Bucket struct {
 		RedirectAllRequestsTo *string `cty:"redirect_all_requests_to"`
 		RoutingRules          *string `cty:"routing_rules"`
 	} `cty:"website"`
+	CtyVal *cty.Value `diff:"-"`
 }
 
 func (r *AwsS3Bucket) TerraformId() string {
@@ -125,3 +128,7 @@ func (r *AwsS3Bucket) TerraformId() string {
 func (r *AwsS3Bucket) TerraformType() string {
 	return AwsS3BucketResourceType
 }
+
+func (r *AwsS3Bucket) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_s3_bucket_analytics_configuration.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsS3BucketAnalyticsConfigurationResourceType = "aws_s3_bucket_analytics_configuration"
 
 type AwsS3BucketAnalyticsConfiguration struct {
@@ -24,6 +26,7 @@ type AwsS3BucketAnalyticsConfiguration struct {
 			} `cty:"destination"`
 		} `cty:"data_export"`
 	} `cty:"storage_class_analysis"`
+	CtyVal *cty.Value `diff:"-"`
 }
 
 func (r *AwsS3BucketAnalyticsConfiguration) TerraformId() string {
@@ -33,3 +36,7 @@ func (r *AwsS3BucketAnalyticsConfiguration) TerraformId() string {
 func (r *AwsS3BucketAnalyticsConfiguration) TerraformType() string {
 	return AwsS3BucketAnalyticsConfigurationResourceType
 }
+
+func (r *AwsS3BucketAnalyticsConfiguration) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_s3_bucket_inventory.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsS3BucketInventoryResourceType = "aws_s3_bucket_inventory"
 
 type AwsS3BucketInventory struct {
@@ -31,6 +33,7 @@ type AwsS3BucketInventory struct {
 	Schedule *[]struct {
 		Frequency *string `cty:"frequency"`
 	} `cty:"schedule"`
+	CtyVal *cty.Value `diff:"-"`
 }
 
 func (r *AwsS3BucketInventory) TerraformId() string {
@@ -40,3 +43,7 @@ func (r *AwsS3BucketInventory) TerraformId() string {
 func (r *AwsS3BucketInventory) TerraformType() string {
 	return AwsS3BucketInventoryResourceType
 }
+
+func (r *AwsS3BucketInventory) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_s3_bucket_metric.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsS3BucketMetricResourceType = "aws_s3_bucket_metric"
 
 type AwsS3BucketMetric struct {
@@ -11,6 +13,7 @@ type AwsS3BucketMetric struct {
 		Prefix *string           `cty:"prefix"`
 		Tags   map[string]string `cty:"tags"`
 	} `cty:"filter"`
+	CtyVal *cty.Value `diff:"-"`
 }
 
 func (r *AwsS3BucketMetric) TerraformId() string {
@@ -20,3 +23,7 @@ func (r *AwsS3BucketMetric) TerraformId() string {
 func (r *AwsS3BucketMetric) TerraformType() string {
 	return AwsS3BucketMetricResourceType
 }
+
+func (r *AwsS3BucketMetric) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_s3_bucket_notification.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsS3BucketNotificationResourceType = "aws_s3_bucket_notification"
 
 type AwsS3BucketNotification struct {
@@ -27,6 +29,7 @@ type AwsS3BucketNotification struct {
 		Id           string   `cty:"id" computed:"true"`
 		TopicArn     *string  `cty:"topic_arn"`
 	} `cty:"topic"`
+	CtyVal *cty.Value `diff:"-"`
 }
 
 func (r *AwsS3BucketNotification) TerraformId() string {
@@ -36,3 +39,7 @@ func (r *AwsS3BucketNotification) TerraformId() string {
 func (r *AwsS3BucketNotification) TerraformType() string {
 	return AwsS3BucketNotificationResourceType
 }
+
+func (r *AwsS3BucketNotification) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_s3_bucket_policy.go

@@ -1,12 +1,15 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsS3BucketPolicyResourceType = "aws_s3_bucket_policy"
 
 type AwsS3BucketPolicy struct {
-	Bucket *string `cty:"bucket" diff:"-"`
+	Bucket *string    `cty:"bucket" diff:"-"`
-	Id     string  `cty:"id" diff:"-" computed:"true"`
+	Id     string     `cty:"id" diff:"-" computed:"true"`
-	Policy *string `cty:"policy" jsonstring:"true"`
+	Policy *string    `cty:"policy" jsonstring:"true"`
+	CtyVal *cty.Value `diff:"-"`
 }
 
 func (r *AwsS3BucketPolicy) TerraformId() string {
@@ -16,3 +19,7 @@ func (r *AwsS3BucketPolicy) TerraformId() string {
 func (r *AwsS3BucketPolicy) TerraformType() string {
 	return AwsS3BucketPolicyResourceType
 }
+
+func (r *AwsS3BucketPolicy) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_security_group.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsSecurityGroupResourceType = "aws_security_group"
 
 type AwsSecurityGroup struct {
@@ -39,6 +41,7 @@ type AwsSecurityGroup struct {
 		Create *string `cty:"create"`
 		Delete *string `cty:"delete"`
 	} `cty:"timeouts" diff:"-"`
+	CtyVal *cty.Value `diff:"-"`
 }
 
 func (r *AwsSecurityGroup) TerraformId() string {
@@ -48,3 +51,7 @@ func (r *AwsSecurityGroup) TerraformId() string {
 func (r *AwsSecurityGroup) TerraformType() string {
 	return AwsSecurityGroupResourceType
 }
+
+func (r *AwsSecurityGroup) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_security_group_rule.go

@@ -1,21 +1,24 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsSecurityGroupRuleResourceType = "aws_security_group_rule"
 
 type AwsSecurityGroupRule struct {
-	CidrBlocks            *[]string `cty:"cidr_blocks"`
+	CidrBlocks            *[]string  `cty:"cidr_blocks"`
-	Description           *string   `cty:"description"`
+	Description           *string    `cty:"description"`
-	FromPort              *int      `cty:"from_port"`
+	FromPort              *int       `cty:"from_port"`
-	Id                    string    `cty:"id" computed:"true"`
+	Id                    string     `cty:"id" computed:"true"`
-	Ipv6CidrBlocks        *[]string `cty:"ipv6_cidr_blocks"`
+	Ipv6CidrBlocks        *[]string  `cty:"ipv6_cidr_blocks"`
-	PrefixListIds         *[]string `cty:"prefix_list_ids"`
+	PrefixListIds         *[]string  `cty:"prefix_list_ids"`
-	Protocol              *string   `cty:"protocol"`
+	Protocol              *string    `cty:"protocol"`
-	SecurityGroupId       *string   `cty:"security_group_id"`
+	SecurityGroupId       *string    `cty:"security_group_id"`
-	Self                  *bool     `cty:"self" diff:"-"`
+	Self                  *bool      `cty:"self" diff:"-"`
-	SourceSecurityGroupId *string   `cty:"source_security_group_id" computed:"true"`
+	SourceSecurityGroupId *string    `cty:"source_security_group_id" computed:"true"`
-	ToPort                *int      `cty:"to_port"`
+	ToPort                *int       `cty:"to_port"`
-	Type                  *string   `cty:"type"`
+	Type                  *string    `cty:"type"`
+	CtyVal                *cty.Value `diff:"-"`
 }
 
 func (r *AwsSecurityGroupRule) TerraformId() string {
@@ -25,3 +28,7 @@ func (r *AwsSecurityGroupRule) TerraformId() string {
 func (r *AwsSecurityGroupRule) TerraformType() string {
 	return AwsSecurityGroupRuleResourceType
 }
+
+func (r *AwsSecurityGroupRule) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_sns_topic.go

@@ -1,6 +1,8 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsSnsTopicResourceType = "aws_sns_topic"
 
 type AwsSnsTopic struct {
@@ -25,6 +27,7 @@ type AwsSnsTopic struct {
 	SqsSuccessFeedbackRoleArn            *string           `cty:"sqs_success_feedback_role_arn"`
 	SqsSuccessFeedbackSampleRate         *int              `cty:"sqs_success_feedback_sample_rate"`
 	Tags                                 map[string]string `cty:"tags"`
+	CtyVal                               *cty.Value        `diff:"-"`
 }
 
 func (r *AwsSnsTopic) TerraformId() string {
@@ -34,3 +37,7 @@ func (r *AwsSnsTopic) TerraformId() string {
 func (r *AwsSnsTopic) TerraformType() string {
 	return AwsSnsTopicResourceType
 }
+
+func (r *AwsSnsTopic) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_sns_topic_policy.go

@@ -1,12 +1,15 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsSnsTopicPolicyResourceType = "aws_sns_topic_policy"
 
 type AwsSnsTopicPolicy struct {
-	Arn    *string `cty:"arn"`
+	Arn    *string    `cty:"arn"`
-	Id     string  `cty:"id" computed:"true"`
+	Id     string     `cty:"id" computed:"true"`
-	Policy *string `cty:"policy" jsonstring:"true"`
+	Policy *string    `cty:"policy" jsonstring:"true"`
+	CtyVal *cty.Value `diff:"-"`
 }
 
 func (r *AwsSnsTopicPolicy) TerraformId() string {
@@ -16,3 +19,7 @@ func (r *AwsSnsTopicPolicy) TerraformId() string {
 func (r *AwsSnsTopicPolicy) TerraformType() string {
 	return AwsSnsTopicPolicyResourceType
 }
+
+func (r *AwsSnsTopicPolicy) CtyValue() *cty.Value {
+	return r.CtyVal
+}

pkg/resource/aws/aws_sns_topic_subscription.go

@@ -1,19 +1,22 @@
 // GENERATED, DO NOT EDIT THIS FILE
 package aws
 
+import "github.com/zclconf/go-cty/cty"
+
 const AwsSnsTopicSubscriptionResourceType = "aws_sns_topic_subscription"
 
 type AwsSnsTopicSubscription struct {
-	Arn                          *string `cty:"arn" computed:"true"`
+	Arn                          *string    `cty:"arn" computed:"true"`
-	ConfirmationTimeoutInMinutes *int    `cty:"confirmation_timeout_in_minutes"`
+	ConfirmationTimeoutInMinutes *int       `cty:"confirmation_timeout_in_minutes"`
-	DeliveryPolicy               *string `cty:"delivery_policy" jsonstring:"true"`
+	DeliveryPolicy               *string    `cty:"delivery_policy" jsonstring:"true"`
-	Endpoint                     *string `cty:"endpoint"`
+	Endpoint                     *string    `cty:"endpoint"`
-	EndpointAutoConfirms         *bool   `cty:"endpoint_auto_confirms"`
+	EndpointAutoConfirms         *bool      `cty:"endpoint_auto_confirms"`
-	FilterPolicy                 *string `cty:"filter_policy" jsonstring:"true"`
+	FilterPolicy                 *string    `cty:"filter_policy" jsonstring:"true"`
-	Id                           string  `cty:"id" computed:"true"`
+	Id                           string     `cty:"id" computed:"true"`
-	Protocol                     *string `cty:"protocol"`
+	Protocol                     *string    `cty:"protocol"`
-	RawMessageDelivery           *bool   `cty:"raw_message_delivery"`
+	RawMessageDelivery           *bool      `cty:"raw_message_delivery"`
-	TopicArn                     *string `cty:"topic_arn"`
+	TopicArn                     *string    `cty:"topic_arn"`
+	CtyVal                       *cty.Value `diff:"-"`
 }
 
 func (r *AwsSnsTopicSubscription) TerraformId() string {
@@ -23,3 +26,7 @@ func (r *AwsSnsTopicSubscription) TerraformId() string {
 func (r *AwsSnsTopicSubscription) TerraformType() string {
 	return AwsSnsTopicSubscriptionResourceType
 }
+
+func (r *AwsSnsTopicSubscription) CtyValue() *cty.Value {
+	return r.CtyVal
+}