From 07d458c848bd6143f61233545f7719afb6cebb6c Mon Sep 17 00:00:00 2001 From: Toby Brain Date: Thu, 1 Feb 2024 22:43:31 +1100 Subject: [PATCH 1/2] Fixup field attr json tags --- internal/kibana/data_view/acc_test.go | 4 ++++ internal/kibana/data_view/schema.go | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/internal/kibana/data_view/acc_test.go b/internal/kibana/data_view/acc_test.go index c014d1d17..57c41465b 100644 --- a/internal/kibana/data_view/acc_test.go +++ b/internal/kibana/data_view/acc_test.go @@ -39,6 +39,7 @@ func TestAccResourceDataView(t *testing.T) { resource.TestCheckResourceAttr("elasticstack_kibana_data_view.dv", "data_view.field_formats.event_time.id", "date_nanos"), resource.TestCheckResourceAttr("elasticstack_kibana_data_view.dv", "data_view.field_formats.machine.ram.params.pattern", "0,0.[000] b"), resource.TestCheckResourceAttr("elasticstack_kibana_data_view.dv", "data_view.runtime_field_map.runtime_shape_name.script_source", "emit(doc['shape_name'].value)"), + resource.TestCheckResourceAttr("elasticstack_kibana_data_view.dv", "data_view.field_attrs.ingest_failure.custom_label", "error.ingest_failure"), ), }, { @@ -107,6 +108,9 @@ resource "elasticstack_kibana_data_view" "dv" { script_source = "emit(doc['shape_name'].value)" } } + field_attrs = { + ingest_failure = { custom_label = "error.ingest_failure", count = 6 }, + } } }`, indexName, indexName, indexName) } diff --git a/internal/kibana/data_view/schema.go b/internal/kibana/data_view/schema.go index 7aad1dcab..a33e54a62 100644 --- a/internal/kibana/data_view/schema.go +++ b/internal/kibana/data_view/schema.go @@ -604,8 +604,8 @@ type apiRuntimeFieldV0 struct { } type fieldAttr struct { - CustomLabel *string `tfsdk:"customLabel"` - Count *int64 `tfsdk:"count"` + CustomLabel *string `json:"customLabel"` + Count *int64 `json:"count"` } type runtimeField struct { From 9fae22f44e67b6ae104482e3ce798a8070d44eff Mon Sep 17 00:00:00 2001 From: Toby Brain Date: Fri, 2 Feb 2024 10:15:44 +1100 Subject: [PATCH 2/2] Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cb160511..078d11f42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Import all relevant attributes during `elasticstack_fleet_output` import ([#522](https://github.com/elastic/terraform-provider-elasticstack/pull/522)) - Fix issue when setting `override` in `elasticstack_kibana_data_view` resource ([#550](https://github.com/elastic/terraform-provider-elasticstack/pull/550)) - Fixup typos in `elasticstack_elasticsearch_transform` and `elasticstack_kibana_security_role` docs ([#551](https://github.com/elastic/terraform-provider-elasticstack/pull/551)) +- Fix issue when setting `field_attrs` in `elasticstack_kibana_data_view` resource ([#552](https://github.com/elastic/terraform-provider-elasticstack/pull/552)) ## [0.11.0] - 2023-12-12