Bug Fix : Fixing tunnel inspection and nat rules names for herds reset export resources failure.

Author: sumanbasireddy

internal/service/network_firewall/network_firewall_export.go

@@ -127,22 +127,35 @@ func getNetworkFirewallNetworkFirewallPolicyDecryptionProfileId(resource *tf_exp
 }
 
 func getNetworkFirewallNetworkFirewallPolicyTunnelInspectionRuleId(resource *tf_export.OCIResource) (string, error) {
-
 	networkFirewallPolicyId := resource.Parent.Id
-	tunnelInspectionRuleName, ok := resource.SourceAttributes["tunnel_inspection_rule_name"].(string)
-	if !ok {
+	// Try to get rule name from "name"
+	var tunnelInspectionRuleName string
+	if val, ok := resource.SourceAttributes["name"].(string); ok && val != "" {
+		tunnelInspectionRuleName = val
+	} else if val, ok := resource.SourceAttributes["tunnel_inspection_rule_name"].(string); ok && val != "" {
+		// Fallback for backward compatibility
+		tunnelInspectionRuleName = val
+	} else {
 		return "", fmt.Errorf("[ERROR] unable to find tunnelInspectionRuleName for NetworkFirewall NetworkFirewallPolicyTunnelInspectionRule")
 	}
+
 	return GetNetworkFirewallPolicyTunnelInspectionRuleCompositeId(networkFirewallPolicyId, tunnelInspectionRuleName), nil
 }
 
 func getNetworkFirewallNetworkFirewallPolicyNatRuleId(resource *tf_export.OCIResource) (string, error) {
+	networkFirewallPolicyId := resource.Parent.Id
 
-	natRuleName, ok := resource.SourceAttributes["nat_rule_name"].(string)
-	if !ok {
+	// Try to get NAT rule name
+	var natRuleName string
+	if val, ok := resource.SourceAttributes["name"].(string); ok && val != "" {
+		natRuleName = val
+	} else if val, ok := resource.SourceAttributes["nat_rule_name"].(string); ok && val != "" {
+		// Fallback for backward compatibility
+		natRuleName = val
+	} else {
 		return "", fmt.Errorf("[ERROR] unable to find natRuleName for NetworkFirewall NetworkFirewallPolicyNatRule")
 	}
-	networkFirewallPolicyId := resource.Parent.Id
+
 	return GetNetworkFirewallPolicyNatRuleCompositeId(natRuleName, networkFirewallPolicyId), nil
 }
 

internal/service/network_firewall/network_firewall_network_firewall_policy_nat_rule_data_source.go

@@ -94,6 +94,7 @@ func (s *NetworkFirewallNetworkFirewallPolicyNatRuleDataSourceCrud) SetData() er
 
 		if v.Name != nil {
 			s.D.Set("name", *v.Name)
+			s.D.Set("nat_rule_name", *v.Name)
 		}
 
 		if v.ParentResourceId != nil {

internal/service/network_firewall/network_firewall_network_firewall_policy_nat_rule_resource.go

@@ -391,13 +391,26 @@ func NatRuleSummaryToMap(obj oci_network_firewall.NatRuleSummary) map[string]int
 	result := map[string]interface{}{}
 	switch v := (obj).(type) {
 	case oci_network_firewall.NatV4NatSummary:
+		if v.Name != nil {
+			result["name"] = string(*v.Name)
+		}
+
 		result["type"] = "NATV4"
 
 		result["action"] = string(v.Action)
 
+		if v.ParentResourceId != nil {
+			result["parent_resource_id"] = string(*v.ParentResourceId)
+		}
+
 		if v.Condition != nil {
 			result["condition"] = []interface{}{NatRuleMatchCriteriaToMap(v.Condition)}
 		}
+
+		if v.PriorityOrder != nil {
+			result["priority_order"] = strconv.FormatInt(*v.PriorityOrder, 10)
+		}
+
 	default:
 		log.Printf("[WARN] Received 'type' of unknown type %v", obj)
 		return nil