Fixed reviewed ones

Author: k-yomo

docs/resources/elasticsearch_script.md

@@ -1,12 +1,12 @@
 ---
-# generated by https://github.com/hashicorp/terraform-plugin-docs
-page_title: "elasticstack_elasticsearch_script Resource - terraform-provider-elasticstack"
-subcategory: ""
+subcategory: "Snapshot"
+layout: ""
+page_title: "Elasticstack: elasticstack_elasticsearch_script Resource"
 description: |-
-  Creates or updates a stored script or search template. See https://www.elastic.co/guide/en/elasticsearch/reference/current/create-stored-script-api.html
+  Creates or updates a stored script or search template.
 ---
 
-# elasticstack_elasticsearch_script (Resource)
+# Resource: elasticstack_elasticsearch_script
 
 Creates or updates a stored script or search template. See https://www.elastic.co/guide/en/elasticsearch/reference/current/create-stored-script-api.html
 
@@ -29,14 +29,14 @@ resource "elasticstack_elasticsearch_script" "my_script" {
 
 ### Required
 
+- `lang` (String) Script language. For search templates, use `mustache`.
 - `script_id` (String) Identifier for the stored script. Must be unique within the cluster.
 - `source` (String) For scripts, a string containing the script. For search templates, an object containing the search template.
 
 ### Optional
 
 - `context` (String) Context in which the script or search template should run.
 - `elasticsearch_connection` (Block List, Max: 1) Used to establish connection to Elasticsearch server. Overrides environment variables if present. (see [below for nested schema](#nestedblock--elasticsearch_connection))
-- `lang` (String) Script language. For search templates, use `mustache`. Defaults to `painless`.
 - `params` (String) Parameters for the script or search template.
 
 ### Read-Only

internal/clients/cluster.go

@@ -190,13 +190,12 @@ func (a *ApiClient) GetElasticsearchScript(ctx context.Context, id string) (*mod
 	if res.StatusCode == http.StatusNotFound {
 		return nil, nil
 	}
-	if diags := utils.CheckError(res, fmt.Sprintf("Unable to get the script: %s", id)); diags.HasError() {
+	if diags := utils.CheckError(res, fmt.Sprintf("Unable to get stored script: %s", id)); diags.HasError() {
 		return nil, diags
 	}
-	type getScriptResponse = struct {
+	var scriptResponse struct {
 		Script *models.Script `json:"script"`
 	}
-	var scriptResponse getScriptResponse
 	if err := json.NewDecoder(res.Body).Decode(&scriptResponse); err != nil {
 		return nil, diag.FromErr(err)
 	}
@@ -208,7 +207,7 @@ func (a *ApiClient) PutElasticsearchScript(ctx context.Context, script *models.S
 	req := struct {
 		Script *models.Script `json:"script"`
 	}{
-		Script: script,
+		script,
 	}
 	scriptBytes, err := json.Marshal(req)
 	if err != nil {
@@ -219,7 +218,7 @@ func (a *ApiClient) PutElasticsearchScript(ctx context.Context, script *models.S
 		return diag.FromErr(err)
 	}
 	defer res.Body.Close()
-	if diags := utils.CheckError(res, "Unable to put the script"); diags.HasError() {
+	if diags := utils.CheckError(res, "Unable to put stored script"); diags.HasError() {
 		return diags
 	}
 	return nil

internal/elasticsearch/cluster/script.go

@@ -23,10 +23,9 @@ func ResourceScript() *schema.Resource {
 			ForceNew:    true,
 		},
 		"lang": {
-			Description:  "Script language. For search templates, use `mustache`. Defaults to `painless`.",
+			Description:  "Script language. For search templates, use `mustache`.",
 			Type:         schema.TypeString,
-			Optional:     true,
-			Default:      "painless",
+			Required:     true,
 			ValidateFunc: validation.StringInSlice([]string{"painless", "expression", "mustache", "java"}, false),
 		},
 		"source": {

internal/elasticsearch/cluster/script_test.go

@@ -41,6 +41,27 @@ func TestAccResourceScript(t *testing.T) {
 	})
 }
 
+func TestAccResourceScriptSearchTemplate(t *testing.T) {
+	scriptID := sdkacctest.RandStringFromCharSet(10, sdkacctest.CharSetAlphaNum)
+
+	resource.UnitTest(t, resource.TestCase{
+		PreCheck:          func() { acctest.PreCheck(t) },
+		CheckDestroy:      checkScriptDestroy,
+		ProviderFactories: acctest.Providers,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccSearchTemplateCreate(scriptID),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("elasticstack_elasticsearch_script.search_template_test", "script_id", scriptID),
+					resource.TestCheckResourceAttr("elasticstack_elasticsearch_script.search_template_test", "lang", "mustache"),
+					resource.TestCheckResourceAttr("elasticstack_elasticsearch_script.search_template_test", "source", `{"query":{"match":{"message":"{{query_string}}"}},"from":"{{from}}","size":"{{size}}"}`),
+					resource.TestCheckResourceAttr("elasticstack_elasticsearch_script.search_template_test", "params", `{"query_string":"My query string"}`),
+				),
+			},
+		},
+	})
+}
+
 func testAccScriptCreate(id string) string {
 	return fmt.Sprintf(`
 provider "elasticstack" {
@@ -49,6 +70,7 @@ provider "elasticstack" {
 
 resource "elasticstack_elasticsearch_script" "test" {
   script_id = "%s"
+  lang      = "painless"
   source    = "Math.log(_score * 2) + params['my_modifier']"
   context   = "score"
 }
@@ -63,6 +85,7 @@ provider "elasticstack" {
 
 resource "elasticstack_elasticsearch_script" "test" {
   script_id = "%s"
+  lang      = "painless"
   source    = "Math.log(_score * 4) + params['changed_modifier']"
   params    = jsonencode({
     changed_modifier = 2
@@ -71,6 +94,31 @@ resource "elasticstack_elasticsearch_script" "test" {
 	`, id)
 }
 
+func testAccSearchTemplateCreate(id string) string {
+	return fmt.Sprintf(`
+provider "elasticstack" {
+  elasticsearch {}
+}
+
+resource "elasticstack_elasticsearch_script" "search_template_test" {
+  script_id = "%s"
+  lang      = "mustache"
+  source    = jsonencode({
+    query = {
+      match = {
+        message = "{{query_string}}"
+      }
+    }
+    from = "{{from}}"
+    size = "{{size}}"
+  })
+  params = jsonencode({
+    query_string = "My query string"
+  })
+}
+	`, id)
+}
+
 func checkScriptDestroy(s *terraform.State) error {
 	client := acctest.Provider.Meta().(*clients.ApiClient)
 

templates/resources/elasticsearch_script.md.tmpl

@@ -0,0 +1,23 @@
+---
+subcategory: "Snapshot"
+layout: ""
+page_title: "Elasticstack: elasticstack_elasticsearch_script Resource"
+description: |-
+  Creates or updates a stored script or search template.
+---
+
+# Resource: elasticstack_elasticsearch_script
+
+Creates or updates a stored script or search template. See https://www.elastic.co/guide/en/elasticsearch/reference/current/create-stored-script-api.html
+
+## Example Usage
+
+{{ tffile "examples/resources/elasticstack_elasticsearch_script/resource.tf" }}
+
+{{ .SchemaMarkdown | trimspace }}
+
+## Import
+
+Import is supported using the following syntax:
+
+{{ codefile "shell" "examples/resources/elasticstack_elasticsearch_script/import.sh" }}