Complete Plugin Framework migration - clean up and replace old SDK v2 files

Co-authored-by: scott-the-programmer <[email protected]>

Author: Copilot

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/hashicorp/terraform-plugin-docs v0.21.0
 	github.com/hashicorp/terraform-plugin-framework v1.15.0
 	github.com/hashicorp/terraform-plugin-log v0.9.0
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0 // Keep for existing utilities and tests
 	github.com/spf13/viper v1.20.1
 	github.com/stretchr/testify v1.10.0
 	k8s.io/klog/v2 v2.130.1

main.go

@@ -35,7 +35,7 @@ func main() {
 		Debug:   debug,
 	}
 
-	err := providerserver.Serve(context.Background(), minikube.NewFrameworkProvider(version), opts)
+	err := providerserver.Serve(context.Background(), minikube.NewProvider(version), opts)
 
 	if err != nil {
 		log.Fatal(err.Error())

minikube/provider.go

@@ -4,46 +4,96 @@ import (
 	"context"
 	"sync"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-framework/datasource"
+	"github.com/hashicorp/terraform-plugin-framework/provider"
+	"github.com/hashicorp/terraform-plugin-framework/provider/schema"
+	"github.com/hashicorp/terraform-plugin-framework/resource"
+	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/scott-the-programmer/terraform-provider-minikube/minikube/lib"
 )
 
-func init() {
-	schema.DescriptionKind = schema.StringMarkdown
+// Ensure provider defined types fully satisfy framework interfaces.
+var _ provider.Provider = &MinikubeProvider{}
+
+// MinikubeProvider defines the provider implementation.
+type MinikubeProvider struct {
+	// version is set to the provider version on release, "dev" when the
+	// provider is built and ran locally, and "test" when running acceptance
+	// testing.
+	version string
 }
 
-func Provider() *schema.Provider {
-	return NewProvider(providerConfigure)
+// MinikubeProviderModel describes the provider data model.
+type MinikubeProviderModel struct {
+	KubernetesVersion types.String `tfsdk:"kubernetes_version"`
 }
 
-func NewProvider(providerConfigure schema.ConfigureContextFunc) *schema.Provider {
-	return &schema.Provider{
-		ResourcesMap: map[string]*schema.Resource{
-			"minikube_cluster": ResourceCluster(),
-		},
-		DataSourcesMap:       map[string]*schema.Resource{},
-		ConfigureContextFunc: providerConfigure,
-		Schema: map[string]*schema.Schema{
-			"kubernetes_version": {
-				Type:        schema.TypeString,
-				Optional:    true,
-				Description: "The Kubernetes version that the minikube VM will use. Defaults to 'v1.30.0'.",
-				Default:     "v1.30.0",
+func (p *MinikubeProvider) Metadata(ctx context.Context, req provider.MetadataRequest, resp *provider.MetadataResponse) {
+	resp.TypeName = "minikube"
+	resp.Version = p.version
+}
+
+func (p *MinikubeProvider) Schema(ctx context.Context, req provider.SchemaRequest, resp *provider.SchemaResponse) {
+	resp.Schema = schema.Schema{
+		MarkdownDescription: "Minikube provider for Terraform",
+		Attributes: map[string]schema.Attribute{
+			"kubernetes_version": schema.StringAttribute{
+				MarkdownDescription: "The Kubernetes version that the minikube VM will use. Defaults to 'v1.30.0'.",
+				Optional:            true,
 			},
 		},
 	}
 }
 
-func providerConfigure(ctx context.Context, d *schema.ResourceData) (interface{}, diag.Diagnostics) {
-	var diags diag.Diagnostics
+func (p *MinikubeProvider) Configure(ctx context.Context, req provider.ConfigureRequest, resp *provider.ConfigureResponse) {
+	var data MinikubeProviderModel
+
+	resp.Diagnostics.Append(req.Config.Get(ctx, &data)...)
 
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	// Set default kubernetes version if not provided
+	k8sVersion := "v1.30.0"
+	if !data.KubernetesVersion.IsNull() {
+		k8sVersion = data.KubernetesVersion.ValueString()
+	}
+
+	// Create the client factory function
 	mutex := &sync.Mutex{}
-	k8sVersion := d.Get("kubernetes_version").(string)
 	minikubeClientFactory := func() (lib.ClusterClient, error) {
 		return &lib.MinikubeClient{
 			TfCreationLock: mutex,
-			K8sVersion:     k8sVersion}, nil
+			K8sVersion:     k8sVersion,
+		}, nil
+	}
+
+	resp.DataSourceData = minikubeClientFactory
+	resp.ResourceData = minikubeClientFactory
+}
+
+func (p *MinikubeProvider) Resources(ctx context.Context) []func() resource.Resource {
+	return []func() resource.Resource{
+		NewClusterResource,
+	}
+}
+
+func (p *MinikubeProvider) DataSources(ctx context.Context) []func() datasource.DataSource {
+	return []func() datasource.DataSource{
+		// Define data sources here
 	}
-	return minikubeClientFactory, diags
 }
+
+func NewProvider(version string) func() provider.Provider {
+	return func() provider.Provider {
+		return &MinikubeProvider{
+			version: version,
+		}
+	}
+}
+
+// For backward compatibility with the old SDK name
+func Provider() func() provider.Provider {
+	return NewProvider("dev")
+}