Add support for security_group

hashicorp · Oct 24, 2016 · 7fe731f · 7fe731f
1 parent 7b33275
commit 7fe731f
Showing 1 changed file with 71 additions and 11 deletions.
diff --git a/builtin/providers/cloudstack/resource_cloudstack_security_group.go b/builtin/providers/cloudstack/resource_cloudstack_security_group.go
@@ -44,7 +44,13 @@ func resourceCloudStackSecurityGroup() *schema.Resource {
 					Schema: map[string]*schema.Schema{
 						"cidr_list": &schema.Schema{
 							Type:     schema.TypeString,
-							Required: true,
+							Optional: true,
+							ForceNew: true,
+						},
+
+						"security_group": &schema.Schema{
+							Type:     schema.TypeString,
+							Optional: true,
 							ForceNew: true,
 						},
 
@@ -126,7 +132,33 @@ func resourceCloudStackSecurityGroupCreate(d *schema.ResourceData, meta interfac
 			param := cs.SecurityGroup.NewAuthorizeSecurityGroupIngressParams()
 
 			param.SetSecuritygroupid(d.Id())
-			param.SetCidrlist([]string{rule["cidr_list"].(string)})
+			if cidrlist := rule["cidr_list"]; cidrlist != "" {
+				param.SetCidrlist([]string{cidrlist.(string)})
+				log.Printf("[DEBUG] cidr = %v", cidrlist)
+			}
+			if securitygroup := rule["security_group"]; securitygroup != "" {
+				// Get the security group details
+				ag, count, err := cs.SecurityGroup.GetSecurityGroupByName(
+					securitygroup.(string),
+					cloudstack.WithProject(d.Get("project").(string)),
+				)
+				if err != nil {
+					if count == 0 {
+						log.Printf("[DEBUG] Security group %s does not longer exist", d.Get("name").(string))
+						d.SetId("")
+						return nil
+					}
+
+					log.Printf("[DEBUG] Found %v groups matching", count)
+
+					return err
+				}
+				log.Printf("[DEBUG] ag = %v", ag)
+				m := make(map[string]string)
+				m[ag.Account] = ag.Name
+				log.Printf("[DEBUG] m = %v", m)
+				param.SetUsersecuritygrouplist(m)
+			}
 			param.SetStartport(startPort)
 			param.SetEndport(endPort)
 			param.SetProtocol(rule["protocol"].(string))
@@ -140,7 +172,33 @@ func resourceCloudStackSecurityGroupCreate(d *schema.ResourceData, meta interfac
 			param := cs.SecurityGroup.NewAuthorizeSecurityGroupEgressParams()
 
 			param.SetSecuritygroupid(d.Id())
-			param.SetCidrlist([]string{rule["cidr_list"].(string)})
+			if cidrlist := rule["cidr_list"]; cidrlist != "" {
+				param.SetCidrlist([]string{cidrlist.(string)})
+				log.Printf("[DEBUG] cidr = %v", cidrlist)
+			}
+			if securitygroup := rule["security_group"]; securitygroup != "" {
+				// Get the security group details
+				ag, count, err := cs.SecurityGroup.GetSecurityGroupByName(
+					securitygroup.(string),
+					cloudstack.WithProject(d.Get("project").(string)),
+				)
+				if err != nil {
+					if count == 0 {
+						log.Printf("[DEBUG] Security group %s does not longer exist", d.Get("name").(string))
+						d.SetId("")
+						return nil
+					}
+
+					log.Printf("[DEBUG] Found %v groups matching", count)
+
+					return err
+				}
+				log.Printf("[DEBUG] ag = %v", ag)
+				m := make(map[string]string)
+				m[ag.Account] = ag.Name
+				log.Printf("[DEBUG] m = %v", m)
+				param.SetUsersecuritygrouplist(m)
+			}
 			param.SetStartport(startPort)
 			param.SetEndport(endPort)
 			param.SetProtocol(rule["protocol"].(string))
@@ -194,10 +252,11 @@ func resourceCloudStackSecurityGroupRead(d *schema.ResourceData, meta interface{
 			ports = fmt.Sprintf("%v-%v", r.Startport, r.Endport)
 		}
 		rule := map[string]interface{}{
-			"cidr_list":    r.Cidr,
-			"ports":        ports,
-			"protocol":     r.Protocol,
-			"traffic_type": "ingress",
+			"cidr_list":      r.Cidr,
+			"ports":          ports,
+			"protocol":       r.Protocol,
+			"traffic_type":   "ingress",
+			"security_group": r.Securitygroupname,
 		}
 		rules = append(rules, rule)
 	}
@@ -209,10 +268,11 @@ func resourceCloudStackSecurityGroupRead(d *schema.ResourceData, meta interface{
 			ports = fmt.Sprintf("%s-%s", r.Startport, r.Endport)
 		}
 		rule := map[string]interface{}{
-			"cidr_list":    r.Cidr,
-			"ports":        ports,
-			"protocol":     r.Protocol,
-			"traffic_type": "egress",
+			"cidr_list":      r.Cidr,
+			"ports":          ports,
+			"protocol":       r.Protocol,
+			"traffic_type":   "egress",
+			"security_group": r.Securitygroupname,
 		}
 		rules = append(rules, rule)
 	}