Skip to content

Don't require elasticsearch for Kibana resources #425

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 3 commits into from
Oct 16, 2023
Merged

Don't require elasticsearch for Kibana resources #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f78706e
Don't require elasticsearch for Kibana resources
tobio Sep 12, 2023
c0d38af
Fix acctest cleanup
tobio Oct 16, 2023
5c0bd7a
Try and decode the space id as a composite it
tobio Oct 16, 2023
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
22 changes: 8 additions & 14 deletions internal/kibana/space.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,7 @@ func resourceSpaceUpsert(ctx context.Context, d *schema.ResourceData, meta inter
}
}

id, diags := client.ID(ctx, spaceResponse.ID)
if diags.HasError() {
return diags
}

d.SetId(id.String())
d.SetId(spaceResponse.ID)

return resourceSpaceRead(ctx, d, meta)
}
Expand All @@ -136,11 +131,10 @@ func resourceSpaceRead(ctx context.Context, d *schema.ResourceData, meta interfa
if diags.HasError() {
return diags
}
compId, diags := clients.CompositeIdFromStr(d.Id())
if diags.HasError() {
return diags
id := d.Id()
if compId, diags := clients.CompositeIdFromStr(id); diags == nil {
id = compId.ResourceId
}
id := compId.ResourceId

kibana, err := client.GetKibanaClient()
if err != nil {
Expand Down Expand Up @@ -184,17 +178,17 @@ func resourceSpaceDelete(ctx context.Context, d *schema.ResourceData, meta inter
if diags.HasError() {
return diags
}
compId, diags := clients.CompositeIdFromStr(d.Id())
if diags.HasError() {
return diags
id := d.Id()
if compId, diags := clients.CompositeIdFromStr(id); diags == nil {
id = compId.ResourceId
}

kibana, err := client.GetKibanaClient()
if err != nil {
return diag.FromErr(err)
}

err = kibana.KibanaSpaces.Delete(compId.ResourceId)
err = kibana.KibanaSpaces.Delete(id)
if err != nil {
return diag.FromErr(err)
}
Expand Down
7 changes: 2 additions & 5 deletions internal/kibana/space_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ func TestAccResourceSpace(t *testing.T) {
func testAccResourceSpaceCreate(id string) string {
return fmt.Sprintf(`
provider "elasticstack" {
elasticsearch {}
kibana {}
}

Expand All @@ -59,7 +58,6 @@ resource "elasticstack_kibana_space" "test_space" {
func testAccResourceSpaceUpdate(id string) string {
return fmt.Sprintf(`
provider "elasticstack" {
elasticsearch {}
kibana {}
}

Expand All @@ -82,19 +80,18 @@ func checkResourceSpaceDestroy(s *terraform.State) error {
if rs.Type != "elasticstack_kibana_space" {
continue
}
compId, _ := clients.CompositeIdFromStr(rs.Primary.ID)

kibanaClient, err := client.GetKibanaClient()
if err != nil {
return err
}
res, err := kibanaClient.KibanaSpaces.Get(compId.ResourceId)
res, err := kibanaClient.KibanaSpaces.Get(rs.Primary.ID)
if err != nil {
return err
}

if res != nil {
return fmt.Errorf("Space (%s) still exists", compId.ResourceId)
return fmt.Errorf("Space (%s) still exists", rs.Primary.ID)
}
}
return nil
Expand Down