Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## [Unreleased]

- Add `ignore_missing_component_templates` to `elasticstack_elasticsearch_index_template` ([#1206](https://github.com/elastic/terraform-provider-elasticstack/pull/1206))
- Prevent provider panic when a script exists in state, but not in Elasticsearch ([#1218](https://github.com/elastic/terraform-provider-elasticstack/pull/1218))

## [0.11.17] - 2025-07-21

Expand Down
1 change: 1 addition & 0 deletions internal/elasticsearch/cluster/script.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ func resourceScriptRead(ctx context.Context, d *schema.ResourceData, meta interf
if script == nil && diags == nil {
tflog.Warn(ctx, fmt.Sprintf(`Script "%s" not found, removing from state`, compId.ResourceId))
d.SetId("")
return nil
}
if diags.HasError() {
return diags
Expand Down
21 changes: 21 additions & 0 deletions internal/elasticsearch/cluster/script_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
"github.com/stretchr/testify/require"
)

func TestAccResourceScript(t *testing.T) {
Expand Down Expand Up @@ -37,6 +38,26 @@ func TestAccResourceScript(t *testing.T) {
resource.TestCheckResourceAttr("elasticstack_elasticsearch_script.test", "params", `{"changed_modifier":2}`),
),
},
{
// Ensure the provider doesn't panic if the script has been deleted outside of the Terraform flow
PreConfig: func() {
client, err := clients.NewAcceptanceTestingClient()
require.NoError(t, err)

esClient, err := client.GetESClient()
require.NoError(t, err)

_, err = esClient.DeleteScript(scriptID)
require.NoError(t, err)
},
Config: testAccScriptUpdate(scriptID),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("elasticstack_elasticsearch_script.test", "script_id", scriptID),
resource.TestCheckResourceAttr("elasticstack_elasticsearch_script.test", "lang", "painless"),
resource.TestCheckResourceAttr("elasticstack_elasticsearch_script.test", "source", "Math.log(_score * 4) + params['changed_modifier']"),
resource.TestCheckResourceAttr("elasticstack_elasticsearch_script.test", "params", `{"changed_modifier":2}`),
),
},
},
})
}
Expand Down
Loading