WIP

Author: tobio

internal/clients/config/base_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	providerSchema "github.com./elastic/terraform-provider-elasticstack/internal/schema"
+	"github.com./hashicorp/terraform-plugin-framework/types"
 	"github.com./hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com./stretchr/testify/require"
 )
@@ -27,11 +28,62 @@ func TestNewBaseConfigFromSDK(t *testing.T) {
 	})
 
 	baseCfg := newBaseConfigFromSDK(rd, "unit-testing", "elasticsearch")
-	ua := buildUserAgent("unit-testing")
+	ua := "elasticstack-terraform-provider/unit-testing"
 	require.Equal(t, baseConfig{
 		Username:  "elastic",
 		Password:  "changeme",
 		UserAgent: ua,
 		Header:    http.Header{"User-Agent": []string{ua}},
 	}, baseCfg)
 }
+
+func TestNewBaseConfigFromFramework(t *testing.T) {
+	os.Unsetenv("ELASTICSEARCH_USERNAME")
+	os.Unsetenv("ELASTICSEARCH_PASSWORD")
+	os.Unsetenv("ELASTICSEARCH_API_KEY")
+
+	expectedUA := "elasticstack-terraform-provider/unit-testing"
+
+	tests := []struct {
+		name               string
+		config             ProviderConfiguration
+		expectedBaseConfig baseConfig
+	}{
+		{
+			name: "with es config defined",
+			config: ProviderConfiguration{
+				Elasticsearch: []ElasticsearchConnection{
+					{
+						Username: types.StringValue("elastic"),
+						Password: types.StringValue("changeme"),
+						APIKey:   types.StringValue("apikey"),
+					},
+				},
+			},
+			expectedBaseConfig: baseConfig{
+				Username:  "elastic",
+				Password:  "changeme",
+				ApiKey:    "apikey",
+				UserAgent: expectedUA,
+				Header:    http.Header{"User-Agent": []string{expectedUA}},
+			},
+		},
+		{
+			name: "should not set credentials if no configuration available",
+			config: ProviderConfiguration{
+				Elasticsearch: []ElasticsearchConnection{},
+			},
+			expectedBaseConfig: baseConfig{
+				UserAgent: expectedUA,
+				Header:    http.Header{"User-Agent": []string{expectedUA}},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			baseCfg := newBaseConfigFromFramework(tt.config, "unit-testing")
+			require.Equal(t, tt.expectedBaseConfig, baseCfg)
+		})
+	}
+}

internal/kibana/import_saved_objects/schema.go

@@ -17,6 +17,10 @@ import (
 var _ resource.Resource = &Resource{}
 var _ resource.ResourceWithConfigure = &Resource{}
 
+// TODO - Uncomment these lines when we're using a kibana client which supports create_new_copies and compatibility_mode
+// create_new_copies and compatibility_mode aren't supported by the current version of the Kibana client
+// We can add these ourselves once https://github.com./elastic/terraform-provider-elasticstack/pull/372 is merged
+
 // var _ resource.ResourceWithConfigValidators = &Resource{}
 
 // func (r *Resource) ConfigValidators(context.Context) []resource.ConfigValidator {

provider/provider.go

@@ -29,9 +29,9 @@ func init() {
 func New(version string) *schema.Provider {
 	p := &schema.Provider{
 		Schema: map[string]*schema.Schema{
-			esKeyName: providerSchema.GetEsConnectionSchema(esKeyName, true),
-			"kibana":  providerSchema.GetKibanaConnectionSchema(),
-			"fleet":   providerSchema.GetFleetConnectionSchema(),
+			esKeyName:    providerSchema.GetEsConnectionSchema(esKeyName, true),
+			kbKeyName:    providerSchema.GetKibanaConnectionSchema(),
+			fleetKeyName: providerSchema.GetFleetConnectionSchema(),
 		},
 		DataSourcesMap: map[string]*schema.Resource{
 			"elasticstack_elasticsearch_ingest_processor_append":            ingest.DataSourceProcessorAppend(),