Address PR feedback: simplify version, remove sensitive flag, read from config, delete extra files

Co-authored-by: tobio <[email protected]>

Author: Copilot

docs/resources/kibana_import_saved_objects.md

@@ -12,8 +12,6 @@ Create sets of Kibana saved objects from a file created by the export API. See h
 
 ## Example Usage
 
-### Basic usage
-
 ```terraform
 provider "elasticstack" {
   kibana {}
@@ -28,44 +26,14 @@ EOT
 }
 ```
 
-### Using write-only attributes
-
-The `file_contents_wo` and `file_contents_wo_version` attributes provide write-only alternatives to `file_contents`. 
-These attributes are not stored in the Terraform state, making them useful for sensitive content management.
-
-```terraform
-provider "elasticstack" {
-  kibana {}
-}
-
-# Example using write-only file_contents_wo attribute
-resource "elasticstack_kibana_import_saved_objects" "settings_write_only" {
-  overwrite        = true
-  file_contents_wo = <<-EOT
-{"attributes":{"buildNum":42747,"defaultIndex":"metricbeat-*","theme:darkMode":true},"coreMigrationVersion":"7.0.0","id":"7.14.0","managed":false,"references":[],"type":"config","typeMigrationVersion":"7.0.0","updated_at":"2021-08-04T02:04:43.306Z","version":"WzY1MiwyXQ=="}
-{"excludedObjects":[],"excludedObjectsCount":0,"exportedCount":1,"missingRefCount":0,"missingReferences":[]}
-EOT
-}
-
-# Example using write-only file_contents_wo with version tracking
-resource "elasticstack_kibana_import_saved_objects" "settings_with_version" {
-  overwrite                = true
-  file_contents_wo         = <<-EOT
-{"attributes":{"buildNum":42747,"defaultIndex":"metricbeat-*","theme:darkMode":true},"coreMigrationVersion":"7.0.0","id":"7.14.0","managed":false,"references":[],"type":"config","typeMigrationVersion":"7.0.0","updated_at":"2021-08-04T02:04:43.306Z","version":"WzY1MiwyXQ=="}
-{"excludedObjects":[],"excludedObjectsCount":0,"exportedCount":1,"missingRefCount":0,"missingReferences":[]}
-EOT
-  file_contents_wo_version = "v1.0.0"
-}
-```
-
 <!-- schema generated by tfplugindocs -->
 ## Schema
 
 ### Optional
 
 - `file_contents` (String) The contents of the exported saved objects file.
 - `file_contents_wo` (String, Sensitive) The contents of the exported saved objects file (write-only, not stored in state).
-- `file_contents_wo_version` (String, Sensitive) Version or identifier for the file contents (write-only, not stored in state).
+- `file_contents_wo_version` (String) Version or identifier for the file contents (write-only, not stored in state).
 - `ignore_import_errors` (Boolean) If set to true, errors during the import process will not fail the configuration application
 - `overwrite` (Boolean) Overwrites saved objects when they already exist. When used, potential conflict errors are automatically resolved by overwriting the destination object.
 - `space_id` (String) An identifier for the space. If space_id is not provided, the default space is used.

examples/resources/elasticstack_kibana_import_saved_objects/resource-write-only.tf

@@ -162,7 +162,7 @@ resource "elasticstack_kibana_import_saved_objects" "wo_version_test" {
 {"attributes":{"buildNum":42747,"defaultIndex":"metricbeat-*","theme:darkMode":true},"coreMigrationVersion":"7.0.0","id":"7.14.0","managed":false,"references":[],"type":"config","typeMigrationVersion":"7.0.0","updated_at":"2021-08-04T02:04:43.306Z","version":"WzY1MiwyXQ=="}
 {"excludedObjects":[],"excludedObjectsCount":0,"exportedCount":1,"missingRefCount":0,"missingReferences":[]}
 EOT
-  file_contents_wo_version = "v1.0.0"
+  file_contents_wo_version = "1"
 }
 	`
 }

internal/kibana/import_saved_objects/acc_test.go

@@ -15,10 +15,10 @@ import (
 )
 
 func (r *Resource) Create(ctx context.Context, request resource.CreateRequest, response *resource.CreateResponse) {
-	r.importObjects(ctx, request.Plan, &response.State, &response.Diagnostics)
+	r.importObjects(ctx, request.Plan, request.Config, &response.State, &response.Diagnostics)
 }
 
-func (r *Resource) importObjects(ctx context.Context, plan tfsdk.Plan, state *tfsdk.State, diags *diag.Diagnostics) {
+func (r *Resource) importObjects(ctx context.Context, plan tfsdk.Plan, config tfsdk.Config, state *tfsdk.State, diags *diag.Diagnostics) {
 	var model modelV0
 
 	diags.Append(plan.Get(ctx, &model)...)
@@ -33,9 +33,16 @@ func (r *Resource) importObjects(ctx context.Context, plan tfsdk.Plan, state *tf
 	}
 
 	// Determine which file contents to use (file_contents or file_contents_wo)
+	// Read write-only attributes from config as per Terraform best practices
+	var fileContentsWO types.String
+	diags.Append(config.GetAttribute(ctx, path.Root("file_contents_wo"), &fileContentsWO)...)
+	if diags.HasError() {
+		return
+	}
+
 	fileContents := model.FileContents.ValueString()
-	if !model.FileContentsWO.IsNull() && !model.FileContentsWO.IsUnknown() {
-		fileContents = model.FileContentsWO.ValueString()
+	if !fileContentsWO.IsNull() && !fileContentsWO.IsUnknown() {
+		fileContents = fileContentsWO.ValueString()
 	}
 
 	resp, err := kibanaClient.KibanaSavedObject.Import([]byte(fileContents), model.Overwrite.ValueBool(), model.SpaceID.ValueString())

internal/kibana/import_saved_objects/create.go

@@ -95,7 +95,6 @@ func (r *Resource) Schema(_ context.Context, _ resource.SchemaRequest, resp *res
 			"file_contents_wo_version": schema.StringAttribute{
 				Description: "Version or identifier for the file contents (write-only, not stored in state).",
 				Optional:    true,
-				Sensitive:   true,
 				Validators: []validator.String{
 					stringvalidator.AlsoRequires(path.MatchRoot("file_contents_wo")),
 				},

internal/kibana/import_saved_objects/schema.go

@@ -7,5 +7,5 @@ import (
 )
 
 func (r *Resource) Update(ctx context.Context, request resource.UpdateRequest, response *resource.UpdateResponse) {
-	r.importObjects(ctx, request.Plan, &response.State, &response.Diagnostics)
+	r.importObjects(ctx, request.Plan, request.Config, &response.State, &response.Diagnostics)
 }