Merge pull request #9 from tsouza/thiago/fleet_resources

tsouza · Apr 30, 2021 · 4bdf0fe · 4bdf0fe
2 parents 45ea6a9 + ed6a41b
commit 4bdf0fe
Show file tree

Hide file tree

Showing 31 changed files with 15,525 additions and 124 deletions.
diff --git a/go.mod b/go.mod
@@ -8,6 +8,7 @@ require (
 	github.com/aws/aws-sdk-go v1.38.28 // indirect
 	github.com/elastic/go-elasticsearch/v7 v7.12.0
 	github.com/fatih/color v1.10.0 // indirect
+	github.com/go-resty/resty/v2 v2.6.0
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-hclog v0.16.0 // indirect

diff --git a/go.sum b/go.sum
diff --git a/internal/provider/provider.go b/internal/provider/provider.go
@@ -5,6 +5,8 @@ import (
 
 	"github.com/elastic/go-elasticsearch/v7"
 
+	"github.com/go-resty/resty/v2"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -35,6 +37,14 @@ func newSchema() map[string]*schema.Schema {
 				"ELASTICSEARCH_URL", "",
 			),
 		},
+		"kibana_url": {
+			Description: "Kibana URL to use for API Authentication.",
+			Type:        schema.TypeString,
+			Required:    true,
+			DefaultFunc: schema.EnvDefaultFunc(
+				"KIBANA_URL", "",
+			),
+		},
 		"username": {
 			Description: "Username to use for API authentication.",
 			Type:        schema.TypeString,
@@ -60,9 +70,10 @@ func New(version string) func() *schema.Provider {
 		p := &schema.Provider{
 			Schema: newSchema(),
 			ResourcesMap: map[string]*schema.Resource{
-				"elasticstack_auth_user":         resourceElasticstackAuthUser(),
-				"elasticstack_auth_role":         resourceElasticstackAuthRole(),
-				"elasticstack_auth_role_mapping": resourceElasticstackAuthRoleMapping(),
+				"elasticstack_auth_user":          resourceElasticstackAuthUser(),
+				"elasticstack_auth_role":          resourceElasticstackAuthRole(),
+				"elasticstack_auth_role_mapping":  resourceElasticstackAuthRoleMapping(),
+				"elasticstack_fleet_agent_policy": resourceElasticstackFleetAgentPolicy(),
 			},
 		}
 
@@ -72,14 +83,22 @@ func New(version string) func() *schema.Provider {
 	}
 }
 
+type apiClient struct {
+	es *elasticsearch.Client
+	k  *resty.Client
+}
+
 func configure(version string, p *schema.Provider) func(context.Context, *schema.ResourceData) (interface{}, diag.Diagnostics) {
 	return func(ctx context.Context, d *schema.ResourceData) (interface{}, diag.Diagnostics) {
 		var diags diag.Diagnostics
 
+		username := d.Get("username").(string)
+		password := d.Get("password").(string)
+
 		es, err := elasticsearch.NewClient(elasticsearch.Config{
 			Addresses: []string{d.Get("elasticsearch_url").(string)},
-			Username:  d.Get("username").(string),
-			Password:  d.Get("password").(string),
+			Username:  username,
+			Password:  password,
 		})
 		if err != nil {
 			diags = append(diags, diag.Diagnostic{
@@ -89,6 +108,20 @@ func configure(version string, p *schema.Provider) func(context.Context, *schema
 			})
 		}
 
-		return es, diags
+		k := resty.New().
+			SetHeader("kbn-xsrf", "true").
+			SetBasicAuth(username, password).
+			SetHostURL(d.Get("kibana_url").(string))
+
+		_, err = k.R().Get("/")
+		if err != nil {
+			diags = append(diags, diag.Diagnostic{
+				Severity: diag.Error,
+				Summary:  "Unable to create Kibana client",
+				Detail:   err.Error(),
+			})
+		}
+
+		return apiClient{es, k}, diags
 	}
 }
diff --git a/internal/provider/provider_test.go b/internal/provider/provider_test.go
@@ -24,6 +24,9 @@ func TestProvider(t *testing.T) {
 }
 
 func testAccPreCheck(t *testing.T) {
+	if err := os.Getenv("KIBANA_URL"); err == "" {
+		t.Fatal("KIBANA_URL must be set for acceptance tests")
+	}
 	if err := os.Getenv("ELASTICSEARCH_URL"); err == "" {
 		t.Fatal("ELASTICSEARCH_URL must be set for acceptance tests")
 	}

diff --git a/internal/provider/resource_elasticstack_auth_role.go b/internal/provider/resource_elasticstack_auth_role.go
@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/elastic/go-elasticsearch/v7"
 	"github.com/elastic/go-elasticsearch/v7/esapi"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -183,7 +182,7 @@ func parseRoleData(d *schema.ResourceData) (esapiRoleData, error) {
 }
 
 func resourceElasticstackAuthRoleCreate(d *schema.ResourceData, meta interface{}) error {
-	es := meta.(*elasticsearch.Client)
+	es := meta.(apiClient).es
 
 	roleData, err := parseRoleData(d)
 	if err != nil {
@@ -214,7 +213,7 @@ func resourceElasticstackAuthRoleCreate(d *schema.ResourceData, meta interface{}
 }
 
 func resourceElasticstackAuthRoleRead(d *schema.ResourceData, meta interface{}) error {
-	es := meta.(*elasticsearch.Client)
+	es := meta.(apiClient).es
 
 	name := d.Get("name").(string)
 
@@ -291,7 +290,7 @@ func resourceElasticstackAuthRoleUpdate(d *schema.ResourceData, meta interface{}
 }
 
 func resourceElasticstackAuthRoleDelete(d *schema.ResourceData, meta interface{}) error {
-	es := meta.(*elasticsearch.Client)
+	es := meta.(apiClient).es
 
 	name := d.Get("name").(string)
 	req := esapi.SecurityDeleteRoleRequest{

diff --git a/internal/provider/resource_elasticstack_auth_user.go b/internal/provider/resource_elasticstack_auth_user.go
@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/elastic/go-elasticsearch/v7"
 	"github.com/elastic/go-elasticsearch/v7/esapi"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -89,7 +88,7 @@ func parseUserResourceData(d *schema.ResourceData) (esapiUserData, error) {
 }
 
 func resourceElasticstackAuthUserCreate(d *schema.ResourceData, meta interface{}) error {
-	es := meta.(*elasticsearch.Client)
+	es := meta.(apiClient).es
 
 	userData, err := parseUserResourceData(d)
 	if err != nil {
@@ -120,7 +119,7 @@ func resourceElasticstackAuthUserCreate(d *schema.ResourceData, meta interface{}
 }
 
 func resourceElasticstackAuthUserRead(d *schema.ResourceData, meta interface{}) error {
-	es := meta.(*elasticsearch.Client)
+	es := meta.(apiClient).es
 
 	username := d.Get("username").(string)
 
@@ -164,7 +163,7 @@ func resourceElasticstackAuthUserUpdate(d *schema.ResourceData, meta interface{}
 }
 
 func resourceElasticstackAuthUserDelete(d *schema.ResourceData, meta interface{}) error {
-	es := meta.(*elasticsearch.Client)
+	es := meta.(*apiClient).es
 
 	username := d.Get("username").(string)
 	req := esapi.SecurityDeleteUserRequest{

diff --git a/internal/provider/resource_elasticstack_auth_user_test.go b/internal/provider/resource_elasticstack_auth_user_test.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/elastic/go-elasticsearch/v7"
 	"github.com/elastic/go-elasticsearch/v7/esapi"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
@@ -28,7 +27,7 @@ func TestAccElasticstackAuthUserBasic(t *testing.T) {
 }
 
 func testAccCheckElasticstackAuthUserDestroy(s *terraform.State) error {
-	es := testAccProvider.Meta().(*elasticsearch.Client)
+	es := testAccProvider.Meta().(*apiClient).es
 
 	for _, rs := range s.RootModule().Resources {
 		if rs.Type != "elasticstack_auth_user" {