Skip to content

Commit

Permalink
use id not email as identifier
Browse files Browse the repository at this point in the history
  • Loading branch information
@fceller
fceller committed Mar 16, 2022
1 parent 9c184c9 commit 91d91e6
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 24 deletions.
35 changes: 21 additions & 14 deletions client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ type User struct {
Department string `json:"dept,omitempty"`
JobTitle string `json:"job_title,omitempty"`
Location string `json:"location,omitempty"`
Id string `json:"id,omitempty"`
}

type UserInfo struct {
Id string `json:"id,omitempty"`
}

type PhoneNumber struct {
Expand All @@ -55,22 +60,24 @@ func NewClient(token string, timeoutMinutes int) *Client {
}
}

func (c *Client) NewUser(user *User) error {
func (c *Client) NewUser(user *User) (string, error) {
userInfo, err := json.Marshal(user)
if err != nil {
return err
return "", err
}
body := strings.NewReader(fmt.Sprintf("{\"action\":\"create\",\"user_info\":" + string(userInfo) + "}"))
_, err = c.httpRequest("POST", body, "")
res, err := c.httpRequest("POST", body, "")
if err != nil {
log.Println("[CREATE ERROR]: ", err)
return err
return "", err
}
return nil
created := &UserInfo{}
err = json.Unmarshal(res, &created)
return created.Id, nil
}

func (c *Client) GetUser(email string) (*User, error) {
body, err := c.httpRequest("GET", &strings.Reader{}, fmt.Sprintf("/%v", email))
func (c *Client) GetUser(id string) (*User, error) {
body, err := c.httpRequest("GET", &strings.Reader{}, fmt.Sprintf("/%v", id))
if err != nil {
log.Println("[READ ERROR]: ", err)
return nil, err
Expand All @@ -84,26 +91,26 @@ func (c *Client) GetUser(email string) (*User, error) {
return user, nil
}

func (c *Client) UpdateUser(email string, user *User) error {
func (c *Client) UpdateUser(id string, user *User) error {
userInfo, err := json.Marshal(user)
if err != nil {
return err
}
body := strings.NewReader(string(userInfo))
_, err = c.httpRequest("PATCH", body, fmt.Sprintf("/%v", email))
_, err = c.httpRequest("PATCH", body, fmt.Sprintf("/%v", id))
if err != nil {
log.Println("[UPDATE ERROR]: ", err)
return err
}
return nil
}

func (c *Client) DeleteUser(email, status string) error {
func (c *Client) DeleteUser(id, status string) error {
var err error
if status == "pending" {
_, err = c.httpRequest("DELETE", &strings.Reader{}, fmt.Sprintf("/%s", email))
_, err = c.httpRequest("DELETE", &strings.Reader{}, fmt.Sprintf("/%s", id))
} else {
_, err = c.httpRequest("DELETE", &strings.Reader{}, fmt.Sprintf("/%s?action=delete", email))
_, err = c.httpRequest("DELETE", &strings.Reader{}, fmt.Sprintf("/%s?action=delete", id))
}
if err != nil {
log.Println("[DELETE ERROR]: ", err)
Expand All @@ -112,10 +119,10 @@ func (c *Client) DeleteUser(email, status string) error {
return nil
}

func (c *Client) ChangeUserStatus(email, action string) error {
func (c *Client) ChangeUserStatus(id, action string) error {
action = fmt.Sprintf("{\"action\":\"%s\"}", action)
body := strings.NewReader(action)
_, err := c.httpRequest("PUT", body, fmt.Sprintf("/%s/status", email))
_, err := c.httpRequest("PUT", body, fmt.Sprintf("/%s/status", id))
if err != nil {
log.Println("[DEACTIVATE/ACTIVATE ERROR]: ", err)
return err
Expand Down
23 changes: 13 additions & 10 deletions zoom/resource_user.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,36 +184,40 @@ func resourceUserCreate(ctx context.Context, d *schema.ResourceData, m interface
if v, ok := d.GetOk("license_type"); ok {
user.Type = v.(int)
}
var id string
retryErr := resource.Retry(time.Duration(apiClient.TimeoutMinutes)*time.Minute, func() *resource.RetryError {
if err := apiClient.NewUser(&user); err != nil {
knownId, err := apiClient.NewUser(&user)
if err != nil {
if apiClient.IsRetry(err) {
return resource.RetryableError(err)
}
return resource.NonRetryableError(err)
}
id = knownId
return nil
})
if retryErr != nil {
time.Sleep(2 * time.Second)
return diag.FromErr(retryErr)
}
d.SetId(user.Email)
d.SetId(id)
resourceUserRead(ctx, d, m)
return diags
}

func resourceUserRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
var diags diag.Diagnostics
apiClient := m.(*client.Client)
email := d.Id()
id := d.Id()
retryErr := resource.Retry(time.Duration(apiClient.TimeoutMinutes)*time.Minute, func() *resource.RetryError {
user, err := apiClient.GetUser(email)
user, err := apiClient.GetUser(id)
if err != nil {
if apiClient.IsRetry(err) {
return resource.RetryableError(err)
}
return resource.NonRetryableError(err)
}
d.Set("id", id)
d.Set("email", user.Email)
d.Set("first_name", user.FirstName)
d.Set("last_name", user.LastName)
Expand Down Expand Up @@ -286,7 +290,6 @@ func resourceUserUpdate(ctx context.Context, d *schema.ResourceData, m interface
old, _ := d.GetChange("status")
oldStatus := old.(string)
status := v.(string)

if oldStatus != "pending" || status == "inactive" {
var action string
if status == "active" {
Expand Down Expand Up @@ -440,9 +443,9 @@ func resourceUserUpdate(ctx context.Context, d *schema.ResourceData, m interface
func resourceUserDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
var diags diag.Diagnostics
apiClient := m.(*client.Client)
email := d.Id()
id := d.Id()
retryErr := resource.Retry(time.Duration(apiClient.TimeoutMinutes)*time.Minute, func() *resource.RetryError {
if err := apiClient.DeleteUser(email, d.Get("status").(string)); err != nil {
if err := apiClient.DeleteUser(id, d.Get("status").(string)); err != nil {
if apiClient.IsRetry(err) {
return resource.RetryableError(err)
}
Expand All @@ -460,16 +463,16 @@ func resourceUserDelete(ctx context.Context, d *schema.ResourceData, m interface

func resourceUserImporter(ctx context.Context, d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
apiClient := m.(*client.Client)
email := d.Id()
id := d.Id()
retryErr := resource.Retry(time.Duration(apiClient.TimeoutMinutes)*time.Minute, func() *resource.RetryError {
user, err := apiClient.GetUser(email)
user, err := apiClient.GetUser(id)
if err != nil {
if apiClient.IsRetry(err) {
return resource.RetryableError(err)
}
return resource.NonRetryableError(err)
}
d.Set("email", user.Email)
d.Set("id", user.Id)
d.Set("first_name", user.FirstName)
d.Set("last_name", user.LastName)
d.Set("license_type", user.Type)
Expand Down

0 comments on commit 91d91e6

Please sign in to comment.