Fix state upgrade for connectors with empty config (#1355)

* Fix state upgrade for connectors with empty config

* Changelog

Author: tobio

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+- Fix provider crash with `elasticstack_kibana_action_connector` when `config` or `secrets` was unset in 0.11.17 ([#1355](https://github.com/elastic/terraform-provider-elasticstack/pull/1355))
+
+## [0.11.18] - 2025-10-10
+
 - Create `elasticstack_kibana_security_detection_rule` resource. ([#1290](https://github.com/elastic/terraform-provider-elasticstack/pull/1290))
 - Add `elasticstack_kibana_export_saved_objects` data source ([#1293](https://github.com/elastic/terraform-provider-elasticstack/pull/1293))
 - Create `elasticstack_kibana_maintenance_window` resource. ([#1224](https://github.com/elastic/terraform-provider-elasticstack/pull/1224))
@@ -461,7 +465,8 @@
 - Initial set of docs
 - CI integration
 
-[Unreleased]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.17...HEAD
+[Unreleased]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.18...HEAD
+[0.11.18]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.17...v0.11.18
 [0.11.17]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.16...v0.11.17
 [0.11.16]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.15...v0.11.16
 [0.11.15]: https://github.com/elastic/terraform-provider-elasticstack/compare/v0.11.14...v0.11.15

Makefile

@@ -1,7 +1,7 @@
 .DEFAULT_GOAL = help
 SHELL := /bin/bash
 
-VERSION ?= 0.11.17
+VERSION ?= 0.11.18
 
 NAME = elasticstack
 BINARY = terraform-provider-${NAME}

internal/kibana/connectors/acc_test.go

@@ -329,3 +329,59 @@ func TestAccResourceKibanaConnectorFromSDK(t *testing.T) {
 		},
 	})
 }
+
+func TestAccResourceKibanaConnectorEmptyConfigFromSDK(t *testing.T) {
+	minSupportedVersion := version.Must(version.NewSemver("7.14.0"))
+
+	connectorName := sdkacctest.RandStringFromCharSet(22, sdkacctest.CharSetAlphaNum)
+
+	create := func(name string) string {
+		return fmt.Sprintf(`
+	provider "elasticstack" {
+	  elasticsearch {}
+	  kibana {}
+	}
+
+	resource "elasticstack_kibana_action_connector" "test" {
+      name              = "%s"
+      connector_type_id = ".slack"
+      secrets = jsonencode({
+        webhookUrl = "https://example.com/webhook"
+      })
+    }`,
+			name)
+	}
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { acctest.PreCheck(t) },
+		CheckDestroy: checkResourceKibanaConnectorDestroy,
+		Steps: []resource.TestStep{
+			{
+				// Create the connector with the last provider version where the connector resource was built on the SDK
+				ExternalProviders: map[string]resource.ExternalProvider{
+					"elasticstack": {
+						Source:            "elastic/elasticstack",
+						VersionConstraint: "0.11.17",
+					},
+				},
+				SkipFunc: versionutils.CheckIfVersionIsUnsupported(minSupportedVersion),
+				Config:   create(connectorName),
+				Check: resource.ComposeTestCheckFunc(
+					testCommonAttributes(connectorName, ".slack"),
+
+					resource.TestCheckResourceAttr("elasticstack_kibana_action_connector.test", "config", ""),
+				),
+			},
+			{
+				ProtoV6ProviderFactories: acctest.Providers,
+				SkipFunc:                 versionutils.CheckIfVersionIsUnsupported(minSupportedVersion),
+				Config:                   create(connectorName),
+				Check: resource.ComposeTestCheckFunc(
+					testCommonAttributes(connectorName, ".slack"),
+
+					resource.TestCheckResourceAttr("elasticstack_kibana_action_connector.test", "config", `{"__tf_provider_connector_type_id":".slack"}`),
+				),
+			},
+		},
+	})
+}

internal/kibana/connectors/resource.go

@@ -2,11 +2,13 @@ package connectors
 
 import (
 	"context"
+	"encoding/json"
 
 	"github.com/elastic/terraform-provider-elasticstack/internal/clients"
 	"github.com/hashicorp/go-version"
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
+	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
 )
 
 // Ensure provider defined types fully satisfy framework interfaces
@@ -35,3 +37,50 @@ func (r *Resource) Metadata(ctx context.Context, request resource.MetadataReques
 func (r *Resource) ImportState(ctx context.Context, request resource.ImportStateRequest, response *resource.ImportStateResponse) {
 	response.Diagnostics.Append(response.State.SetAttribute(ctx, path.Root("id"), request.ID)...)
 }
+
+func (r *Resource) UpgradeState(context.Context) map[int64]resource.StateUpgrader {
+	return map[int64]resource.StateUpgrader{
+		0: {StateUpgrader: upgradeV0},
+	}
+}
+
+// The schema between V0 and V1 is mostly the same, however config saved ""
+// values to the state when null values were in the config. jsontypes.Normalized
+// correctly states this is invalid JSON.
+func upgradeV0(ctx context.Context, req resource.UpgradeStateRequest, resp *resource.UpgradeStateResponse) {
+	var state map[string]interface{}
+
+	removeEmptyString := func(state map[string]interface{}, key string) map[string]interface{} {
+		value, ok := state[key]
+		if !ok {
+			return state
+		}
+
+		valueString, ok := value.(string)
+		if !ok || valueString != "" {
+			return state
+		}
+
+		delete(state, key)
+		return state
+	}
+
+	err := json.Unmarshal(req.RawState.JSON, &state)
+	if err != nil {
+		resp.Diagnostics.AddError("Failed to unmarshal state", err.Error())
+		return
+	}
+
+	state = removeEmptyString(state, "config")
+	state = removeEmptyString(state, "secrets")
+
+	stateBytes, err := json.Marshal(state)
+	if err != nil {
+		resp.Diagnostics.AddError("Failed to marshal state", err.Error())
+		return
+	}
+
+	resp.DynamicValue = &tfprotov6.DynamicValue{
+		JSON: stateBytes,
+	}
+}