fixes

databricks · Dec 9, 2024 · d10447f · d10447f
1 parent 4feb053
commit d10447f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/internal/providers/pluginfw/converters/converters_test.go b/internal/providers/pluginfw/converters/converters_test.go
@@ -33,6 +33,7 @@ type DummyTfSdk struct {
 	Irrelevant        types.String  `tfsdk:"-"`
 	Object            types.Object  `tfsdk:"object" tf:"optional"`
 	ObjectPtr         types.Object  `tfsdk:"object_ptr" tf:"optional"`
+	Type_		      types.String	`tfsdk:"type" tf:""` // Test Type_ renaming
 }
 
 func (DummyTfSdk) GetComplexFieldTypes(ctx context.Context) map[string]reflect.Type {
@@ -101,6 +102,7 @@ type DummyGoSdk struct {
 	SliceStructPtr    *DummyNestedGoSdk           `json:"slice_struct_ptr"`
 	Object            DummyNestedGoSdk            `json:"object"`
 	ObjectPtr         *DummyNestedGoSdk           `json:"object_ptr"`
+	Type              string					  `json:"type"` // Test Type_ renaming
 	ForceSendFields   []string                    `json:"-"`
 }
 
@@ -354,6 +356,11 @@ var tests = []struct {
 			ForceSendFields: []string{"Name", "Enabled"},
 		}, ForceSendFields: []string{"Object"}},
 	},
+	{
+		"type name",
+		DummyTfSdk{Type_: types.StringValue("abc")},
+		DummyGoSdk{Type: "abc", ForceSendFields: []string{"Type"}},
+	},
 }
 
 func TestConverter(t *testing.T) {

diff --git a/internal/providers/pluginfw/converters/go_to_tf.go b/internal/providers/pluginfw/converters/go_to_tf.go
@@ -82,8 +82,9 @@ func GoSdkToTfSdkStruct(ctx context.Context, gosdk interface{}, tfsdk interface{
 		if srcFieldTag == "-" {
 			continue
 		}
-		destField := destVal.FieldByName(toTfSdkName(srcFieldName))
-		destFieldType, ok := destVal.Type().FieldByName(field.StructField.Name)
+		destFieldStructName := toTfSdkName(srcFieldName)
+		destField := destVal.FieldByName(destFieldStructName)
+		destFieldType, ok := destVal.Type().FieldByName(destFieldStructName)
 		if !ok {
 			d.AddError(goSdkToTfSdkStructConversionFailureMessage, fmt.Sprintf("destination struct does not have field %s. %s", srcFieldName, common.TerraformBugErrorMessage))
 			return

diff --git a/internal/providers/pluginfw/products/cluster/data_cluster.go b/internal/providers/pluginfw/products/cluster/data_cluster.go
@@ -87,6 +87,9 @@ func (d *ClusterDataSource) Read(ctx context.Context, req datasource.ReadRequest
 
 	var tfCluster compute_tf.ClusterDetails
 	resp.Diagnostics.Append(converters.GoSdkToTfSdkStruct(ctx, cluster, &tfCluster)...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
 
 	clusterInfo.ClusterId = tfCluster.ClusterId
 	clusterInfo.Name = tfCluster.ClusterName