wip

Author: wandergeek

go.mod

@@ -14,6 +14,7 @@ require (
 	github.com./hashicorp/terraform-plugin-log v0.9.0
 	github.com./hashicorp/terraform-plugin-mux v0.11.1
 	github.com./hashicorp/terraform-plugin-sdk/v2 v2.26.1
+	github.com./hashicorp/terraform-plugin-testing v1.2.0
 	github.com./stretchr/testify v1.8.4
 )
 

go.sum

@@ -108,6 +108,8 @@ github.com./hashicorp/terraform-plugin-mux v0.11.1 h1:cDCrmkrNHf/c2zC1oREIMdgCYWi
 github.com./hashicorp/terraform-plugin-mux v0.11.1/go.mod h1:eMZPcv8b5y+alMeQmocgaphPj4zAnM3uXiMLd1emqMQ=
 github.com./hashicorp/terraform-plugin-sdk/v2 v2.26.1 h1:G9WAfb8LHeCxu7Ae8nc1agZlQOSCUWsb610iAogBhCs=
 github.com./hashicorp/terraform-plugin-sdk/v2 v2.26.1/go.mod h1:xcOSYlRVdPLmDUoqPhO9fiO/YCN/l6MGYeTzGt5jgkQ=
+github.com./hashicorp/terraform-plugin-testing v1.2.0 h1:pASRAe6BOZFO4xSGQr9WzitXit0nrQAYDk8ziuRfn9E=
+github.com./hashicorp/terraform-plugin-testing v1.2.0/go.mod h1:+8bp3O7xUb1UtBcdknrGdVRIuTw4b62TYSIgXHqlyew=
 github.com./hashicorp/terraform-registry-address v0.2.1 h1:QuTf6oJ1+WSflJw6WYOHhLgwUiQ0FrROpHPYFtwTYWM=
 github.com./hashicorp/terraform-registry-address v0.2.1/go.mod h1:BSE9fIFzp0qWsJUUyGquo4ldV9k2n+psif6NYkBRS3Y=
 github.com./hashicorp/terraform-svchost v0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S52uzrw4x0jKQ=

internal/clients/api_client.go

