Tidy up

Author: tobio

docs/resources/elasticsearch_alias.md

@@ -4,12 +4,12 @@
 page_title: "elasticstack_elasticsearch_alias Resource - terraform-provider-elasticstack"
 subcategory: "Elasticsearch"
 description: |-
-  Manages an Elasticsearch alias. See the alias documentation for more details.
+  Manages an Elasticsearch alias. See the alias documentation https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-aliases.html for more details.
 ---
 
 # elasticstack_elasticsearch_alias (Resource)
 
-Manages an Elasticsearch alias. See the <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-aliases.html">alias documentation</a> for more details.
+Manages an Elasticsearch alias. See the [alias documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-aliases.html) for more details.
 
 
 

internal/elasticsearch/index/alias/models.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/elastic/terraform-provider-elasticstack/internal/models"
 	"github.com/hashicorp/terraform-plugin-framework-jsontypes/jsontypes"
-	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
@@ -61,18 +60,18 @@ func (model *tfModel) populateFromAPI(ctx context.Context, aliasName string, ind
 
 	// Set write index
 	if writeIndex != nil {
-		writeIndexObj, diags := types.ObjectValueFrom(ctx, indexModel{}.attrTypes(), *writeIndex)
+		writeIndexObj, diags := types.ObjectValueFrom(ctx, getIndexAttrTypes(), *writeIndex)
 		if diags.HasError() {
 			return diags
 		}
 		model.WriteIndex = writeIndexObj
 	} else {
-		model.WriteIndex = types.ObjectNull(indexModel{}.attrTypes())
+		model.WriteIndex = types.ObjectNull(getIndexAttrTypes())
 	}
 
 	// Set read indices
 	readIndicesSet, diags := types.SetValueFrom(ctx, types.ObjectType{
-		AttrTypes: indexModel{}.attrTypes(),
+		AttrTypes: getIndexAttrTypes(),
 	}, readIndices)
 	if diags.HasError() {
 		return diags
@@ -174,8 +173,3 @@ func indexToConfig(index indexModel, isWriteIndex bool) (AliasIndexConfig, diag.
 
 	return config, nil
 }
-
-// Helper functions for attribute types
-func (indexModel) attrTypes() map[string]attr.Type {
-	return getIndexAttrTypes()
-}

internal/elasticsearch/index/alias/read.go

@@ -48,8 +48,8 @@ func readAliasIntoModel(ctx context.Context, client *clients.ApiClient, aliasNam
 	// If no indices returned, the alias doesn't exist
 	if len(indices) == 0 {
 		// Set both to null to indicate the alias doesn't exist
-		model.WriteIndex = types.ObjectNull(indexModel{}.attrTypes())
-		model.ReadIndices = types.SetNull(types.ObjectType{AttrTypes: indexModel{}.attrTypes()})
+		model.WriteIndex = types.ObjectNull(getIndexAttrTypes())
+		model.ReadIndices = types.SetNull(types.ObjectType{AttrTypes: getIndexAttrTypes()})
 		return nil
 	}
 
@@ -63,8 +63,8 @@ func readAliasIntoModel(ctx context.Context, client *clients.ApiClient, aliasNam
 
 	if len(aliasData) == 0 {
 		// Set both to null to indicate the alias doesn't exist
-		model.WriteIndex = types.ObjectNull(indexModel{}.attrTypes())
-		model.ReadIndices = types.SetNull(types.ObjectType{AttrTypes: indexModel{}.attrTypes()})
+		model.WriteIndex = types.ObjectNull(getIndexAttrTypes())
+		model.ReadIndices = types.SetNull(types.ObjectType{AttrTypes: getIndexAttrTypes()})
 		return nil
 	}
 

internal/elasticsearch/index/alias/schema.go

@@ -19,7 +19,7 @@ func (r *aliasResource) Schema(ctx context.Context, req resource.SchemaRequest,
 func getSchema() schema.Schema {
 	return schema.Schema{
 		Description: "Manages an Elasticsearch alias. " +
-			"See the <a href=\"https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-aliases.html\">alias documentation</a> for more details.",
+			"See the [alias documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-aliases.html) for more details.",
 
 		Attributes: map[string]schema.Attribute{
 			"id": schema.StringAttribute{