feat: Resource sysdig_user is now using a common client

Signed-off-by: Federico Barcelona <[email protected]>

sysdig/common/client.go

@@ -0,0 +1,50 @@
+package common
+
+import (
+	"crypto/tls"
+	"io"
+	"log"
+	"net/http"
+	"net/http/httputil"
+)
+
+type SysdigCommonClient interface {
+	CreateUser(User) (User, error)
+	GetUserById(int) (User, error)
+	DeleteUser(int) error
+	UpdateUser(User) (User, error)
+}
+
+func NewSysdigCommonClient(sysdigAPIToken string, url string, insecure bool) SysdigCommonClient {
+	httpClient := &http.Client{
+		Transport: &http.Transport{
+			TLSClientConfig: &tls.Config{InsecureSkipVerify: insecure},
+		},
+	}
+
+	return &sysdigCommonClient{
+		SysdigAPIToken: sysdigAPIToken,
+		URL:            url,
+		httpClient:     httpClient,
+	}
+}
+
+type sysdigCommonClient struct {
+	SysdigAPIToken string
+	URL            string
+	httpClient     *http.Client
+}
+
+func (client *sysdigCommonClient) doSysdigCommonRequest(method string, url string, payload io.Reader) (*http.Response, error) {
+	request, _ := http.NewRequest(method, url, payload)
+	request.Header.Set("Authorization", "Bearer "+client.SysdigAPIToken)
+	request.Header.Set("Content-Type", "application/json")
+
+	out, _ := httputil.DumpRequestOut(request, true)
+	log.Printf("[DEBUG] %s", string(out))
+	response, error := client.httpClient.Do(request)
+
+	out, _ = httputil.DumpResponse(response, true)
+	log.Printf("[DEBUG] %s", string(out))
+	return response, error
+}

sysdig/common/models.go

@@ -0,0 +1,33 @@
+package common
+
+import (
+	"bytes"
+	"encoding/json"
+	"io"
+)
+
+// -------- User --------
+type User struct {
+	ID         int    `json:"id,omitempty"`
+	Version    int    `json:"version,omitempty"`
+	SystemRole string `json:"systemRole,omitempty"`
+	Email      string `json:"username"`
+	FirstName  string `json:"firstName,omitempty"`
+	LastName   string `json:"lastName,omitempty"`
+}
+
+func (u *User) ToJSON() io.Reader {
+	payload, _ := json.Marshal(*u)
+	return bytes.NewBuffer(payload)
+}
+
+func UserFromJSON(body []byte) User {
+	var result userWrapper
+	json.Unmarshal(body, &result)
+
+	return result.User
+}
+
+type userWrapper struct {
+	User User `json:"user"`
+}

sysdig/secure/users.go → sysdig/common/users.go

