Skip to content

Fix setting ID for Fleet outputs and servers #666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 17, 2024
Merged

Fix setting ID for Fleet outputs and servers #666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c8cd2d
Fix setting ID for Fleet outputs and servers
GeorgeGkinis Jun 16, 2024
95638ff
Update CHANGELOG
GeorgeGkinis Jun 17, 2024
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## [Unreleased]

- Fix setting `id` for Fleet outputs and servers ([#666](https://github.com/elastic/terraform-provider-elasticstack/pull/666))

## [0.11.4] - 2024-06-13

### Breaking changes
Expand Down
9 changes: 5 additions & 4 deletions internal/fleet/fleet_server_host_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,15 @@ func resourceFleetServerHostCreate(ctx context.Context, d *schema.ResourceData,
return diags
}

if id := d.Get("host_id").(string); id != "" {
d.SetId(id)
}

req := fleetapi.PostFleetServerHostsJSONRequestBody{
Name: d.Get("name").(string),
}

if id := d.Get("host_id").(string); id != "" {
d.SetId(id)
req.Id = &id
}

if value := d.Get("hosts").([]interface{}); len(value) > 0 {
for _, v := range value {
if vStr, ok := v.(string); ok && vStr != "" {
Expand Down
4 changes: 4 additions & 0 deletions internal/fleet/fleet_server_host_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ func TestAccResourceFleetServerHost(t *testing.T) {
Config: testAccResourceFleetServerHostCreate(policyName),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("elasticstack_fleet_server_host.test_host", "name", fmt.Sprintf("FleetServerHost %s", policyName)),
resource.TestCheckResourceAttr("elasticstack_fleet_server_host.test_host", "id", "fleet-server-host-id"),
resource.TestCheckResourceAttr("elasticstack_fleet_server_host.test_host", "default", "false"),
resource.TestCheckResourceAttr("elasticstack_fleet_server_host.test_host", "hosts.0", "https://fleet-server:8220"),
),
Expand All @@ -39,6 +40,7 @@ func TestAccResourceFleetServerHost(t *testing.T) {
Config: testAccResourceFleetServerHostUpdate(policyName),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("elasticstack_fleet_server_host.test_host", "name", fmt.Sprintf("Updated FleetServerHost %s", policyName)),
resource.TestCheckResourceAttr("elasticstack_fleet_server_host.test_host", "id", "fleet-server-host-id"),
resource.TestCheckResourceAttr("elasticstack_fleet_server_host.test_host", "default", "false"),
resource.TestCheckResourceAttr("elasticstack_fleet_server_host.test_host", "hosts.0", "https://fleet-server:8220"),
),
Expand All @@ -56,6 +58,7 @@ provider "elasticstack" {

resource "elasticstack_fleet_server_host" "test_host" {
name = "%s"
host_id = "fleet-server-host-id"
default = false
hosts = [
"https://fleet-server:8220"
Expand All @@ -73,6 +76,7 @@ provider "elasticstack" {

resource "elasticstack_fleet_server_host" "test_host" {
name = "%s"
host_id = "fleet-server-host-id"
default = false
hosts = [
"https://fleet-server:8220"
Expand Down
6 changes: 6 additions & 0 deletions internal/fleet/output_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@ func resourceOutputCreateElasticsearch(ctx context.Context, d *schema.ResourceDa
if hosts != nil {
reqData.Hosts = &hosts
}
if value, ok := d.Get("output_id").(string); ok && value != "" {
reqData.Id = &value
}
if value := d.Get("default_integrations").(bool); value {
reqData.IsDefault = &value
}
Expand Down Expand Up @@ -192,6 +195,9 @@ func resourceOutputCreateLogstash(ctx context.Context, d *schema.ResourceData, m
}
}
reqData.Hosts = hosts
if value, ok := d.Get("output_id").(string); ok && value != "" {
reqData.Id = &value
}
if value := d.Get("default_integrations").(bool); value {
reqData.IsDefault = &value
}
Expand Down
8 changes: 8 additions & 0 deletions internal/fleet/output_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ func TestAccResourceOutputElasticsearch(t *testing.T) {
Config: testAccResourceOutputCreateElasticsearch(policyName),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("elasticstack_fleet_output.test_output", "name", fmt.Sprintf("Elasticsearch Output %s", policyName)),
resource.TestCheckResourceAttr("elasticstack_fleet_output.test_output", "id", "elasticsearch-output"),
resource.TestCheckResourceAttr("elasticstack_fleet_output.test_output", "type", "elasticsearch"),
resource.TestCheckResourceAttr("elasticstack_fleet_output.test_output", "config_yaml", "\"ssl.verification_mode\": \"none\"\n"),
resource.TestCheckResourceAttr("elasticstack_fleet_output.test_output", "default_integrations", "false"),
Expand All @@ -42,6 +43,7 @@ func TestAccResourceOutputElasticsearch(t *testing.T) {
Config: testAccResourceOutputUpdateElasticsearch(policyName),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("elasticstack_fleet_output.test_output", "name", fmt.Sprintf("Updated Elasticsearch Output %s", policyName)),
resource.TestCheckResourceAttr("elasticstack_fleet_output.test_output", "id", "elasticsearch-output"),
resource.TestCheckResourceAttr("elasticstack_fleet_output.test_output", "type", "elasticsearch"),
resource.TestCheckResourceAttr("elasticstack_fleet_output.test_output", "config_yaml", "\"ssl.verification_mode\": \"none\"\n"),
resource.TestCheckResourceAttr("elasticstack_fleet_output.test_output", "default_integrations", "false"),
Expand Down Expand Up @@ -72,6 +74,7 @@ func TestAccResourceOutputLogstash(t *testing.T) {
Config: testAccResourceOutputCreateLogstash(policyName),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("elasticstack_fleet_output.test_output", "name", fmt.Sprintf("Logstash Output %s", policyName)),
resource.TestCheckResourceAttr("elasticstack_fleet_output.test_output", "id", "logstash-output"),
resource.TestCheckResourceAttr("elasticstack_fleet_output.test_output", "type", "logstash"),
resource.TestCheckResourceAttr("elasticstack_fleet_output.test_output", "config_yaml", "\"ssl.verification_mode\": \"none\"\n"),
resource.TestCheckResourceAttr("elasticstack_fleet_output.test_output", "default_integrations", "false"),
Expand All @@ -87,6 +90,7 @@ func TestAccResourceOutputLogstash(t *testing.T) {
Config: testAccResourceOutputLogstashUpdate(policyName),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("elasticstack_fleet_output.test_output", "name", fmt.Sprintf("Updated Logstash Output %s", policyName)),
resource.TestCheckResourceAttr("elasticstack_fleet_output.test_output", "id", "logstash-output"),
resource.TestCheckResourceAttr("elasticstack_fleet_output.test_output", "type", "logstash"),
resource.TestCheckResourceAttr("elasticstack_fleet_output.test_output", "config_yaml", "\"ssl.verification_mode\": \"none\"\n"),
resource.TestCheckResourceAttr("elasticstack_fleet_output.test_output", "default_integrations", "false"),
Expand All @@ -110,6 +114,7 @@ provider "elasticstack" {

resource "elasticstack_fleet_output" "test_output" {
name = "%s"
output_id = "elasticsearch-output"
type = "elasticsearch"
config_yaml = yamlencode({
"ssl.verification_mode" : "none"
Expand All @@ -132,6 +137,7 @@ provider "elasticstack" {

resource "elasticstack_fleet_output" "test_output" {
name = "%s"
output_id = "elasticsearch-output"
type = "elasticsearch"
config_yaml = yamlencode({
"ssl.verification_mode" : "none"
Expand All @@ -156,6 +162,7 @@ provider "elasticstack" {
resource "elasticstack_fleet_output" "test_output" {
name = "%s"
type = "logstash"
output_id = "logstash-output"
config_yaml = yamlencode({
"ssl.verification_mode" : "none"
})
Expand Down Expand Up @@ -183,6 +190,7 @@ provider "elasticstack" {
resource "elasticstack_fleet_output" "test_output" {
name = "%s"
type = "logstash"
output_id = "logstash-output"
config_yaml = yamlencode({
"ssl.verification_mode" : "none"
})
Expand Down