Merge pull request #27 from wallarm/fix-denylist

Fix a couple of bugs with denylist

Author: aoleynikov-wallarm

version/version.go

@@ -2,5 +2,5 @@ package version
 
 var (
 	// ProviderVersion is set during the release process to the release version of the binary
-	ProviderVersion = "1.0.0-rc.1"
+	ProviderVersion = "1.0.0-rc.2"
 )

wallarm/resource_denylist.go

@@ -257,6 +257,9 @@ func resourceWallarmDenylistRead(d *schema.ResourceData, m interface{}) error {
 }
 
 func resourceWallarmDenylistUpdate(d *schema.ResourceData, m interface{}) error {
+	if err := resourceWallarmDenylistDelete(d, m); err != nil {
+		return err
+	}
 	return resourceWallarmDenylistCreate(d, m)
 }
 
@@ -274,6 +277,10 @@ func resourceWallarmDenylistDelete(d *schema.ResourceData, m interface{}) error
 		derivedIDs = append(derivedIDs, id["ip_id"].(int))
 	}
 
+	if len(derivedIDs) == 0 {
+		derivedIDs = append(derivedIDs, 0)
+	}
+
 	if err := client.DenylistDelete(clientID, derivedIDs); err != nil {
 		return err
 	}

wallarm/utils.go

@@ -201,12 +201,14 @@ func expandPointsToTwoDimensionalArray(ps []interface{}) (wallarm.TwoDimensional
 		case "path", "array", "grpc", "json_array", "xml_comment",
 			"xml_dtd_entity", "xml_pi", "xml_tag_array":
 			// Align to the []string{} schema, float is used since marshalling considers numbers as float64
-			number, err := strconv.ParseFloat(pointSlice[1].(string), 64)
-			if err != nil {
-				return nil, err
+			if len(pointSlice) > 1 {
+				number, err := strconv.ParseFloat(pointSlice[1].(string), 64)
+				if err != nil {
+					return nil, err
+				}
+				pointSlice[1] = number
+				points[i] = pointSlice
 			}
-			pointSlice[1] = number
-			points[i] = pointSlice
 		default:
 			points[i] = pointSlice
 		}