You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pe...@apache.org on 2025/10/14 20:17:26 UTC

(cloudstack-terraform-provider) branch add-rule-number-to-state created (now 0081145)

This is an automated email from the ASF dual-hosted git repository.

pearl11594 pushed a change to branch add-rule-number-to-state
in repository https://gitbox.apache.org/repos/asf/cloudstack-terraform-provider.git


      at 0081145  Add rule number to the terraform state

This branch includes the following new commits:

     new 0081145  Add rule number to the terraform state

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



(cloudstack-terraform-provider) 01/01: Add rule number to the terraform state

Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

pearl11594 pushed a commit to branch add-rule-number-to-state
in repository https://gitbox.apache.org/repos/asf/cloudstack-terraform-provider.git

commit 008114555f1028263aab073206417e866d96a439
Author: Pearl Dsilva <pe...@gmail.com>
AuthorDate: Tue Oct 14 16:17:12 2025 -0400

    Add rule number to the terraform state
---
 cloudstack/resource_cloudstack_network_acl_rule.go | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/cloudstack/resource_cloudstack_network_acl_rule.go b/cloudstack/resource_cloudstack_network_acl_rule.go
index 699c7da..4980ae6 100644
--- a/cloudstack/resource_cloudstack_network_acl_rule.go
+++ b/cloudstack/resource_cloudstack_network_acl_rule.go
@@ -307,6 +307,12 @@ func createNetworkACLRule(d *schema.ResourceData, meta interface{}, rule map[str
 
 	// If protocol is TCP or UDP, create the rule (with or without port)
 	if rule["protocol"].(string) == "tcp" || rule["protocol"].(string) == "udp" {
+		// Check if deprecated ports field is used and reject it
+		if portsSet, hasPortsSet := rule["ports"].(*schema.Set); hasPortsSet && portsSet.Len() > 0 {
+			log.Printf("[ERROR] Attempt to create rule with deprecated ports field")
+			return fmt.Errorf("The 'ports' field is no longer supported for creating new rules. Please use the 'port' field with separate rules for each port/range.")
+		}
+
 		portStr, hasPort := rule["port"].(string)
 
 		if hasPort && portStr != "" {
@@ -427,6 +433,7 @@ func processTCPUDPRule(rule map[string]interface{}, ruleMap map[string]*cloudsta
 		rule["protocol"] = r.Protocol
 		rule["traffic_type"] = strings.ToLower(r.Traffictype)
 		rule["cidr_list"] = cidrs
+		rule["rule_number"] = r.Number
 		*rules = append(*rules, rule)
 		log.Printf("[DEBUG] Added TCP/UDP rule with no port to state: %+v", rule)
 	}
@@ -458,6 +465,7 @@ func processPortForRule(portStr string, rule map[string]interface{}, ruleMap map
 	rule["protocol"] = r.Protocol
 	rule["traffic_type"] = strings.ToLower(r.Traffictype)
 	rule["cidr_list"] = cidrs
+	rule["rule_number"] = r.Number
 
 	return true
 }
@@ -556,6 +564,7 @@ func resourceCloudStackNetworkACLRuleRead(d *schema.ResourceData, meta interface
 				rule["icmp_code"] = r.Icmpcode
 				rule["traffic_type"] = strings.ToLower(r.Traffictype)
 				rule["cidr_list"] = cidrs
+				rule["rule_number"] = r.Number
 				rules = append(rules, rule)
 				log.Printf("[DEBUG] Added ICMP rule to state: %+v", rule)
 			}
@@ -589,6 +598,7 @@ func resourceCloudStackNetworkACLRuleRead(d *schema.ResourceData, meta interface
 				rule["protocol"] = r.Protocol
 				rule["traffic_type"] = strings.ToLower(r.Traffictype)
 				rule["cidr_list"] = cidrs
+				rule["rule_number"] = r.Number
 				rules = append(rules, rule)
 				log.Printf("[DEBUG] Added ALL rule to state: %+v", rule)
 			}
@@ -760,13 +770,13 @@ func verifyNetworkACLRuleParams(d *schema.ResourceData, rule map[string]interfac
 		// No additional test are needed
 		log.Printf("[DEBUG] Protocol 'all' validated")
 	case "tcp", "udp":
-		// Check if deprecated ports field is used (not allowed for new configurations)
+		// Check if deprecated ports field is used (not allowed for any operations)
 		portsSet, hasPortsSet := rule["ports"].(*schema.Set)
 		portStr, hasPort := rule["port"].(string)
 
 		if hasPortsSet && portsSet.Len() > 0 {
-			log.Printf("[ERROR] Deprecated ports field used in new configuration")
-			return fmt.Errorf("The 'ports' field is deprecated. Use 'port' instead for new configurations.")
+			log.Printf("[ERROR] Deprecated ports field used - no longer supported")
+			return fmt.Errorf("The 'ports' field is no longer supported. Please migrate to using the 'port' field with separate rules for each port/range.")
 		}
 
 		// Validate the new port field if used