diff --git a/VERSION b/VERSION index 96506fd..e314328 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.0.2 +v3.0.3 diff --git a/field.go b/field.go index e0c2182..875fb4a 100644 --- a/field.go +++ b/field.go @@ -415,7 +415,8 @@ func (f *Field) setTerraformTypeOverride(c *FieldBuildContext) { f.ElemType = f.Type f.ElemValueType = f.ValueType - f.ValueCastFromType = f.ValueCastToType + f.GoType = f.ValueCastFromType + f.GoElemType = f.ValueCastFromType } } diff --git a/test/config.yaml b/test/config.yaml index 7ed39a7..979bd42 100644 --- a/test/config.yaml +++ b/test/config.yaml @@ -51,3 +51,10 @@ validators: custom_types: "Test.StringOverride": StringCustom + +schema_types: + "Test.SchemaOverride": + type: "github.com/hashicorp/terraform-plugin-framework/types.StringType" + value_type: "github.com/hashicorp/terraform-plugin-framework/types.String" + cast_to_type: "string" + cast_from_type: "OverrideCastType" diff --git a/test/custom_types.go b/test/custom_types.go index 90d07ae..f76da22 100644 --- a/test/custom_types.go +++ b/test/custom_types.go @@ -143,3 +143,5 @@ func CopyToStringCustom(diags diag.Diagnostics, obj string, t attr.Type, v attr. return value } + +type OverrideCastType string diff --git a/test/fixtures.go b/test/fixtures.go index 977f0c8..5069e86 100644 --- a/test/fixtures.go +++ b/test/fixtures.go @@ -99,6 +99,8 @@ func createTestObj() *Test { EmbeddedNestedString: "embdtest2", }, }, + + SchemaOverride: "hello", } } @@ -428,8 +430,9 @@ func copyFromTerraformObject(t *testing.T) types.Object { types.String{Value: "b"}, types.String{Value: "c"}, }}, - "foo": types.String{Null: true}, - "bar": types.String{Value: "ham"}, + "foo": types.String{Null: true}, + "bar": types.String{Value: "ham"}, + "schema_override": types.String{Value: "hello"}, }, AttrTypes: obj.AttrTypes, } diff --git a/test/test.pb.go b/test/test.pb.go index fa7f1aa..2ea7a97 100644 --- a/test/test.pb.go +++ b/test/test.pb.go @@ -141,6 +141,7 @@ type Test struct { // *Test_Foo // *Test_Bar LowerSnakeOneof isTest_LowerSnakeOneof `protobuf_oneof:"lower_snake_oneof"` + SchemaOverride OverrideCastType `protobuf:"bytes,43,opt,name=SchemaOverride,proto3,casttype=OverrideCastType" json:"schema_override"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -579,80 +580,83 @@ func init() { func init() { proto.RegisterFile("test.proto", fileDescriptor_c161fcfdc0c3ff1e) } var fileDescriptor_c161fcfdc0c3ff1e = []byte{ - // 1198 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x4b, 0x73, 0x13, 0x47, - 0x17, 0x75, 0x6b, 0x64, 0x5b, 0xbe, 0x96, 0x65, 0xf9, 0x5a, 0xb6, 0x1b, 0xf1, 0xa1, 0x19, 0xf4, - 0xf1, 0x18, 0xa8, 0x8a, 0x08, 0x32, 0x45, 0xa5, 0xc8, 0xab, 0x32, 0xc1, 0x0e, 0x81, 0x48, 0x4a, - 0x1a, 0x08, 0x4b, 0xd7, 0x08, 0xb5, 0x85, 0x40, 0xd2, 0xa8, 0x66, 0x46, 0x04, 0xff, 0x88, 0x54, - 0x65, 0x99, 0xfc, 0x23, 0x96, 0x2c, 0x53, 0x59, 0x28, 0x15, 0x96, 0xfe, 0x09, 0x59, 0xa5, 0xba, - 0x5b, 0xf3, 0xd4, 0x98, 0x04, 0x76, 0x7d, 0xcf, 0x3d, 0xe7, 0x4c, 0xdf, 0x7e, 0xdc, 0x69, 0x00, - 0x9f, 0x7b, 0x7e, 0x63, 0xe2, 0x3a, 0xbe, 0x83, 0x79, 0x31, 0xae, 0x56, 0xfa, 0x4e, 0xdf, 0x91, - 0xc0, 0x0d, 0x31, 0x52, 0xb9, 0xaa, 0xde, 0x77, 0x9c, 0xfe, 0x90, 0xdf, 0x90, 0x51, 0x77, 0x7a, - 0x7c, 0xc3, 0x1f, 0x8c, 0xb8, 0xe7, 0xdb, 0xa3, 0x89, 0x22, 0xd4, 0x7f, 0x46, 0xc8, 0x3f, 0xe2, - 0x9e, 0x8f, 0x55, 0xd0, 0x1e, 0xfa, 0x2e, 0x25, 0x06, 0x31, 0xd7, 0xac, 0xc2, 0xe9, 0x4c, 0xcf, - 0x7b, 0xbe, 0x7b, 0x93, 0x09, 0x10, 0x2b, 0xb0, 0xfc, 0xed, 0xd8, 0xdf, 0x6f, 0xd2, 0x9c, 0x41, - 0xcc, 0x65, 0xa6, 0x82, 0x39, 0x7a, 0xfb, 0x16, 0xd5, 0x0c, 0x62, 0x6a, 0x4c, 0x05, 0x02, 0x3d, - 0x1c, 0x3a, 0xb6, 0x4f, 0xf3, 0x06, 0x31, 0x73, 0x4c, 0x05, 0xb8, 0x0b, 0x2b, 0x77, 0x9d, 0x69, - 0x77, 0xc8, 0xe9, 0xb2, 0x41, 0x4c, 0xc2, 0xe6, 0x11, 0x22, 0xe4, 0x2d, 0xc7, 0x19, 0xd2, 0x15, - 0x83, 0x98, 0x05, 0x26, 0xc7, 0xc2, 0xa1, 0x7b, 0xe2, 0x73, 0x8f, 0xae, 0x1a, 0xc4, 0x2c, 0x32, - 0x15, 0xa0, 0x05, 0x6b, 0x8f, 0x82, 0xb9, 0xd3, 0x82, 0x41, 0xcc, 0xf5, 0x66, 0xb5, 0xa1, 0xaa, - 0x6b, 0x04, 0xd5, 0x35, 0x42, 0x86, 0x55, 0x78, 0x3d, 0xd3, 0x97, 0x7e, 0xf9, 0x53, 0x27, 0x2c, - 0x92, 0xe1, 0xf7, 0x50, 0x0e, 0x83, 0xd6, 0xc0, 0xf3, 0x06, 0xe3, 0x3e, 0x5d, 0x7b, 0x0f, 0xab, - 0x05, 0x35, 0x32, 0xd8, 0x0a, 0xb1, 0xf6, 0x74, 0x38, 0xb4, 0x45, 0x89, 0xf0, 0x9f, 0x2c, 0x89, - 0xb4, 0x5c, 0x94, 0xe3, 0x73, 0xb8, 0xb0, 0x00, 0x3e, 0x19, 0xf8, 0xcf, 0xda, 0x83, 0xe1, 0x8f, - 0xf6, 0x70, 0xca, 0xe9, 0xfa, 0x7b, 0xf8, 0xbf, 0xdb, 0x0a, 0x3f, 0x86, 0xf2, 0xdd, 0xa9, 0x6b, - 0xfb, 0x03, 0x67, 0xfc, 0xd0, 0xb7, 0xc7, 0x3d, 0xdb, 0xed, 0xd1, 0xa2, 0xd8, 0x4e, 0x2b, 0xff, - 0xab, 0xac, 0x38, 0x9d, 0xc5, 0x2f, 0x60, 0x2f, 0x8d, 0x05, 0x4b, 0xb9, 0x11, 0x13, 0x9e, 0x45, - 0xc2, 0x5b, 0x50, 0x0a, 0x52, 0x5f, 0x4f, 0x3d, 0xdf, 0x19, 0xd1, 0x92, 0x94, 0x15, 0xff, 0x9e, - 0xe9, 0x85, 0x20, 0xc3, 0x52, 0x1c, 0xb4, 0x60, 0x27, 0x89, 0x04, 0xdf, 0xdc, 0xcc, 0x10, 0x67, - 0x53, 0xb1, 0x06, 0xf0, 0xd0, 0x77, 0x07, 0xe3, 0xfe, 0x77, 0x03, 0xcf, 0xa7, 0x65, 0x43, 0x33, - 0xd7, 0x58, 0x0c, 0x41, 0x13, 0x36, 0xa3, 0xe8, 0x60, 0x34, 0xf1, 0x4f, 0xe8, 0x96, 0x24, 0xa5, - 0x61, 0xbc, 0x0d, 0x25, 0x71, 0x52, 0x95, 0xbd, 0x74, 0x43, 0x43, 0x33, 0x0b, 0x56, 0xe9, 0x8f, - 0x99, 0x0e, 0x51, 0x86, 0xa5, 0x58, 0xf8, 0x3f, 0x58, 0xb3, 0xc4, 0x61, 0x96, 0x92, 0x6d, 0x43, - 0x33, 0x8b, 0x2c, 0x02, 0xf0, 0x10, 0x36, 0xc2, 0xcd, 0x92, 0x8c, 0x8a, 0xa1, 0xfd, 0xcb, 0x3e, - 0xe7, 0xe5, 0x1e, 0x27, 0x65, 0xf8, 0x19, 0x60, 0x72, 0x01, 0xa4, 0xd9, 0x8e, 0xa1, 0x2d, 0x2c, - 0x54, 0x06, 0x0f, 0xaf, 0xc3, 0x4a, 0x9b, 0x7b, 0x3e, 0xef, 0xd1, 0x5d, 0x79, 0xcc, 0x8a, 0x0d, - 0xd9, 0x6a, 0x14, 0x66, 0xe5, 0xc5, 0x5d, 0x60, 0x73, 0x06, 0xde, 0x81, 0x92, 0x1a, 0x85, 0x47, - 0x7f, 0xef, 0x0c, 0x0d, 0x61, 0x29, 0x26, 0x32, 0xa8, 0x26, 0x91, 0xc4, 0x11, 0xa7, 0x67, 0xfa, - 0xbc, 0x43, 0x85, 0x4d, 0x00, 0x95, 0x95, 0x15, 0x9f, 0x93, 0xcb, 0x97, 0x35, 0xff, 0x18, 0x0b, - 0x2d, 0xc0, 0x28, 0x0a, 0xeb, 0xa8, 0x9e, 0xa1, 0x25, 0x2c, 0x83, 0x8d, 0x97, 0x41, 0x6b, 0xd9, - 0x13, 0x7a, 0x5e, 0x8a, 0xb6, 0x95, 0x48, 0x34, 0xd5, 0x46, 0xcb, 0x9e, 0x1c, 0x8c, 0x7d, 0xf7, - 0x84, 0x89, 0x3c, 0x7e, 0x0e, 0x6b, 0x2d, 0x7b, 0xd2, 0xe9, 0x3e, 0xe7, 0x4f, 0x7d, 0x7a, 0x41, - 0x92, 0xcf, 0x25, 0xc9, 0x2a, 0x27, 0x25, 0xf3, 0xa9, 0x46, 0x0a, 0x7c, 0x0c, 0x5b, 0x61, 0x10, - 0x4e, 0xb4, 0x26, 0x6d, 0x2e, 0x66, 0xd9, 0x04, 0x9c, 0xc8, 0x8e, 0xb0, 0x45, 0x07, 0xac, 0x41, - 0xbe, 0xe5, 0xf4, 0x38, 0xd5, 0x0d, 0x62, 0x96, 0x9a, 0xa0, 0x9c, 0x04, 0xc2, 0x24, 0x8e, 0x55, - 0x28, 0x1c, 0xbc, 0x7a, 0x3a, 0x9c, 0xf6, 0x78, 0x8f, 0x1a, 0xb2, 0x4d, 0x87, 0x31, 0x5e, 0x83, - 0x55, 0xcb, 0xb5, 0xc7, 0x4f, 0x9f, 0xdd, 0xa4, 0x17, 0xe5, 0x8e, 0x6d, 0x28, 0xf9, 0x1c, 0xbc, - 0xb7, 0xc4, 0x82, 0x7c, 0x44, 0x6d, 0xd2, 0xfa, 0x22, 0xb5, 0x19, 0x51, 0x9b, 0x58, 0x0d, 0xa8, - 0xfb, 0xf4, 0xff, 0xe2, 0x77, 0x14, 0xe5, 0xf6, 0xf1, 0x3e, 0xa0, 0xbc, 0x83, 0x2d, 0xee, 0x79, - 0x76, 0x9f, 0x2b, 0x98, 0x5e, 0x92, 0x8e, 0x54, 0x39, 0x2e, 0xe6, 0xef, 0x11, 0x96, 0xa1, 0xc2, - 0x4b, 0x50, 0x54, 0x37, 0x7b, 0xee, 0x72, 0x59, 0x7e, 0x8c, 0xb0, 0x04, 0x8a, 0xdf, 0xc0, 0xc6, - 0xc1, 0xa8, 0xcb, 0x7b, 0x3d, 0xde, 0x3b, 0x1c, 0xf0, 0x61, 0x8f, 0x5e, 0x91, 0x1f, 0xdb, 0x0e, - 0x3e, 0x16, 0x4b, 0x59, 0x45, 0xb1, 0x67, 0x6f, 0x66, 0x3a, 0x39, 0x15, 0x7b, 0x97, 0xd4, 0xe1, - 0xdd, 0xb9, 0x51, 0xb8, 0x77, 0x57, 0xa5, 0x51, 0x65, 0xbe, 0xe2, 0xf6, 0xab, 0xaf, 0xfa, 0x3c, - 0xb8, 0x90, 0x56, 0x21, 0xe5, 0x12, 0x6e, 0xd7, 0x15, 0x28, 0xa9, 0xe9, 0x75, 0x5e, 0x72, 0xd7, - 0x1d, 0xf4, 0x38, 0x35, 0xc5, 0xb4, 0x59, 0x0a, 0x45, 0x04, 0xed, 0xd8, 0x71, 0xe8, 0x35, 0x59, - 0x53, 0x8e, 0x89, 0x40, 0x60, 0x5d, 0xdb, 0xa5, 0xd7, 0x03, 0xac, 0x6b, 0xbb, 0xd5, 0xdb, 0x50, - 0x08, 0x4e, 0x29, 0x96, 0x41, 0x7b, 0xc1, 0x4f, 0xd4, 0x1b, 0x80, 0x89, 0xa1, 0xf8, 0x17, 0xbf, - 0x94, 0x17, 0x32, 0x27, 0x31, 0x15, 0xdc, 0xc9, 0x7d, 0x42, 0xaa, 0xf7, 0xa1, 0x94, 0x3c, 0xb0, - 0x19, 0xea, 0x7a, 0x5c, 0x9d, 0xba, 0x4e, 0x71, 0x2f, 0x06, 0xbb, 0xd9, 0xa7, 0xf6, 0xc3, 0x3d, - 0xad, 0x55, 0x58, 0xee, 0x8c, 0x79, 0xe7, 0xd8, 0xda, 0x83, 0x1d, 0x39, 0x10, 0x9d, 0x22, 0x71, - 0x08, 0xb6, 0x61, 0x6b, 0xe8, 0xfc, 0xc4, 0xdd, 0x23, 0x6f, 0x6c, 0xbf, 0xe0, 0x47, 0xce, 0x98, - 0x3b, 0xc7, 0xf5, 0x2f, 0x45, 0x59, 0xf1, 0x9d, 0xc0, 0x8f, 0x60, 0x59, 0xf5, 0x24, 0x22, 0x7f, - 0x35, 0x7b, 0xa7, 0x33, 0x7d, 0x75, 0x64, 0xbf, 0x3a, 0xb2, 0xfb, 0x3c, 0xd1, 0x4c, 0x15, 0xab, - 0x5e, 0xc9, 0x3a, 0xa0, 0xf5, 0xdf, 0x73, 0x41, 0x5b, 0x15, 0x25, 0x85, 0x0f, 0x2d, 0xf5, 0xbc, - 0xba, 0x99, 0x68, 0x5b, 0x39, 0x79, 0xa3, 0xb7, 0x54, 0x5d, 0x1d, 0xff, 0x19, 0x77, 0xe7, 0xc5, - 0xc5, 0xbb, 0xd6, 0x55, 0xd5, 0x71, 0x34, 0xc9, 0xdd, 0x89, 0xaf, 0x41, 0xaa, 0xe7, 0xfc, 0x00, - 0x9b, 0xd1, 0xd2, 0xaa, 0xbe, 0x9e, 0x8f, 0xb7, 0x8c, 0x48, 0x14, 0xe7, 0xc4, 0x3b, 0x50, 0x5a, - 0xff, 0xc1, 0x27, 0xe6, 0x31, 0x54, 0xb2, 0x3e, 0x93, 0xe1, 0x71, 0x35, 0xb9, 0xc7, 0x19, 0x6b, - 0x11, 0xd9, 0xd6, 0x75, 0x58, 0x8f, 0x65, 0x16, 0x97, 0xb7, 0x7e, 0x3e, 0x6c, 0x52, 0x19, 0x49, - 0x3d, 0x6c, 0x4b, 0xd1, 0x2b, 0x97, 0xc4, 0x5e, 0xb9, 0xf5, 0xdf, 0x48, 0xea, 0xfe, 0xe3, 0xa7, - 0x50, 0x0a, 0x00, 0x75, 0xe7, 0xe6, 0x8f, 0xe6, 0xed, 0xd3, 0x99, 0xbe, 0xc9, 0xe7, 0x99, 0x23, - 0x4f, 0xa6, 0x58, 0x8a, 0x8a, 0x0f, 0x60, 0x3b, 0x40, 0xd4, 0x84, 0x55, 0x4f, 0x51, 0x85, 0x9e, - 0x4b, 0xf6, 0x94, 0x18, 0x81, 0x65, 0xa9, 0xea, 0x3c, 0xd3, 0x0c, 0xdb, 0x50, 0x49, 0xc2, 0x89, - 0x69, 0x56, 0x4f, 0x67, 0xfa, 0x6e, 0x38, 0xcd, 0xb1, 0x24, 0x04, 0xb3, 0xcd, 0xd4, 0x5d, 0xbf, - 0xa4, 0xfe, 0x10, 0xb8, 0x0e, 0xab, 0x8f, 0xdb, 0x0f, 0xda, 0x9d, 0x27, 0xed, 0xf2, 0x12, 0xae, - 0x40, 0xae, 0xd3, 0x2e, 0x13, 0x5c, 0x05, 0xad, 0x73, 0x78, 0x58, 0xce, 0x59, 0xc5, 0xd7, 0x7f, - 0xd5, 0x96, 0x5e, 0xbf, 0xad, 0x2d, 0xbd, 0x79, 0x5b, 0x5b, 0xea, 0xae, 0xc8, 0xd7, 0xca, 0xfe, - 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xaa, 0x28, 0xa6, 0xd1, 0xa9, 0x0c, 0x00, 0x00, + // 1234 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcd, 0x72, 0x13, 0x47, + 0x17, 0x75, 0x6b, 0x64, 0x5b, 0xbe, 0x96, 0x65, 0xf9, 0x5a, 0xb6, 0x1b, 0xf1, 0xe1, 0x19, 0xf4, + 0x01, 0x1e, 0x48, 0xc5, 0x04, 0x99, 0xa2, 0x52, 0xe4, 0xaf, 0x32, 0x60, 0x87, 0x40, 0x2c, 0x25, + 0x6d, 0x08, 0x4b, 0xd7, 0xc8, 0x6a, 0xcb, 0x02, 0x49, 0xa3, 0x9a, 0x19, 0x11, 0xfc, 0x16, 0x59, + 0x26, 0x6f, 0xe4, 0x25, 0xcb, 0x54, 0x16, 0x4a, 0x85, 0xa5, 0x1f, 0x81, 0x55, 0xaa, 0xbb, 0x35, + 0xbf, 0x1a, 0x93, 0xc0, 0xae, 0xef, 0xb9, 0xe7, 0x9c, 0xe9, 0xdb, 0x3f, 0x77, 0x1a, 0xc0, 0xe7, + 0x9e, 0xbf, 0x3d, 0x74, 0x1d, 0xdf, 0xc1, 0xbc, 0x18, 0x57, 0x2b, 0x1d, 0xa7, 0xe3, 0x48, 0xe0, + 0xb6, 0x18, 0xa9, 0x5c, 0x55, 0xef, 0x38, 0x4e, 0xa7, 0xc7, 0x6f, 0xcb, 0xa8, 0x35, 0x3a, 0xbe, + 0xed, 0x77, 0xfb, 0xdc, 0xf3, 0xed, 0xfe, 0x50, 0x11, 0x6a, 0x63, 0x84, 0xfc, 0x53, 0xee, 0xf9, + 0x58, 0x05, 0xed, 0xc0, 0x77, 0x29, 0x31, 0x88, 0xb9, 0x60, 0x15, 0xce, 0xc7, 0x7a, 0xde, 0xf3, + 0xdd, 0x3b, 0x4c, 0x80, 0x58, 0x81, 0xd9, 0xef, 0x07, 0xfe, 0x4e, 0x9d, 0xe6, 0x0c, 0x62, 0xce, + 0x32, 0x15, 0x4c, 0xd0, 0x7b, 0x77, 0xa9, 0x66, 0x10, 0x53, 0x63, 0x2a, 0x10, 0xe8, 0x5e, 0xcf, + 0xb1, 0x7d, 0x9a, 0x37, 0x88, 0x99, 0x63, 0x2a, 0xc0, 0x75, 0x98, 0x7b, 0xe8, 0x8c, 0x5a, 0x3d, + 0x4e, 0x67, 0x0d, 0x62, 0x12, 0x36, 0x89, 0x10, 0x21, 0x6f, 0x39, 0x4e, 0x8f, 0xce, 0x19, 0xc4, + 0x2c, 0x30, 0x39, 0x16, 0x0e, 0xad, 0x53, 0x9f, 0x7b, 0x74, 0xde, 0x20, 0x66, 0x91, 0xa9, 0x00, + 0x2d, 0x58, 0x78, 0x1a, 0xcc, 0x9d, 0x16, 0x0c, 0x62, 0x2e, 0xd6, 0xab, 0xdb, 0xaa, 0xba, 0xed, + 0xa0, 0xba, 0xed, 0x90, 0x61, 0x15, 0xce, 0xc6, 0xfa, 0xcc, 0xaf, 0x7f, 0xe9, 0x84, 0x45, 0x32, + 0xfc, 0x11, 0xca, 0x61, 0xb0, 0xdf, 0xf5, 0xbc, 0xee, 0xa0, 0x43, 0x17, 0x3e, 0xc0, 0x6a, 0x4a, + 0x8d, 0x0c, 0x56, 0x42, 0xac, 0x31, 0xea, 0xf5, 0x6c, 0x51, 0x22, 0xfc, 0x27, 0x4b, 0x22, 0x2d, + 0xa7, 0xe5, 0xf8, 0x02, 0xae, 0x4c, 0x81, 0xcf, 0xbb, 0xfe, 0x49, 0xa3, 0xdb, 0xfb, 0xd9, 0xee, + 0x8d, 0x38, 0x5d, 0xfc, 0x00, 0xff, 0xf7, 0x5b, 0xe1, 0x67, 0x50, 0x7e, 0x38, 0x72, 0x6d, 0xbf, + 0xeb, 0x0c, 0x0e, 0x7c, 0x7b, 0xd0, 0xb6, 0xdd, 0x36, 0x2d, 0x8a, 0xed, 0xb4, 0xf2, 0xbf, 0xc9, + 0x8a, 0xd3, 0x59, 0xfc, 0x1a, 0x36, 0xd2, 0x58, 0xb0, 0x94, 0x4b, 0x31, 0xe1, 0x45, 0x24, 0xbc, + 0x0b, 0xa5, 0x20, 0xf5, 0x60, 0xe4, 0xf9, 0x4e, 0x9f, 0x96, 0xa4, 0xac, 0xf8, 0x6e, 0xac, 0x17, + 0x82, 0x0c, 0x4b, 0x71, 0xd0, 0x82, 0xb5, 0x24, 0x12, 0x7c, 0x73, 0x39, 0x43, 0x9c, 0x4d, 0xc5, + 0x4d, 0x80, 0x03, 0xdf, 0xed, 0x0e, 0x3a, 0x3f, 0x74, 0x3d, 0x9f, 0x96, 0x0d, 0xcd, 0x5c, 0x60, + 0x31, 0x04, 0x4d, 0x58, 0x8e, 0xa2, 0xdd, 0xfe, 0xd0, 0x3f, 0xa5, 0x2b, 0x92, 0x94, 0x86, 0xf1, + 0x1e, 0x94, 0xc4, 0x49, 0x55, 0xf6, 0xd2, 0x0d, 0x0d, 0xcd, 0x2c, 0x58, 0xa5, 0x3f, 0xc7, 0x3a, + 0x44, 0x19, 0x96, 0x62, 0xe1, 0xff, 0x60, 0xc1, 0x12, 0x87, 0x59, 0x4a, 0x56, 0x0d, 0xcd, 0x2c, + 0xb2, 0x08, 0xc0, 0x3d, 0x58, 0x0a, 0x37, 0x4b, 0x32, 0x2a, 0x86, 0xf6, 0x2f, 0xfb, 0x9c, 0x97, + 0x7b, 0x9c, 0x94, 0xe1, 0x97, 0x80, 0xc9, 0x05, 0x90, 0x66, 0x6b, 0x86, 0x36, 0xb5, 0x50, 0x19, + 0x3c, 0xbc, 0x05, 0x73, 0x0d, 0xee, 0xf9, 0xbc, 0x4d, 0xd7, 0xe5, 0x31, 0x2b, 0x6e, 0xcb, 0x56, + 0xa3, 0x30, 0x2b, 0x2f, 0xee, 0x02, 0x9b, 0x30, 0xf0, 0x3e, 0x94, 0xd4, 0x28, 0x3c, 0xfa, 0x1b, + 0x17, 0x68, 0x08, 0x4b, 0x31, 0x91, 0x41, 0x35, 0x89, 0x24, 0x8e, 0x38, 0xbd, 0xd0, 0xe7, 0x3d, + 0x2a, 0xac, 0x03, 0xa8, 0xac, 0xac, 0xf8, 0x92, 0x5c, 0xbe, 0xac, 0xf9, 0xc7, 0x58, 0x68, 0x01, + 0x46, 0x51, 0x58, 0x47, 0xf5, 0x02, 0x2d, 0x61, 0x19, 0x6c, 0xbc, 0x0e, 0xda, 0xbe, 0x3d, 0xa4, + 0x97, 0xa5, 0x68, 0x55, 0x89, 0x44, 0x53, 0xdd, 0xde, 0xb7, 0x87, 0xbb, 0x03, 0xdf, 0x3d, 0x65, + 0x22, 0x8f, 0x5f, 0xc1, 0xc2, 0xbe, 0x3d, 0x6c, 0xb6, 0x5e, 0xf0, 0x23, 0x9f, 0x5e, 0x91, 0xe4, + 0x4b, 0x49, 0xb2, 0xca, 0x49, 0xc9, 0x64, 0xaa, 0x91, 0x02, 0x9f, 0xc1, 0x4a, 0x18, 0x84, 0x13, + 0xdd, 0x94, 0x36, 0x57, 0xb3, 0x6c, 0x02, 0x4e, 0x64, 0x47, 0xd8, 0xb4, 0x03, 0x6e, 0x42, 0x7e, + 0xdf, 0x69, 0x73, 0xaa, 0x1b, 0xc4, 0x2c, 0xd5, 0x41, 0x39, 0x09, 0x84, 0x49, 0x1c, 0xab, 0x50, + 0xd8, 0x7d, 0x7d, 0xd4, 0x1b, 0xb5, 0x79, 0x9b, 0x1a, 0xb2, 0x4d, 0x87, 0x31, 0xde, 0x84, 0x79, + 0xcb, 0xb5, 0x07, 0x47, 0x27, 0x77, 0xe8, 0x55, 0xb9, 0x63, 0x4b, 0x4a, 0x3e, 0x01, 0x1f, 0xcd, + 0xb0, 0x20, 0x1f, 0x51, 0xeb, 0xb4, 0x36, 0x4d, 0xad, 0x47, 0xd4, 0x3a, 0x56, 0x03, 0xea, 0x0e, + 0xfd, 0xbf, 0xf8, 0x1d, 0x45, 0xb9, 0x1d, 0x7c, 0x0c, 0x28, 0xef, 0xe0, 0x3e, 0xf7, 0x3c, 0xbb, + 0xc3, 0x15, 0x4c, 0xaf, 0x49, 0x47, 0xaa, 0x1c, 0xa7, 0xf3, 0x8f, 0x08, 0xcb, 0x50, 0xe1, 0x35, + 0x28, 0xaa, 0x9b, 0x3d, 0x71, 0xb9, 0x2e, 0x3f, 0x46, 0x58, 0x02, 0xc5, 0xef, 0x60, 0x69, 0xb7, + 0xdf, 0xe2, 0xed, 0x36, 0x6f, 0xef, 0x75, 0x79, 0xaf, 0x4d, 0x6f, 0xc8, 0x8f, 0xad, 0x06, 0x1f, + 0x8b, 0xa5, 0xac, 0xa2, 0xd8, 0xb3, 0x37, 0x63, 0x9d, 0x9c, 0x8b, 0xbd, 0x4b, 0xea, 0xf0, 0xe1, + 0xc4, 0x28, 0xdc, 0xbb, 0x2d, 0x69, 0x54, 0x99, 0xac, 0xb8, 0xfd, 0xfa, 0xdb, 0x0e, 0x0f, 0x2e, + 0xa4, 0x55, 0x48, 0xb9, 0x84, 0xdb, 0x75, 0x03, 0x4a, 0x6a, 0x7a, 0xcd, 0x57, 0xdc, 0x75, 0xbb, + 0x6d, 0x4e, 0x4d, 0x31, 0x6d, 0x96, 0x42, 0x11, 0x41, 0x3b, 0x76, 0x1c, 0x7a, 0x53, 0xd6, 0x94, + 0x63, 0x22, 0x10, 0x58, 0xcb, 0x76, 0xe9, 0xad, 0x00, 0x6b, 0xd9, 0x2e, 0x36, 0xa1, 0x74, 0x70, + 0x74, 0xc2, 0xfb, 0x76, 0xe8, 0xf7, 0x89, 0x7c, 0x02, 0x6c, 0x9d, 0x8f, 0xf5, 0x65, 0x4f, 0x66, + 0x0e, 0x9d, 0x49, 0xea, 0xdd, 0x58, 0x2f, 0x07, 0xb4, 0x07, 0xb6, 0xe7, 0x3f, 0x3d, 0x1d, 0x72, + 0x96, 0x92, 0x57, 0xef, 0x41, 0x21, 0x38, 0xf6, 0x58, 0x06, 0xed, 0x25, 0x3f, 0x55, 0x8f, 0x0a, + 0x26, 0x86, 0xe2, 0xe7, 0xfe, 0x4a, 0xde, 0xf0, 0x9c, 0xc4, 0x54, 0x70, 0x3f, 0xf7, 0x39, 0xa9, + 0x3e, 0x86, 0x52, 0xf2, 0x06, 0x64, 0xa8, 0x6b, 0x71, 0x75, 0xea, 0x7e, 0xc6, 0xbd, 0x18, 0xac, + 0x67, 0x5f, 0x83, 0x8f, 0xf7, 0xb4, 0xe6, 0x61, 0xb6, 0x39, 0xe0, 0xcd, 0x63, 0x6b, 0x03, 0xd6, + 0xe4, 0x40, 0xb4, 0x9e, 0xc4, 0xa9, 0x5a, 0x85, 0x95, 0x9e, 0xf3, 0x0b, 0x77, 0x0f, 0xbd, 0x81, + 0xfd, 0x92, 0x1f, 0x3a, 0x03, 0xee, 0x1c, 0xd7, 0xbe, 0x11, 0x65, 0xc5, 0xb7, 0x16, 0x3f, 0x85, + 0x59, 0xd5, 0xe4, 0x88, 0xfc, 0x77, 0x6d, 0x9c, 0x8f, 0xf5, 0xf9, 0xbe, 0xfd, 0xfa, 0xd0, 0xee, + 0xf0, 0x44, 0x77, 0x56, 0xac, 0x5a, 0x25, 0xeb, 0xc4, 0xd7, 0xfe, 0xc8, 0x05, 0x7d, 0x5a, 0x94, + 0x14, 0xbe, 0xdc, 0xd4, 0x7b, 0xed, 0x4e, 0xa2, 0x0f, 0xe6, 0x64, 0x8b, 0x58, 0x51, 0x75, 0x35, + 0xfd, 0x13, 0xee, 0x4e, 0x8a, 0x8b, 0xb7, 0xc1, 0x2d, 0xd5, 0xc2, 0x34, 0xc9, 0x5d, 0x8b, 0xaf, + 0x41, 0xaa, 0x89, 0xfd, 0x04, 0xcb, 0xd1, 0xd2, 0xaa, 0x1f, 0x45, 0x3e, 0xde, 0x83, 0x22, 0x51, + 0x9c, 0x13, 0x6f, 0x69, 0x69, 0xfd, 0x47, 0x9f, 0x98, 0x67, 0x50, 0xc9, 0xfa, 0x4c, 0x86, 0xc7, + 0x56, 0x72, 0x8f, 0x33, 0xd6, 0x22, 0xb2, 0xad, 0xe9, 0xb0, 0x18, 0xcb, 0x4c, 0x2f, 0x6f, 0xed, + 0x72, 0xd8, 0xf5, 0x32, 0x92, 0x7a, 0xd8, 0xe7, 0xa2, 0x67, 0x33, 0x89, 0x3d, 0x9b, 0x6b, 0xbf, + 0x93, 0x54, 0x43, 0xc1, 0x2f, 0xa0, 0x14, 0x00, 0xea, 0x12, 0x4f, 0x5e, 0xe1, 0xab, 0xe2, 0x0a, + 0xf2, 0x49, 0xe6, 0xd0, 0x93, 0x29, 0x96, 0xa2, 0xe2, 0x13, 0x58, 0x0d, 0x10, 0x35, 0x61, 0xd5, + 0xa4, 0x54, 0xa1, 0x97, 0x92, 0x4d, 0x2a, 0x46, 0x60, 0x59, 0xaa, 0x1a, 0xcf, 0x34, 0xc3, 0x06, + 0x54, 0x92, 0x70, 0x62, 0x9a, 0xd5, 0xf3, 0xb1, 0xbe, 0x1e, 0x4e, 0x73, 0x20, 0x09, 0xc1, 0x6c, + 0x33, 0x75, 0xb7, 0xae, 0xa9, 0x5f, 0x0e, 0x2e, 0xc2, 0xfc, 0xb3, 0xc6, 0x93, 0x46, 0xf3, 0x79, + 0xa3, 0x3c, 0x83, 0x73, 0x90, 0x6b, 0x36, 0xca, 0x04, 0xe7, 0x41, 0x6b, 0xee, 0xed, 0x95, 0x73, + 0x56, 0xf1, 0xec, 0xef, 0xcd, 0x99, 0xb3, 0xb7, 0x9b, 0x33, 0x6f, 0xde, 0x6e, 0xce, 0xb4, 0xe6, + 0xe4, 0xf3, 0x67, 0xe7, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x14, 0x22, 0x91, 0xb8, 0xfa, 0x0c, + 0x00, 0x00, } diff --git a/test/test.proto b/test/test.proto index 09202ab..6ea9b2a 100644 --- a/test/test.proto +++ b/test/test.proto @@ -178,6 +178,11 @@ message Test { string foo = 41; string bar = 42; } + + string SchemaOverride = 43 [ + (gogoproto.jsontag) = "schema_override", + (gogoproto.casttype) = "OverrideCastType" + ]; } message MaxAgeDuration { @@ -234,4 +239,4 @@ message EmbeddedField { message EmbeddedNestedField { // EmbeddedNestedString string field string EmbeddedNestedString = 1 [(gogoproto.jsontag) = "embedded_nested_string"]; - } +} diff --git a/test/test_terraform.go b/test/test_terraform.go index b5f04e2..b0ca08f 100644 --- a/test/test_terraform.go +++ b/test/test_terraform.go @@ -423,6 +423,11 @@ func GenSchemaTest(ctx context.Context) (github_com_hashicorp_terraform_plugin_f Description: "NestedNullableWithNilValue nested message field, with no value set", Optional: true, }, + "schema_override": { + Description: "", + Optional: true, + Type: github_com_hashicorp_terraform_plugin_framework_types.StringType, + }, "str": { Computed: true, Description: "Str string field", @@ -2067,6 +2072,23 @@ func CopyTestFromTerraform(_ context.Context, tf github_com_hashicorp_terraform_ } } } + { + a, ok := tf.Attrs["schema_override"] + if !ok { + diags.Append(attrReadMissingDiag{"Test.SchemaOverride"}) + } else { + v, ok := a.(github_com_hashicorp_terraform_plugin_framework_types.String) + if !ok { + diags.Append(attrReadConversionFailureDiag{"Test.SchemaOverride", "github.com/hashicorp/terraform-plugin-framework/types.String"}) + } else { + var t OverrideCastType + if !v.Null && !v.Unknown { + t = OverrideCastType(v.Value) + } + obj.SchemaOverride = t + } + } + } { a, ok := tf.Attrs["str"] if !ok { @@ -4933,6 +4955,28 @@ func CopyTestToTerraform(ctx context.Context, obj *Test, tf *github_com_hashicor } } } + { + t, ok := tf.AttrTypes["schema_override"] + if !ok { + diags.Append(attrWriteMissingDiag{"Test.SchemaOverride"}) + } else { + v, ok := tf.Attrs["schema_override"].(github_com_hashicorp_terraform_plugin_framework_types.String) + if !ok { + i, err := t.ValueFromTerraform(ctx, github_com_hashicorp_terraform_plugin_go_tftypes.NewValue(t.TerraformType(ctx), nil)) + if err != nil { + diags.Append(attrWriteGeneralError{"Test.SchemaOverride", err}) + } + v, ok = i.(github_com_hashicorp_terraform_plugin_framework_types.String) + if !ok { + diags.Append(attrWriteConversionFailureDiag{"Test.SchemaOverride", "github.com/hashicorp/terraform-plugin-framework/types.String"}) + } + v.Null = string(obj.SchemaOverride) == "" + } + v.Value = string(obj.SchemaOverride) + v.Unknown = false + tf.Attrs["schema_override"] = v + } + } { t, ok := tf.AttrTypes["str"] if !ok {