Adding Ports To Container Groups

azurerm/resource_arm_container_group.go

@@ -8,6 +8,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-06-01/containerinstance"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
 )
 
@@ -146,16 +147,48 @@ func resourceArmContainerGroup() *schema.Resource {
 						},
 
 						"port": {
-							Type:         schema.TypeInt,
-							Optional:     true,
-							ForceNew:     true,
-							ValidateFunc: validation.IntBetween(1, 65535),
+							Type:          schema.TypeInt,
+							Optional:      true,
+							ForceNew:      true,
+							ConflictsWith: []string{"container.0.ports"},
+							Deprecated:    "Use `ports` instead.",
+							ValidateFunc:  validate.PortNumber,
+						},
+
+						"ports": {
+							Type:          schema.TypeList,
+							Optional:      true,
+							ForceNew:      true,
+							ConflictsWith: []string{"container.0.port", "container.0.protocol"},
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"protocol": {
+										Type:             schema.TypeString,
+										Optional:         true,
+										ForceNew:         true,
+										DiffSuppressFunc: ignoreCaseDiffSuppressFunc,
+										Default:          string("TCP"),
+										ValidateFunc: validation.StringInSlice([]string{
+											"tcp",
+											"udp",
+										}, true),
+									},
+									"port": {
+										Type:         schema.TypeInt,
+										Required:     true,
+										ForceNew:     true,
+										ValidateFunc: validate.PortNumber,
+									},
+								},
+							},
 						},
 
 						"protocol": {
 							Type:             schema.TypeString,
 							Optional:         true,
 							ForceNew:         true,
+							ConflictsWith:    []string{"container.0.ports"},
+							Deprecated:       "Use `ports` instead.",
 							DiffSuppressFunc: ignoreCaseDiffSuppressFunc,
 							ValidateFunc: validation.StringInSlice([]string{
 								string(containerinstance.TCP),
@@ -421,6 +454,23 @@ func expandContainerGroupContainers(d *schema.ResourceData) (*[]containerinstanc
 			containerGroupPorts = append(containerGroupPorts, containerGroupPort)
 		}
 
+		if v, ok := data["ports"]; ok {
+			p := v.([]interface{})
+			var ports []containerinstance.ContainerPort
+			for _, v := range p {
+				portObj := v.(map[string]interface{})
+				portI := portObj["port"]
+				port := int32(portI.(int))
+				protoI := portObj["protocol"]
+				proto := protoI.(string)
+				ports = append(ports, containerinstance.ContainerPort{
+					Protocol: containerinstance.ContainerNetworkProtocol(strings.ToUpper(proto)),
+					Port:     &port,
+				})
+			}
+			container.Ports = &ports
+		}
+
 		// Set both sensitive and non-secure environment variables
 		var envVars *[]containerinstance.EnvironmentVariable
 		var secEnvVars *[]containerinstance.EnvironmentVariable