From 4d584e75684cd39f05419172076e882312604263 Mon Sep 17 00:00:00 2001
From: Ashleigh Crosby <ashleigh.crosby@vitrifi.net>
Date: Thu, 27 Mar 2025 11:43:15 +0000
Subject: [PATCH] supply projectid to API read calls for firewall and
 egress_firewall

---
 cloudstack/resource_cloudstack_egress_firewall.go | 10 ++++++++++
 cloudstack/resource_cloudstack_firewall.go        | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/cloudstack/resource_cloudstack_egress_firewall.go b/cloudstack/resource_cloudstack_egress_firewall.go
index 9b7f3946..39fec2dd 100644
--- a/cloudstack/resource_cloudstack_egress_firewall.go
+++ b/cloudstack/resource_cloudstack_egress_firewall.go
@@ -95,6 +95,12 @@ func resourceCloudStackEgressFirewall() *schema.Resource {
 				},
 			},
 
+			"project": {
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
 			"parallelism": {
 				Type:     schema.TypeInt,
 				Optional: true,
@@ -265,6 +271,10 @@ func resourceCloudStackEgressFirewallRead(d *schema.ResourceData, meta interface
 	p.SetNetworkid(d.Id())
 	p.SetListall(true)
 
+	if err := cloudstack.WithProject(d.Get("project").(string))(cs, p); err != nil {
+		return err
+	}
+
 	l, err := cs.Firewall.ListEgressFirewallRules(p)
 	if err != nil {
 		return err
diff --git a/cloudstack/resource_cloudstack_firewall.go b/cloudstack/resource_cloudstack_firewall.go
index b7ba7e0b..2d680690 100644
--- a/cloudstack/resource_cloudstack_firewall.go
+++ b/cloudstack/resource_cloudstack_firewall.go
@@ -95,6 +95,12 @@ func resourceCloudStackFirewall() *schema.Resource {
 				},
 			},
 
+			"project": {
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
 			"parallelism": {
 				Type:     schema.TypeInt,
 				Optional: true,
@@ -256,6 +262,10 @@ func resourceCloudStackFirewallRead(d *schema.ResourceData, meta interface{}) er
 	p.SetIpaddressid(d.Id())
 	p.SetListall(true)
 
+	if err := cloudstack.WithProject(d.Get("project").(string))(cs, p); err != nil {
+		return err
+	}
+
 	l, err := cs.Firewall.ListFirewallRules(p)
 	if err != nil {
 		return err