Merge pull request #610 from ovh/dev/aamstutz/fix-608

fix: Use correct types for API response of resource/datasource ovh_ip_firewall_rule

Author: amstuta

Diff for: ovh/data_ip_firewall_rule.go

@@ -44,7 +44,7 @@ func (d *ipFirewallRuleDataSource) Schema(ctx context.Context, req datasource.Sc
 }
 
 func (d *ipFirewallRuleDataSource) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
-	var data IpFirewallRuleModel
+	var data IpFirewallRuleDataResponseModel
 
 	// Read Terraform configuration data into the model
 	resp.Diagnostics.Append(req.Config.Get(ctx, &data)...)

Diff for: ovh/data_ip_firewall_rule_gen.go

@@ -29,7 +29,8 @@ func TestAccIPFirewallRule_data(t *testing.T) {
 			protocol = "tcp"
 			sequence = 0
 			tcp_option = "established"
-			fragments = true
+			destination_port = 22
+			source_port = 44
 		}
 
 		data "ovh_ip_firewall_rule" "rule_data" {
@@ -56,6 +57,10 @@ func TestAccIPFirewallRule_data(t *testing.T) {
 						"data.ovh_ip_firewall_rule.rule_data", "source", "any"),
 					resource.TestCheckResourceAttr(
 						"data.ovh_ip_firewall_rule.rule_data", "tcp_option", "established"),
+					resource.TestCheckResourceAttr(
+						"data.ovh_ip_firewall_rule.rule_data", "destination_port", "eq 22"),
+					resource.TestCheckResourceAttr(
+						"data.ovh_ip_firewall_rule.rule_data", "source_port", "eq 44"),
 				),
 			},
 		},

Diff for: ovh/data_ip_firewall_rule_test.go

@@ -48,7 +48,10 @@ func (d *ipFirewallRuleResource) Schema(ctx context.Context, req resource.Schema
 }
 
 func (r *ipFirewallRuleResource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) {
-	var data, responseData IpFirewallRuleModel
+	var (
+		data         IpFirewallRuleModel
+		responseData IpFirewallRuleResponseModel
+	)
 
 	// Read Terraform plan data into the model
 	resp.Diagnostics.Append(req.Plan.Get(ctx, &data)...)
@@ -100,7 +103,10 @@ func (r *ipFirewallRuleResource) Create(ctx context.Context, req resource.Create
 }
 
 func (r *ipFirewallRuleResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
-	var data, responseData IpFirewallRuleModel
+	var (
+		data         IpFirewallRuleModel
+		responseData IpFirewallRuleResponseModel
+	)
 
 	// Read Terraform prior state data into the model
 	resp.Diagnostics.Append(req.State.Get(ctx, &data)...)

Diff for: ovh/resource_ip_firewall_rule.go

@@ -29,7 +29,8 @@ func TestAccIPFirewallRule_basic(t *testing.T) {
 			protocol = "tcp"
 			sequence = 0
 			tcp_option = "established"
-			fragments = true
+			destination_port = 22
+			source_port = 44
 		}
 	`, ip, ip)
 
@@ -50,6 +51,14 @@ func TestAccIPFirewallRule_basic(t *testing.T) {
 						"ovh_ip_firewall_rule.rule", "source", "any"),
 					resource.TestCheckResourceAttr(
 						"ovh_ip_firewall_rule.rule", "tcp_option", "established"),
+					resource.TestCheckResourceAttr(
+						"ovh_ip_firewall_rule.rule", "destination_port", "22"),
+					resource.TestCheckResourceAttr(
+						"ovh_ip_firewall_rule.rule", "destination_port_desc", "eq 22"),
+					resource.TestCheckResourceAttr(
+						"ovh_ip_firewall_rule.rule", "source_port", "44"),
+					resource.TestCheckResourceAttr(
+						"ovh_ip_firewall_rule.rule", "source_port_desc", "eq 44"),
 				),
 			},
 		},

Diff for: ovh/resource_ip_firewall_rule_gen.go

@@ -2,7 +2,7 @@
 subcategory : "Additional IP"
 ---
 
-# ovh_ip_firewall
+# ovh_ip_firewall_rule
 
 Use this resource to manage a rule on an IP firewall.
 
@@ -39,10 +39,12 @@ resource "ovh_ip_firewall_rule" "myfirewallrule" {
 * `creation_date` - Creation date of the rule
 * `destination` - Destination IP for your rule
 * `destination_port` - Destination port for your rule. Only with TCP/UDP protocol
+* `destination_port_desc` - String description of field `destination_port`
 * `fragments` - Fragments option
 * `protocol` - Possible values for protocol (ah|esp|gre|icmp|ipv4|tcp|udp)
 * `rule` - Description of the rule
 * `sequence` - Rule position in the rules array
 * `source` - IPv4 CIDR notation (e.g., 192.0.2.0/24)
 * `source_port` - Source port for your rule. Only with TCP/UDP protocol
+* `source_port_desc` - String description of field `source_port`
 * `tcp_option` - TCP option on your rule (syn|established)