From ee0cccaf71a8b7cf51940fcc47b13de9cd12ab55 Mon Sep 17 00:00:00 2001
From: Ilia Medvedev <ilia.medvedev@codefresh.io>
Date: Sun, 25 May 2025 19:02:57 +0300
Subject: [PATCH] fix - remove unnecessary unmarshalling in codefresh_user
 activation

---
 codefresh/cfclient/api_key.go                     |  3 ++-
 codefresh/cfclient/user.go                        | 15 ++++-----------
 .../resource_account_user_association_test.go     |  3 ++-
 codefresh/resource_user.go                        |  2 +-
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/codefresh/cfclient/api_key.go b/codefresh/cfclient/api_key.go
index 4bd54d91..465445c5 100644
--- a/codefresh/cfclient/api_key.go
+++ b/codefresh/cfclient/api_key.go
@@ -347,7 +347,8 @@ func (client *Client) createRandomUser(accountId string) (string, error) {
 	userID := user.ID
 
 	// activate
-	_, err = client.ActivateUser(userID)
+	err = client.ActivateUser(userID)
+
 	if err != nil {
 		return "", err
 	}
diff --git a/codefresh/cfclient/user.go b/codefresh/cfclient/user.go
index ec42b52a..5f3827f8 100644
--- a/codefresh/cfclient/user.go
+++ b/codefresh/cfclient/user.go
@@ -166,27 +166,20 @@ func (client *Client) AddUserToTeamByAdmin(userID string, accountID string, team
 	return err
 }
 
-func (client *Client) ActivateUser(userId string) (*User, error) {
+func (client *Client) ActivateUser(userId string) error {
 
 	opts := RequestOptions{
 		Path:   fmt.Sprintf("/admin/user/%s/activate", userId),
 		Method: "POST",
 	}
 
-	resp, err := client.RequestAPI(&opts)
-
-	if err != nil {
-		return nil, err
-	}
-
-	var user User
+	_, err := client.RequestAPI(&opts)
 
-	err = DecodeResponseInto(resp, &user)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
-	return &user, nil
+	return nil
 }
 
 func (client *Client) SetUserAsAccountAdmin(accountId, userId string) error {
diff --git a/codefresh/resource_account_user_association_test.go b/codefresh/resource_account_user_association_test.go
index a74084db..202a2dd6 100644
--- a/codefresh/resource_account_user_association_test.go
+++ b/codefresh/resource_account_user_association_test.go
@@ -24,7 +24,8 @@ func testAccCodefreshActivateUser(s *terraform.State, email string) error {
 	}
 	for _, user := range currentAccount.Users {
 		if user.Email == email {
-			_, err = c.ActivateUser(user.ID)
+			err = c.ActivateUser(user.ID)
+
 			if err != nil {
 				return fmt.Errorf("failed to activate user: %s", err)
 			}
diff --git a/codefresh/resource_user.go b/codefresh/resource_user.go
index 5591ddb8..10ec560c 100644
--- a/codefresh/resource_user.go
+++ b/codefresh/resource_user.go
@@ -157,7 +157,7 @@ func resourceUsersCreate(d *schema.ResourceData, meta interface{}) error {
 	}
 
 	if d.Get("activate").(bool) {
-		_, err := client.ActivateUser(d.Id())
+		err := client.ActivateUser(d.Id())
 
 		if err != nil {
 			return err