@@ -1,4 +1,4 @@
-package secure
+package common
 
 import (
 	"errors"
@@ -7,8 +7,8 @@ import (
 	"net/http"
 )
 
-func (client *sysdigSecureClient) GetUserById(id int) (u User, err error) {
-	response, err := client.doSysdigSecureRequest(http.MethodGet, client.GetUserUrl(id), nil)
+func (client *sysdigCommonClient) GetUserById(id int) (u User, err error) {
+	response, err := client.doSysdigCommonRequest(http.MethodGet, client.GetUserUrl(id), nil)
 	if err != nil {
 		return
 	}
@@ -26,8 +26,8 @@ func (client *sysdigSecureClient) GetUserById(id int) (u User, err error) {
 	return
 }
 
-func (client *sysdigSecureClient) CreateUser(uRequest User) (u User, err error) {
-	response, err := client.doSysdigSecureRequest(http.MethodPost, client.GetUsersUrl(), uRequest.ToJSON())
+func (client *sysdigCommonClient) CreateUser(uRequest User) (u User, err error) {
+	response, err := client.doSysdigCommonRequest(http.MethodPost, client.GetUsersUrl(), uRequest.ToJSON())
 
 	if err != nil {
 		return
@@ -45,8 +45,8 @@ func (client *sysdigSecureClient) CreateUser(uRequest User) (u User, err error)
 	return
 }
 
-func (client *sysdigSecureClient) UpdateUser(uRequest User) (u User, err error) {
-	response, err := client.doSysdigSecureRequest(http.MethodPut, client.GetUserUrl(uRequest.ID), uRequest.ToJSON())
+func (client *sysdigCommonClient) UpdateUser(uRequest User) (u User, err error) {
+	response, err := client.doSysdigCommonRequest(http.MethodPut, client.GetUserUrl(uRequest.ID), uRequest.ToJSON())
 	if err != nil {
 		return
 	}
@@ -63,8 +63,8 @@ func (client *sysdigSecureClient) UpdateUser(uRequest User) (u User, err error)
 	return
 }
 
-func (client *sysdigSecureClient) DeleteUser(id int) error {
-	response, err := client.doSysdigSecureRequest(http.MethodDelete, client.GetUserUrl(id), nil)
+func (client *sysdigCommonClient) DeleteUser(id int) error {
+	response, err := client.doSysdigCommonRequest(http.MethodDelete, client.GetUserUrl(id), nil)
 	if err != nil {
 		return err
 	}
@@ -76,10 +76,10 @@ func (client *sysdigSecureClient) DeleteUser(id int) error {
 	return nil
 }
 
-func (client *sysdigSecureClient) GetUsersUrl() string {
+func (client *sysdigCommonClient) GetUsersUrl() string {
 	return fmt.Sprintf("%s/api/users", client.URL)
 }
 
-func (client *sysdigSecureClient) GetUserUrl(id int) string {
+func (client *sysdigCommonClient) GetUserUrl(id int) string {
 	return fmt.Sprintf("%s/api/users/%d", client.URL, id)
 }

sysdig/resource_sysdig_user.go

@@ -1,7 +1,7 @@
 package sysdig
 
 import (
-	"github.com/draios/terraform-provider-sysdig/sysdig/secure"
+	"github.com/draios/terraform-provider-sysdig/sysdig/common"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"strconv"
 	"time"
@@ -47,7 +47,7 @@ func resourceSysdigUser() *schema.Resource {
 }
 
 func resourceSysdigUserCreate(d *schema.ResourceData, meta interface{}) error {
-	client, err := meta.(SysdigClients).sysdigSecureClient()
+	client, err := meta.(SysdigClients).sysdigCommonClient()
 	if err != nil {
 		return err
 	}
@@ -67,7 +67,7 @@ func resourceSysdigUserCreate(d *schema.ResourceData, meta interface{}) error {
 
 // Retrieves the information of a resource form the file and loads it in Terraform
 func resourceSysdigUserRead(d *schema.ResourceData, meta interface{}) error {
-	client, err := meta.(SysdigClients).sysdigSecureClient()
+	client, err := meta.(SysdigClients).sysdigCommonClient()
 	if err != nil {
 		return err
 	}
@@ -90,7 +90,7 @@ func resourceSysdigUserRead(d *schema.ResourceData, meta interface{}) error {
 }
 
 func resourceSysdigUserUpdate(d *schema.ResourceData, meta interface{}) error {
-	client, err := meta.(SysdigClients).sysdigSecureClient()
+	client, err := meta.(SysdigClients).sysdigCommonClient()
 	if err != nil {
 		return err
 	}
@@ -106,7 +106,7 @@ func resourceSysdigUserUpdate(d *schema.ResourceData, meta interface{}) error {
 }
 
 func resourceSysdigUserDelete(d *schema.ResourceData, meta interface{}) error {
-	client, err := meta.(SysdigClients).sysdigSecureClient()
+	client, err := meta.(SysdigClients).sysdigCommonClient()
 	if err != nil {
 		return err
 	}
@@ -116,8 +116,8 @@ func resourceSysdigUserDelete(d *schema.ResourceData, meta interface{}) error {
 	return client.DeleteUser(id)
 }
 
-func userFromResourceData(d *schema.ResourceData) (u secure.User) {
-	u = secure.User{
+func userFromResourceData(d *schema.ResourceData) (u common.User) {
+	u = common.User{
 		SystemRole: d.Get("system_role").(string),
 		Email:      d.Get("email").(string),
 		FirstName:  d.Get("first_name").(string),

sysdig/resource_sysdig_user_test.go

@@ -15,8 +15,10 @@ func TestAccUser(t *testing.T) {
 
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
-			if v := os.Getenv("SYSDIG_SECURE_API_TOKEN"); v == "" {
-				t.Fatal("SYSDIG_SECURE_API_TOKEN must be set for acceptance tests")
+			monitor := os.Getenv("SYSDIG_MONITOR_API_TOKEN")
+			secure := os.Getenv("SYSDIG_SECURE_API_TOKEN")
+			if monitor == "" && secure == "" {
+				t.Fatal("either SYSDIG_MONITOR_API_TOKEN or SYSDIG_SECURE_API_TOKEN must be set for acceptance tests")
 			}
 		},
 		Providers: map[string]terraform.ResourceProvider{

sysdig/secure/client.go

@@ -25,11 +25,6 @@ type SysdigSecureClient interface {
 	DeleteNotificationChannel(int) error
 	UpdateNotificationChannel(NotificationChannel) (NotificationChannel, error)
 
-	CreateUser(User) (User, error)
-	GetUserById(int) (User, error)
-	DeleteUser(int) error
-	UpdateUser(User) (User, error)
-
 	CreateTeam(Team) (Team, error)
 	GetTeamById(int) (Team, error)
 	DeleteTeam(int) error

sysdig/secure/models.go

@@ -253,32 +253,6 @@ func MacroFromJSON(body []byte) (macro Macro, err error) {
 	return
 }
 
-// -------- User --------
-type User struct {
-	ID         int    `json:"id,omitempty"`
-	Version    int    `json:"version,omitempty"`
-	SystemRole string `json:"systemRole,omitempty"`
-	Email      string `json:"username"`
-	FirstName  string `json:"firstName,omitempty"`
-	LastName   string `json:"lastName,omitempty"`
-}
-
-func (u *User) ToJSON() io.Reader {
-	payload, _ := json.Marshal(*u)
-	return bytes.NewBuffer(payload)
-}
-
-func UserFromJSON(body []byte) User {
-	var result userWrapper
-	json.Unmarshal(body, &result)
-
-	return result.User
-}
-
-type userWrapper struct {
-	User User `json:"user"`
-}
-
 // -------- Team --------
 type Team struct {
 	ID                  int         `json:"id,omitempty"`

sysdig/sysdig_clients.go

@@ -2,6 +2,7 @@ package sysdig
 
 import (
 	"errors"
+	"github.com/draios/terraform-provider-sysdig/sysdig/common"
 	"github.com/draios/terraform-provider-sysdig/sysdig/monitor"
 	"github.com/draios/terraform-provider-sysdig/sysdig/secure"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
@@ -11,14 +12,17 @@ import (
 type SysdigClients interface {
 	sysdigMonitorClient() (monitor.SysdigMonitorClient, error)
 	sysdigSecureClient() (secure.SysdigSecureClient, error)
+	sysdigCommonClient() (common.SysdigCommonClient, error)
 }
 
 type sysdigClients struct {
 	d             *schema.ResourceData
 	onceMonitor   sync.Once
 	onceSecure    sync.Once
+	onceCommon    sync.Once
 	monitorClient monitor.SysdigMonitorClient
 	secureClient  secure.SysdigSecureClient
+	commonClient  common.SysdigCommonClient
 }
 
 func (c *sysdigClients) sysdigMonitorClient() (m monitor.SysdigMonitorClient, err error) {
@@ -56,3 +60,33 @@ func (c *sysdigClients) sysdigSecureClient() (s secure.SysdigSecureClient, err e
 
 	return c.secureClient, nil
 }
+
+func (c *sysdigClients) sysdigCommonClient() (co common.SysdigCommonClient, err error) {
+	monitorAPIToken := c.d.Get("sysdig_monitor_api_token").(string)
+	secureAPIToken := c.d.Get("sysdig_secure_api_token").(string)
+
+	if monitorAPIToken == "" && secureAPIToken == "" {
+		err = errors.New("sysdig monitor and sysdig secure tokens not provided")
+		return
+	}
+
+	commonAPIToken := monitorAPIToken
+	commonURL := c.d.Get("sysdig_monitor_url").(string)
+	commonInsecure := c.d.Get("sysdig_monitor_insecure_tls").(bool)
+	if monitorAPIToken == "" {
+		commonAPIToken = secureAPIToken
+		commonURL = c.d.Get("sysdig_secure_url").(string)
+		commonInsecure = c.d.Get("sysdig_secure_insecure_tls").(bool)
+	}
+
+	c.onceCommon.Do(func() {
+		c.commonClient = common.NewSysdigCommonClient(
+			commonAPIToken,
+			commonURL,
+			commonInsecure,
+		)
+	})
+
+	return c.commonClient, nil
+
+}