Support caid for account role editing (#610)

Author: aahedsaed

incapsula/client_account_role.go

@@ -121,8 +121,8 @@ func (c *Client) GetAccountRole(roleId int) (*RoleDetailsDTO, error) {
 }
 
 // UpdateAccountRole - Update the Account Role for a given role ID
-func (c *Client) UpdateAccountRole(roleId int, requestDTO RoleDetailsBasicDTO) (*RoleDetailsDTO, error) {
-	log.Printf("[INFO] Updating Incapsula account role (Id: %d)\n", roleId)
+func (c *Client) UpdateAccountRole(roleId int, accountId int, requestDTO RoleDetailsBasicDTO) (*RoleDetailsDTO, error) {
+	log.Printf("[INFO] Updating Incapsula account role (Id: %d, Account Id: %d)\n", roleId, accountId)
 
 	log.Printf("[INFO]  requestDTO: %+v\n", requestDTO)
 
@@ -132,7 +132,8 @@ func (c *Client) UpdateAccountRole(roleId int, requestDTO RoleDetailsBasicDTO) (
 	reqURL := fmt.Sprintf("%s/%s/%d", c.config.BaseURLAPI, endpointRoleUpdate, roleId)
 	log.Printf("[INFO]  reqURL: %v\n", reqURL)
 
-	resp, err := c.DoJsonRequestWithHeaders(http.MethodPost, reqURL, roleJSON, UpdateAccountRole)
+	params := GetRequestParamsWithCaid(accountId)
+	resp, err := c.DoJsonAndQueryParamsRequestWithHeaders(http.MethodPost, reqURL, roleJSON, params, UpdateAccountRole)
 	if err != nil {
 		return nil, fmt.Errorf("Error updating account role with Id %d: %s", roleId, err)
 	}

incapsula/client_account_role_test.go

@@ -143,8 +143,9 @@ func TestClientUpdateRoleBadConnection(t *testing.T) {
 	config := &Config{APIID: "foo", APIKey: "bar", BaseURL: "badness.incapsula.com"}
 	client := &Client{config: config, httpClient: &http.Client{Timeout: time.Millisecond * 1}}
 	roleID := 123
+	accountID := 456
 	requestDTO := RoleDetailsBasicDTO{}
-	updateRoleResponse, err := client.UpdateAccountRole(roleID, requestDTO)
+	updateRoleResponse, err := client.UpdateAccountRole(roleID, accountID, requestDTO)
 	if err == nil {
 		t.Errorf("Should have received an error")
 	}
@@ -158,9 +159,11 @@ func TestClientUpdateRoleBadConnection(t *testing.T) {
 
 func TestClientUpdateRoleBadJSON(t *testing.T) {
 	roleID := 123
+	accountID := 456
 	server := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
-		if req.URL.String() != fmt.Sprintf("/%s/%d", endpointRoleUpdate, roleID) {
-			t.Errorf("Should have have hit /%s/%d endpoint. Got: %s", endpointAccountUpdate, roleID, req.URL.String())
+		expectedURL := fmt.Sprintf("/%s/%d?caid=%d", endpointRoleUpdate, roleID, accountID)
+		if req.URL.String() != expectedURL {
+			t.Errorf("Should have hit %s endpoint. Got: %s", expectedURL, req.URL.String())
 		}
 		rw.Write([]byte(`{`))
 	}))
@@ -169,7 +172,7 @@ func TestClientUpdateRoleBadJSON(t *testing.T) {
 	config := &Config{APIID: "foo", APIKey: "bar", BaseURLAPI: server.URL}
 	client := &Client{config: config, httpClient: &http.Client{}}
 	requestDTO := RoleDetailsBasicDTO{}
-	updateRoleResponse, err := client.UpdateAccountRole(roleID, requestDTO)
+	updateRoleResponse, err := client.UpdateAccountRole(roleID, accountID, requestDTO)
 	if err == nil {
 		t.Errorf("Should have received an error")
 	}

incapsula/resource_account_role.go

@@ -142,11 +142,12 @@ func resourceAccountRoleRead(d *schema.ResourceData, m interface{}) error {
 func resourceAccountRoleUpdate(d *schema.ResourceData, m interface{}) error {
 	client := m.(*Client)
 	roleID, _ := strconv.Atoi(d.Id())
+	accountId := d.Get("account_id").(int)
 
-	log.Printf("[INFO] Updating Incapsula account role with id: %d\n", roleID)
+	log.Printf("[INFO] Updating Incapsula account role with id: %d (account id: %d)\n", roleID, accountId)
 
 	requestDTO := populateRoleDetailsDTO(d)
-	responseDTO, err := client.UpdateAccountRole(roleID, requestDTO)
+	responseDTO, err := client.UpdateAccountRole(roleID, accountId, requestDTO)
 
 	if err != nil {
 		log.Printf("[ERROR] Could not create Incapsula account role: %s\n", err)