From 93833186c0c1f0c1a9082403e9fa94288192e465 Mon Sep 17 00:00:00 2001 From: Stijn Holzhauer Date: Wed, 12 Feb 2025 18:30:23 +0100 Subject: [PATCH 1/2] adding fleet_endpoint to integrations_server --- .../flatteners_integrations_server.go | 9 +++++++++ .../deploymentdatasource/schema_integrations_server.go | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/ec/ecdatasource/deploymentdatasource/flatteners_integrations_server.go b/ec/ecdatasource/deploymentdatasource/flatteners_integrations_server.go index 3201ea6b1..97be65afc 100644 --- a/ec/ecdatasource/deploymentdatasource/flatteners_integrations_server.go +++ b/ec/ecdatasource/deploymentdatasource/flatteners_integrations_server.go @@ -76,6 +76,15 @@ func flattenIntegrationsServerResources(ctx context.Context, in []*models.Integr if res.Info.Metadata != nil { model.HttpEndpoint, model.HttpsEndpoint = converters.ExtractEndpointsToTypes(res.Info.Metadata) } + + // Set the fleet endpoint if available + if res.Info.Metadata.ServicesUrls != nil { + for _, service := range res.Info.Metadata.ServicesUrls { + if service.Service != nil && *service.Service == "fleet" { + model.FleetEndpoint = types.StringValue(*service.URL) + } + } + } } result = append(result, model) diff --git a/ec/ecdatasource/deploymentdatasource/schema_integrations_server.go b/ec/ecdatasource/deploymentdatasource/schema_integrations_server.go index 71a2bcd40..de203754b 100644 --- a/ec/ecdatasource/deploymentdatasource/schema_integrations_server.go +++ b/ec/ecdatasource/deploymentdatasource/schema_integrations_server.go @@ -65,6 +65,10 @@ func integrationsServerResourceInfoSchema() schema.Attribute { Computed: true, }, "topology": integrationsServerTopologySchema(), + "fleet_endpoint": schema.StringAttribute{ + Description: "HTTPS endpoint for the fleet.", + Computed: true, + }, }, }, } @@ -116,6 +120,7 @@ type integrationsServerResourceInfoModelV0 struct { Status types.String `tfsdk:"status"` Version types.String `tfsdk:"version"` Topology types.List `tfsdk:"topology"` //< integrationsServerTopologyModelV0 + FleetEndpoint types.String `tfsdk:"fleet_endpoint"` } type integrationsServerTopologyModelV0 struct { From 1fd5536c091e0cbc091a0d338c95d958020077f1 Mon Sep 17 00:00:00 2001 From: Stijn Holzhauer Date: Wed, 12 Feb 2025 18:42:11 +0100 Subject: [PATCH 2/2] adding doc line --- docs/data-sources/deployment.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/data-sources/deployment.md b/docs/data-sources/deployment.md index ab9c40c82..1dd6f08e4 100644 --- a/docs/data-sources/deployment.md +++ b/docs/data-sources/deployment.md @@ -156,6 +156,7 @@ Read-Only: - `status` (String) Resource kind status (for example, "started", "stopped", etc). - `topology` (Attributes List) Node topology element definition. (see [below for nested schema](#nestedatt--integrations_server--topology)) - `version` (String) Elastic stack version. +- `fleet_endpoint` (String) The endpoint for the Fleet server ### Nested Schema for `integrations_server.topology`