@@ -21,7 +21,6 @@ import (
 	"github.com./elastic/terraform-provider-elasticstack/internal/models"
 	"github.com./elastic/terraform-provider-elasticstack/internal/utils"
 	"github.com./hashicorp/go-version"
-	fwdiag "github.com./hashicorp/terraform-plugin-framework/diag"
 	"github.com./hashicorp/terraform-plugin-framework/types"
 	"github.com./hashicorp/terraform-plugin-log/tflog"
 	"github.com./hashicorp/terraform-plugin-sdk/v2/diag"
@@ -76,20 +75,6 @@ type ApiClient struct {
 	version                  string
 }
 
-type ElasticsearchConnection struct {
-	Username  types.String `tfsdk:"username"`
-	Password  types.String `tfsdk:"password"`
-	APIKey    types.String `tfsdk:"api_key"`
-	Endpoints types.List   `tfsdk:"endpoints"`
-	Insecure  types.Bool   `tfsdk:"insecure"`
-	CAFile    types.String `tfsdk:"ca_file"`
-	CAData    types.String `tfsdk:"ca_data"`
-	CertFile  types.String `tfsdk:"cert_file"`
-	KeyFile   types.String `tfsdk:"key_file"`
-	CertData  types.String `tfsdk:"cert_data"`
-	KeyData   types.String `tfsdk:"key_data"`
-}
-
 func NewApiClientFunc(version string) func(context.Context, *schema.ResourceData) (interface{}, diag.Diagnostics) {
 	return func(ctx context.Context, d *schema.ResourceData) (interface{}, diag.Diagnostics) {
 		return newApiClient(d, version)
@@ -360,108 +345,6 @@ func (a *ApiClient) ClusterID(ctx context.Context) (*string, diag.Diagnostics) {
 	return nil, diags
 }
 
-func NewFWApiClient(ctx context.Context, esConn *ElasticsearchConnection, version string, useEnvAsDefault bool) (*ApiClient, fwdiag.Diagnostics) {
-	var diags fwdiag.Diagnostics
-	config := elasticsearch.Config{}
-	config.Username = getStringValue(esConn.Username, "ELASTICSEARCH_USERNAME", true)
-	config.Password = getStringValue(esConn.Password, "ELASTICSEARCH_PASSWORD", true)
-	config.APIKey = getStringValue(esConn.APIKey, "ELASTICSEARCH_API_KEY", true)
-
-	var addrs []string
-	diags.Append(esConn.Endpoints.ElementsAs(ctx, &addrs, true)...)
-	if diags.HasError() {
-		return nil, diags
-	}
-	if len(addrs) == 0 && useEnvAsDefault {
-		if endpoints := os.Getenv("ELASTICSEARCH_ENDPOINTS"); endpoints != "" {
-			for _, e := range strings.Split(endpoints, ",") {
-				addrs = append(addrs, strings.TrimSpace(e))
-			}
-		}
-	}
-	config.Addresses = addrs
-
-	envInsecure, _ := strconv.ParseBool(os.Getenv("ELASTICSEARCH_INSECURE"))
-	if esConn.Insecure.ValueBool() || envInsecure {
-		tlsClientConfig := ensureTLSClientConfig(&config)
-		tlsClientConfig.InsecureSkipVerify = true
-	}
-
-	if esConn.CAFile.ValueString() != "" {
-		caCert, err := os.ReadFile(esConn.CAFile.ValueString())
-		if err != nil {
-			diags.Append(fwdiag.NewErrorDiagnostic(
-				"Unable to read CA File",
-				err.Error(),
-			))
-			return nil, diags
-		}
-		config.CACert = caCert
-	}
-	if esConn.CAData.ValueString() != "" {
-		config.CACert = []byte(esConn.CAData.ValueString())
-	}
-
-	if certFile := esConn.CertFile.ValueString(); certFile != "" {
-		if keyFile := esConn.KeyFile.ValueString(); keyFile != "" {
-			cert, err := tls.LoadX509KeyPair(certFile, keyFile)
-			if err != nil {
-				diags.Append(fwdiag.NewErrorDiagnostic(
-					"Unable to read certificate or key file",
-					err.Error(),
-				))
-				return nil, diags
-			}
-			tlsClientConfig := ensureTLSClientConfig(&config)
-			tlsClientConfig.Certificates = []tls.Certificate{cert}
-		} else {
-			diags.Append(fwdiag.NewErrorDiagnostic(
-				"Unable to read key file",
-				"Path to key file has not been configured or is empty",
-			))
-			return nil, diags
-		}
-	}
-	if certData := esConn.CertData.ValueString(); certData != "" {
-		if keyData := esConn.KeyData.ValueString(); keyData != "" {
-			cert, err := tls.X509KeyPair([]byte(certData), []byte(keyData))
-			if err != nil {
-				diags.Append(fwdiag.NewErrorDiagnostic(
-					"Unable to parse certificate or key",
-					err.Error(),
-				))
-				return nil, diags
-			}
-			tlsClientConfig := ensureTLSClientConfig(&config)
-			tlsClientConfig.Certificates = []tls.Certificate{cert}
-		} else {
-			diags.Append(fwdiag.NewErrorDiagnostic(
-				"Unable to parse key",
-				"Key data has not been configured or is empty",
-			))
-			return nil, diags
-		}
-	}
-
-	es, err := elasticsearch.NewClient(config)
-	if err != nil {
-		diags.Append(fwdiag.NewErrorDiagnostic(
-			"Unable to create Elasticsearch client",
-			err.Error(),
-		))
-		return nil, diags
-	}
-	if logging.IsDebugOrHigher() {
-		config.EnableDebugLogger = true
-		config.Logger = &debugLogger{Name: "elasticsearch"}
-	}
-
-	return &ApiClient{
-		elasticsearch: es,
-		version:       version,
-	}, diags
-}
-
 func getStringValue(s types.String, envKey string, useEnvAsDefault bool) string {
 	if s.IsNull() {
 		if useEnvAsDefault {

provider/factory_test.go

@@ -0,0 +1,51 @@
+package provider
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	"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-testing/helper/resource"
+)
+
+func TestMuxServer(t *testing.T) {
+	const providerConfig = `
+	provider "elasticstack" {
+		elasticsearch {
+		  username  = "sup"
+		  password  = "dawg"
+		  endpoints = ["http://localhost:9200"]
+		}
+	  }
+	`
+	resource.Test(t, resource.TestCase{
+		ProtoV5ProviderFactories: map[string]func() (tfprotov5.ProviderServer, error){
+			"elasticstack": func() (tfprotov5.ProviderServer, error) {
+				version := "test"
+				sdkv2Provider := New(version)
+				frameworkProvider := providerserver.NewProtocol5(NewFrameworkProvider(version))
+				ctx := context.Background()
+				providers := []func() tfprotov5.ProviderServer{
+					frameworkProvider,
+					sdkv2Provider.GRPCProvider,
+				}
+
+				muxServer, err := tf5muxserver.NewMuxServer(ctx, providers...)
+
+				if err != nil {
+					return nil, err
+				}
+
+				return muxServer.ProviderServer(), nil
+			},
+		},
+		Steps: []resource.TestStep{
+			{
+				Config: fmt.Sprintf(providerConfig),
+			},
+		},
+	})
+}

provider/plugin_framework.go

@@ -39,8 +39,8 @@ func (p *Provider) Schema(ctx context.Context, req fwprovider.SchemaRequest, res
 }
 
 func (p *Provider) Configure(ctx context.Context, req fwprovider.ConfigureRequest, res *fwprovider.ConfigureResponse) {
-	esConn := []*clients.ApiClient{}
-	diags := req.Config.GetAttribute(ctx, path.Root(esKeyName), &esConn)
+	apiClients := []*clients.ApiClient{}
+	diags := req.Config.GetAttribute(ctx, path.Root(esKeyName), &apiClients)
 	res.Diagnostics.Append(diags...)
 	if res.Diagnostics.HasError() {
 		return

provider/provider_test.go

@@ -9,8 +9,8 @@ import (
 	"github.com./elastic/terraform-provider-elasticstack/internal/elasticsearch/security"
 	"github.com./elastic/terraform-provider-elasticstack/internal/versionutils"
 	"github.com./elastic/terraform-provider-elasticstack/provider"
-	sdkacctest "github.com./hashicorp/terraform-plugin-sdk/v2/helper/acctest"
-	"github.com./hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	sdkacctest "github.com./hashicorp/terraform-plugin-testing/helper/acctest"
+	"github.com./hashicorp/terraform-plugin-testing/helper/resource"
 )
 
 func TestProvider(t *testing.T) {