[Feature] Introduced Terraform Plugin Framework

common/customizable_schema_plugin_framework.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/hashicorp/terraform-plugin-framework/provider/schema"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 )
 
 type CustomizableSchemaPluginFramework struct {

common/customizable_schema_plugin_framework_test.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-framework/provider/schema"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
 	"github.com/stretchr/testify/assert"
 )
@@ -46,7 +46,7 @@ func (v stringLengthBetweenValidator) ValidateString(ctx context.Context, req va
 }
 
 func TestCustomizeSchema(t *testing.T) {
-	scm := pluginFrameworkStructToSchema(DummyTfSdk{}, func(c CustomizableSchemaPluginFramework) CustomizableSchemaPluginFramework {
+	scm := PluginFrameworkResourceStructToSchema(DummyTfSdk{}, func(c CustomizableSchemaPluginFramework) CustomizableSchemaPluginFramework {
 		c.AddNewField("new_field", schema.StringAttribute{Required: true})
 		c.AddNewField("new_field", schema.StringAttribute{Required: true}, "nested")
 		c.AddNewField("to_be_removed", schema.StringAttribute{Required: true}, "nested")

common/reflect_resource_plugin_framework.go

@@ -6,7 +6,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/hashicorp/terraform-plugin-framework/provider/schema"
+	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
@@ -297,7 +297,7 @@ func checkTheStringInForceSendFields(fieldName string, forceSendFields []string)
 	return false
 }
 
-func pluginFrameworkTypeToSchema(v reflect.Value) map[string]schema.Attribute {
+func pluginFrameworkResourceTypeToSchema(v reflect.Value) map[string]schema.Attribute {
 	scm := map[string]schema.Attribute{}
 	rk := v.Kind()
 	if rk == reflect.Ptr {
@@ -320,7 +320,7 @@ func pluginFrameworkTypeToSchema(v reflect.Value) map[string]schema.Attribute {
 		if kind == reflect.Ptr {
 			elem := typeField.Type.Elem()
 			sv := reflect.New(elem).Elem()
-			nestedScm := pluginFrameworkTypeToSchema(sv)
+			nestedScm := pluginFrameworkResourceTypeToSchema(sv)
 			scm[fieldName] = schema.SingleNestedAttribute{Attributes: nestedScm, Optional: isOptional, Required: !isOptional}
 		} else if kind == reflect.Slice {
 			elem := typeField.Type.Elem()
@@ -341,7 +341,7 @@ func pluginFrameworkTypeToSchema(v reflect.Value) map[string]schema.Attribute {
 				scm[fieldName] = schema.ListAttribute{ElementType: types.StringType, Optional: isOptional, Required: !isOptional}
 			default:
 				// Nested struct
-				nestedScm := pluginFrameworkTypeToSchema(reflect.New(elem).Elem())
+				nestedScm := pluginFrameworkResourceTypeToSchema(reflect.New(elem).Elem())
 				scm[fieldName] = schema.ListNestedAttribute{NestedObject: schema.NestedAttributeObject{Attributes: nestedScm}, Optional: isOptional, Required: !isOptional}
 			}
 		} else if kind == reflect.Map {
@@ -363,7 +363,7 @@ func pluginFrameworkTypeToSchema(v reflect.Value) map[string]schema.Attribute {
 				scm[fieldName] = schema.MapAttribute{ElementType: types.StringType, Optional: isOptional, Required: !isOptional}
 			default:
 				// Nested struct
-				nestedScm := pluginFrameworkTypeToSchema(reflect.New(elem).Elem())
+				nestedScm := pluginFrameworkResourceTypeToSchema(reflect.New(elem).Elem())
 				scm[fieldName] = schema.MapNestedAttribute{NestedObject: schema.NestedAttributeObject{Attributes: nestedScm}, Optional: isOptional, Required: !isOptional}
 			}
 		} else if kind == reflect.Struct {
@@ -384,7 +384,7 @@ func pluginFrameworkTypeToSchema(v reflect.Value) map[string]schema.Attribute {
 				// If it is a real stuct instead of a tfsdk type, recursively resolve it.
 				elem := typeField.Type
 				sv := reflect.New(elem)
-				nestedScm := pluginFrameworkTypeToSchema(sv)
+				nestedScm := pluginFrameworkResourceTypeToSchema(sv)
 				scm[fieldName] = schema.SingleNestedAttribute{Attributes: nestedScm, Optional: isOptional, Required: !isOptional}
 			}
 		} else if kind == reflect.String {
@@ -402,13 +402,18 @@ func fieldIsOptional(field reflect.StructField) bool {
 	return strings.Contains(tagValue, "optional")
 }
 
-func pluginFrameworkStructToSchema(v any, customizeSchema func(CustomizableSchemaPluginFramework) CustomizableSchemaPluginFramework) schema.Schema {
-	attributes := pluginFrameworkTypeToSchema(reflect.ValueOf(v))
+func PluginFrameworkResourceStructToSchema(v any, customizeSchema func(CustomizableSchemaPluginFramework) CustomizableSchemaPluginFramework) schema.Schema {
+	attributes := PluginFrameworkResourceStructToSchemaMap(v, customizeSchema)
+	return schema.Schema{Attributes: attributes}
+}
+
+func PluginFrameworkResourceStructToSchemaMap(v any, customizeSchema func(CustomizableSchemaPluginFramework) CustomizableSchemaPluginFramework) map[string]schema.Attribute {
+	attributes := pluginFrameworkResourceTypeToSchema(reflect.ValueOf(v))
 
 	if customizeSchema != nil {
 		cs := customizeSchema(*ConstructCustomizableSchema(attributes))
-		return schema.Schema{Attributes: cs.ToAttributeMap()}
+		return cs.ToAttributeMap()
 	} else {
-		return schema.Schema{Attributes: attributes}
+		return attributes
 	}
 }

common/reflect_resource_plugin_framework_test.go

@@ -140,7 +140,7 @@ var tfSdkStruct = DummyTfSdk{
 
 func TestGetAndSetPluginFramework(t *testing.T) {
 	// Also test StructToSchema.
-	scm := pluginFrameworkStructToSchema(DummyTfSdk{}, nil)
+	scm := PluginFrameworkResourceStructToSchema(DummyTfSdk{}, nil)
 	state := tfsdk.State{
 		Schema: scm,
 	}

go.mod

@@ -19,18 +19,20 @@ require (
 	golang.org/x/mod v0.19.0
 )
 
+require golang.org/x/sync v0.7.0 // indirect
+
 require (
-	cloud.google.com/go/auth v0.4.2 // indirect
+	cloud.google.com/go/auth v0.6.1 // indirect
 	cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
-	cloud.google.com/go/compute/metadata v0.3.0 // indirect
-	github.com/ProtonMail/go-crypto v1.1.0-alpha.2 // indirect
+	cloud.google.com/go/compute/metadata v0.4.0 // indirect
+	github.com/ProtonMail/go-crypto v1.1.0-alpha.3-proton // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
-	github.com/cloudflare/circl v1.3.7 // indirect
+	github.com/cloudflare/circl v1.3.9 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/fatih/color v1.16.0 // indirect
+	github.com/fatih/color v1.17.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
@@ -42,12 +44,12 @@ require (
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-hclog v1.5.0 // indirect
+	github.com/hashicorp/go-hclog v1.6.3 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/go-plugin v1.6.0 // indirect
+	github.com/hashicorp/go-plugin v1.6.1 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
-	github.com/hashicorp/go-version v1.6.0 // indirect
-	github.com/hashicorp/hc-install v0.6.4 // indirect
+	github.com/hashicorp/go-version v1.7.0 // indirect
+	github.com/hashicorp/hc-install v0.7.0 // indirect
 	github.com/hashicorp/logutils v1.0.0 // indirect
 	github.com/hashicorp/terraform-exec v0.21.0 // indirect
 	github.com/hashicorp/terraform-json v0.22.1 // indirect
@@ -68,22 +70,22 @@ require (
 	github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
-	go.opentelemetry.io/otel v1.24.0 // indirect
-	go.opentelemetry.io/otel/metric v1.24.0 // indirect
-	go.opentelemetry.io/otel/trace v1.24.0 // indirect
-	golang.org/x/crypto v0.23.0 // indirect
-	golang.org/x/net v0.25.0 // indirect
-	golang.org/x/oauth2 v0.20.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
+	go.opentelemetry.io/otel v1.28.0 // indirect
+	go.opentelemetry.io/otel/metric v1.28.0 // indirect
+	go.opentelemetry.io/otel/trace v1.28.0 // indirect
+	golang.org/x/crypto v0.25.0 // indirect
+	golang.org/x/net v0.27.0 // indirect
+	golang.org/x/oauth2 v0.21.0 // indirect
+	golang.org/x/sys v0.22.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.18.0 // indirect
-	google.golang.org/api v0.182.0 // indirect
+	golang.org/x/tools v0.22.0 // indirect
+	google.golang.org/api v0.187.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240521202816-d264139d666e // indirect
-	google.golang.org/grpc v1.64.0 // indirect
-	google.golang.org/protobuf v1.34.1 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
+	google.golang.org/grpc v1.65.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )