Add solution field support to Kibana space resource and data source

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

Author: Copilot

internal/kibana/space.go

@@ -61,6 +61,12 @@ func ResourceSpace() *schema.Resource {
 			Optional:     true,
 			ValidateFunc: validation.StringMatch(regexp.MustCompile("^data:image/"), "must be a valid data-URL encoded image"),
 		},
+		"solution": {
+			Description:  "The solution view for the space. Valid options are `security`, `oblt`, `es`, or `classic`.",
+			Type:         schema.TypeString,
+			Optional:     true,
+			ValidateFunc: validation.StringInSlice([]string{"security", "oblt", "es", "classic"}, false),
+		},
 	}
 
 	return &schema.Resource{
@@ -120,6 +126,10 @@ func resourceSpaceUpsert(ctx context.Context, d *schema.ResourceData, meta inter
 		space.ImageURL = imageUrl.(string)
 	}
 
+	if solution, ok := d.GetOk("solution"); ok {
+		space.Solution = solution.(string)
+	}
+
 	var spaceResponse *kbapi.KibanaSpace
 
 	if d.IsNewResource() {
@@ -182,6 +192,9 @@ func resourceSpaceRead(ctx context.Context, d *schema.ResourceData, meta interfa
 	if err := d.Set("color", space.Color); err != nil {
 		return diag.FromErr(err)
 	}
+	if err := d.Set("solution", space.Solution); err != nil {
+		return diag.FromErr(err)
+	}
 
 	return diags
 }

internal/kibana/space_test.go

@@ -39,6 +39,15 @@ func TestAccResourceSpace(t *testing.T) {
 					resource.TestCheckResourceAttrSet("elasticstack_kibana_space.test_space", "image_url"),
 				),
 			},
+			{
+				Config: testAccResourceSpaceWithSolution(spaceId),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("elasticstack_kibana_space.test_space", "space_id", spaceId),
+					resource.TestCheckResourceAttr("elasticstack_kibana_space.test_space", "name", fmt.Sprintf("Solution %s", spaceId)),
+					resource.TestCheckResourceAttr("elasticstack_kibana_space.test_space", "description", "Test Space with Solution"),
+					resource.TestCheckResourceAttr("elasticstack_kibana_space.test_space", "solution", "security"),
+				),
+			},
 			{
 				Config: testAccResourceSpaceCreate(spaceId),
 				Check: resource.ComposeTestCheckFunc(
@@ -83,6 +92,21 @@ resource "elasticstack_kibana_space" "test_space" {
 	`, id, fmt.Sprintf("Updated %s", id))
 }
 
+func testAccResourceSpaceWithSolution(id string) string {
+	return fmt.Sprintf(`
+provider "elasticstack" {
+  kibana {}
+}
+
+resource "elasticstack_kibana_space" "test_space" {
+  space_id    = "%s"
+  name        = "%s"
+  description = "Test Space with Solution"
+  solution    = "security"
+}
+	`, id, fmt.Sprintf("Solution %s", id))
+}
+
 func checkResourceSpaceDestroy(s *terraform.State) error {
 	client, err := clients.NewAcceptanceTestingClient()
 	if err != nil {

internal/kibana/spaces/models.go

@@ -17,4 +17,5 @@ type model struct {
 	Initials         types.String `tfsdk:"initials"`
 	Color            types.String `tfsdk:"color"`
 	ImageUrl         types.String `tfsdk:"image_url"`
+	Solution         types.String `tfsdk:"solution"`
 }

internal/kibana/spaces/read.go

@@ -27,6 +27,7 @@ func (d *dataSource) Read(ctx context.Context, req datasource.ReadRequest, resp
 			Initials:    types.StringValue(space.Initials),
 			Color:       types.StringValue(space.Color),
 			ImageUrl:    types.StringValue(space.ImageURL),
+			Solution:    types.StringValue(space.Solution),
 		}
 
 		disabledFeatures, diags := types.ListValueFrom(ctx, types.StringType, space.DisabledFeatures)

internal/kibana/spaces/schema.go

@@ -51,6 +51,10 @@ func (d *dataSource) Schema(_ context.Context, _ datasource.SchemaRequest, resp
 							Description: "The data-URL encoded image to display in the space avatar.",
 							Optional:    true,
 						},
+						"solution": schema.StringAttribute{
+							Description: "The solution view for the space. Valid options are `security`, `oblt`, `es`, or `classic`.",
+							Optional:    true,
+						},
 					},
 				},
 			},

libs/go-kibana-rest/kbapi/api.kibana_spaces.go

@@ -23,6 +23,7 @@ type KibanaSpace struct {
 	Initials         string   `json:"initials,omitempty"`
 	Color            string   `json:"color,omitempty"`
 	ImageURL         string   `json:"imageUrl,omitempty"`
+	Solution         string   `json:"solution,omitempty"`
 }
 
 // KibanaSpaces is the list of KibanaSpace object

libs/go-kibana-rest/kbapi/api.kibana_spaces_test.go

@@ -22,6 +22,7 @@ func (s *KBAPITestSuite) TestKibanaSpaces() {
 		ID:          "test",
 		Name:        "test",
 		Description: "My test",
+		Solution:    "security",
 	}
 	kibanaSpace, err = s.KibanaSpaces.Create(kibanaSpace)
 	assert.NoError(s.T(), err)