Initial migration to Terraform Plugin Framework

cloudamqp/provider.go

@@ -1,42 +1,140 @@
 package cloudamqp
 
 import (
+	"context"
 	"fmt"
 	"log"
 	"net/http"
+	"os"
 
 	"github.com/cloudamqp/terraform-provider-cloudamqp/api"
-	"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"
+	schemaSdk "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 var version string
 var enableFasterInstanceDestroy bool
 
-func Provider(v string, client *http.Client) *schema.Provider {
+type cloudamqpProvider struct {
+	version string
+	client  *http.Client
+}
+
+type cloudamqpProviderModel struct {
+	ApiKey                      types.String `tfsdk:"apikey"`
+	BaseUrl                     types.String `tfsdk:"baseurl"`
+	EnableFasterInstanceDestroy types.Bool   `tfsdk:"enable_faster_instance_destroy"`
+}
+
+func (p *cloudamqpProvider) Metadata(_ context.Context, _ provider.MetadataRequest, response *provider.MetadataResponse) {
+	response.Version = p.version
+	response.TypeName = "cloudamqp"
+}
+
+func (p *cloudamqpProvider) Schema(_ context.Context, _ provider.SchemaRequest, response *provider.SchemaResponse) {
+	response.Schema = schema.Schema{
+		Attributes: map[string]schema.Attribute{
+			"apikey": schema.StringAttribute{
+				Optional:    true,
+				Description: "Key used to authentication to the CloudAMQP Customer API",
+			},
+			"baseurl": schema.StringAttribute{
+				Optional:    true,
+				Description: "Base URL to CloudAMQP Customer website",
+			},
+			"enable_faster_instance_destroy": schema.BoolAttribute{
+				Optional:    true,
+				Description: "Skips destroying backend resources on 'terraform destroy'",
+			},
+		},
+	}
+}
+
+func (p *cloudamqpProvider) Configure(ctx context.Context, request provider.ConfigureRequest, response *provider.ConfigureResponse) {
+	var data cloudamqpProviderModel
+
+	// Read configuration data into model
+	response.Diagnostics.Append(request.Config.Get(ctx, &data)...)
+
+	apiKey := data.ApiKey.ValueString()
+	baseUrl := data.BaseUrl.ValueString()
+
+	// Check configuration data, which should take precedence over
+	// environment variable data, if found.
+	if apiKey == "" {
+		apiKey = os.Getenv("CLOUDAMQP_APIKEY")
+	}
+
+	if apiKey == "" {
+		response.Diagnostics.AddError(
+			"Missing API Key Configuration",
+			"While configuring the provider, the API key was not found in "+
+				"the CLOUDAMQP_APIKEY environment variable or provider "+
+				"configuration block apikey attribute.",
+		)
+	}
+
+	if baseUrl == "" {
+		baseUrl = os.Getenv("CLOUDAMQP_BASEURL")
+	}
+
+	if baseUrl == "" {
+		baseUrl = "https://customer.cloudamqp.com"
+	}
+
+	useragent := fmt.Sprintf("terraform-provider-cloudamqp_v%s", p.version)
+	log.Printf("[DEBUG] cloudamqp::provider::configure useragent: %v", useragent)
+	apiClient := api.New(baseUrl, apiKey, useragent, p.client)
+
+	response.ResourceData = apiClient
+	response.DataSourceData = apiClient
+}
+
+func (p *cloudamqpProvider) DataSources(_ context.Context) []func() datasource.DataSource {
+	return []func() datasource.DataSource{}
+}
+
+func (p *cloudamqpProvider) Resources(_ context.Context) []func() resource.Resource {
+	return []func() resource.Resource{
+		func() resource.Resource {
+			return &awsEventBridgeResource{}
+		},
+	}
+}
+
+func New(version string, client *http.Client) provider.Provider {
+	return &cloudamqpProvider{version, client}
+}
+
+func Provider(v string, client *http.Client) *schemaSdk.Provider {
 	version = v
 	log.Printf("Terraform-Provider-CloudAMQP Version: %s", version)
-	return &schema.Provider{
-		Schema: map[string]*schema.Schema{
+	return &schemaSdk.Provider{
+		Schema: map[string]*schemaSdk.Schema{
 			"apikey": {
-				Type:        schema.TypeString,
+				Type:        schemaSdk.TypeString,
 				Required:    true,
-				DefaultFunc: schema.EnvDefaultFunc("CLOUDAMQP_APIKEY", nil),
+				DefaultFunc: schemaSdk.EnvDefaultFunc("CLOUDAMQP_APIKEY", nil),
 				Description: "Key used to authentication to the CloudAMQP Customer API",
 			},
 			"baseurl": {
-				Type:        schema.TypeString,
-				DefaultFunc: schema.EnvDefaultFunc("CLOUDAMQP_BASEURL", "https://customer.cloudamqp.com"),
+				Type:        schemaSdk.TypeString,
+				DefaultFunc: schemaSdk.EnvDefaultFunc("CLOUDAMQP_BASEURL", "https://customer.cloudamqp.com"),
 				Optional:    true,
 				Description: "Base URL to CloudAMQP Customer website",
 			},
 			"enable_faster_instance_destroy": {
-				Type:        schema.TypeBool,
-				DefaultFunc: schema.EnvDefaultFunc("CLOUDAMQP_ENABLE_FASTER_INSTANCE_DESTROY", false),
+				Type:        schemaSdk.TypeBool,
+				DefaultFunc: schemaSdk.EnvDefaultFunc("CLOUDAMQP_ENABLE_FASTER_INSTANCE_DESTROY", false),
 				Optional:    true,
 				Description: "Skips destroying backend resources on 'terraform destroy'",
 			},
 		},
-		DataSourcesMap: map[string]*schema.Resource{
+		DataSourcesMap: map[string]*schemaSdk.Resource{
 			"cloudamqp_account_vpcs":        dataSourceAccountVpcs(),
 			"cloudamqp_account":             dataSourceAccount(),
 			"cloudamqp_alarm":               dataSourceAlarm(),
@@ -51,38 +149,37 @@ func Provider(v string, client *http.Client) *schema.Provider {
 			"cloudamqp_vpc_gcp_info":        dataSourceVpcGcpInfo(),
 			"cloudamqp_vpc_info":            dataSourceVpcInfo(),
 		},
-		ResourcesMap: map[string]*schema.Resource{
-			"cloudamqp_account_action":              resourceAccountAction(),
-			"cloudamqp_alarm":                       resourceAlarm(),
-			"cloudamqp_custom_domain":               resourceCustomDomain(),
-			"cloudamqp_extra_disk_size":             resourceExtraDiskSize(),
-			"cloudamqp_instance":                    resourceInstance(),
-			"cloudamqp_integration_aws_eventbridge": resourceAwsEventBridge(),
-			"cloudamqp_integration_log":             resourceIntegrationLog(),
-			"cloudamqp_integration_metric":          resourceIntegrationMetric(),
-			"cloudamqp_maintenance_window":          resourceMaintenanceWindow(),
-			"cloudamqp_node_actions":                resourceNodeAction(),
-			"cloudamqp_notification":                resourceNotification(),
-			"cloudamqp_plugin_community":            resourcePluginCommunity(),
-			"cloudamqp_plugin":                      resourcePlugin(),
-			"cloudamqp_privatelink_aws":             resourcePrivateLinkAws(),
-			"cloudamqp_privatelink_azure":           resourcePrivateLinkAzure(),
-			"cloudamqp_rabbitmq_configuration":      resourceRabbitMqConfiguration(),
-			"cloudamqp_security_firewall":           resourceSecurityFirewall(),
-			"cloudamqp_upgrade_rabbitmq":            resourceUpgradeRabbitMQ(),
-			"cloudamqp_upgrade_lavinmq":             resourceUpgradeLavinMQ(),
-			"cloudamqp_vpc_connect":                 resourceVpcConnect(),
-			"cloudamqp_vpc_gcp_peering":             resourceVpcGcpPeering(),
-			"cloudamqp_vpc_peering":                 resourceVpcPeering(),
-			"cloudamqp_vpc":                         resourceVpc(),
-			"cloudamqp_webhook":                     resourceWebhook(),
+		ResourcesMap: map[string]*schemaSdk.Resource{
+			"cloudamqp_account_action":         resourceAccountAction(),
+			"cloudamqp_alarm":                  resourceAlarm(),
+			"cloudamqp_custom_domain":          resourceCustomDomain(),
+			"cloudamqp_extra_disk_size":        resourceExtraDiskSize(),
+			"cloudamqp_instance":               resourceInstance(),
+			"cloudamqp_integration_log":        resourceIntegrationLog(),
+			"cloudamqp_integration_metric":     resourceIntegrationMetric(),
+			"cloudamqp_maintenance_window":     resourceMaintenanceWindow(),
+			"cloudamqp_node_actions":           resourceNodeAction(),
+			"cloudamqp_notification":           resourceNotification(),
+			"cloudamqp_plugin_community":       resourcePluginCommunity(),
+			"cloudamqp_plugin":                 resourcePlugin(),
+			"cloudamqp_privatelink_aws":        resourcePrivateLinkAws(),
+			"cloudamqp_privatelink_azure":      resourcePrivateLinkAzure(),
+			"cloudamqp_rabbitmq_configuration": resourceRabbitMqConfiguration(),
+			"cloudamqp_security_firewall":      resourceSecurityFirewall(),
+			"cloudamqp_upgrade_rabbitmq":       resourceUpgradeRabbitMQ(),
+			"cloudamqp_upgrade_lavinmq":        resourceUpgradeLavinMQ(),
+			"cloudamqp_vpc_connect":            resourceVpcConnect(),
+			"cloudamqp_vpc_gcp_peering":        resourceVpcGcpPeering(),
+			"cloudamqp_vpc_peering":            resourceVpcPeering(),
+			"cloudamqp_vpc":                    resourceVpc(),
+			"cloudamqp_webhook":                resourceWebhook(),
 		},
 		ConfigureFunc: configureClient(client),
 	}
 }
 
-func configureClient(client *http.Client) schema.ConfigureFunc {
-	return func(d *schema.ResourceData) (any, error) {
+func configureClient(client *http.Client) schemaSdk.ConfigureFunc {
+	return func(d *schemaSdk.ResourceData) (any, error) {
 		enableFasterInstanceDestroy = d.Get("enable_faster_instance_destroy").(bool)
 		useragent := fmt.Sprintf("terraform-provider-cloudamqp_v%s", version)
 		return api.New(d.Get("baseurl").(string), d.Get("apikey").(string), useragent, client), nil

cloudamqp/provider_test.go

@@ -1,6 +1,7 @@
 package cloudamqp
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -9,16 +10,16 @@ import (
 	"testing"
 
 	"github.com/cloudamqp/terraform-provider-cloudamqp/cloudamqp/vcr-testing/sanitizer"
+	"github.com/hashicorp/terraform-plugin-framework/providerserver"
+	"github.com/hashicorp/terraform-plugin-go/tfprotov5"
+	"github.com/hashicorp/terraform-plugin-mux/tf5muxserver"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/tidwall/gjson"
 	"gopkg.in/dnaeon/go-vcr.v3/cassette"
 	"gopkg.in/dnaeon/go-vcr.v3/recorder"
 )
 
 var (
-	testAccProviderFactory map[string]func() (*schema.Provider, error)
-
 	mode = recorder.ModeReplayOnly
 )
 
@@ -146,7 +147,7 @@ func cloudamqpResourceTest(t *testing.T, c resource.TestCase) {
 				fmt.Println("SKIP: PUT /api/instances/{id}/config", i.Request.URL, "error:", errStr)
 				i.DiscardOnSave = true
 			}
-    case i.Response.Code == 200 && i.Request.Method == "GET" &&
+		case i.Response.Code == 200 && i.Request.Method == "GET" &&
 			regexp.MustCompile(`/api/vpcs/\d+/vpc-peering$`).MatchString(i.Request.URL):
 			// Filter polling for vpc peering state, only store active response
 			state := gjson.Get(i.Response.Body, "rows.0.state").String()
@@ -167,10 +168,22 @@ func cloudamqpResourceTest(t *testing.T, c resource.TestCase) {
 		return req.URL.Path == "/login"
 	})
 
-	testAccProviderFactory = map[string]func() (*schema.Provider, error){
-		"cloudamqp": func() (*schema.Provider, error) { return Provider("1.0", rec.GetDefaultClient()), nil },
+	c.ProtoV5ProviderFactories = map[string]func() (tfprotov5.ProviderServer, error){
+		"cloudamqp": func() (tfprotov5.ProviderServer, error) {
+			ctx := context.Background()
+
+			muxServer, err := tf5muxserver.NewMuxServer(ctx,
+				Provider("1.0", rec.GetDefaultClient()).GRPCProvider,
+				providerserver.NewProtocol5(New("1.0", rec.GetDefaultClient())),
+			)
+
+			if err != nil {
+				return nil, err
+			}
+
+			return muxServer.ProviderServer(), nil
+		},
 	}
-	c.ProviderFactories = testAccProviderFactory
 
 	resource.Test(t, c)
 }

cloudamqp/resource_cloudamqp_alarm_test.go

@@ -55,8 +55,7 @@ func TestAccAlarm_Basic(t *testing.T) {
 	)
 
 	cloudamqpResourceTest(t, resource.TestCase{
-		PreCheck:          func() { testAccPreCheck(t) },
-		ProviderFactories: testAccProviderFactory,
+		PreCheck: func() { testAccPreCheck(t) },
 		Steps: []resource.TestStep{
 			{
 				Config: configuration.GetTemplatedConfig(t, fileNames, params),