iothub_endpoint_storage_container

azurerm/helpers/validate/iothub.go

@@ -26,3 +26,22 @@ func IoTHubConsumerGroupName(v interface{}, k string) (warnings []string, errors
 
 	return warnings, errors
 }
+
+func IoTHubEndpointName(v interface{}, _ string) (warnings []string, errors []error) {
+	value := v.(string)
+
+	reservedNames := []string{
+		"events",
+		"operationsMonitoringEvents",
+		"fileNotifications",
+		"$default",
+	}
+
+	for _, name := range reservedNames {
+		if name == value {
+			errors = append(errors, fmt.Errorf("The reserved endpoint name %s could not be used as a name for a custom endpoint", name))
+		}
+	}
+
+	return warnings, errors
+}

azurerm/helpers/validate/storage_container.go

@@ -0,0 +1,24 @@
+package validate
+
+import (
+	"fmt"
+	"regexp"
+)
+
+func StorageContainerName(v interface{}, k string) (warnings []string, errors []error) {
+	value := v.(string)
+	if !regexp.MustCompile(`^\$root$|^[0-9a-z-]+$`).MatchString(value) {
+		errors = append(errors, fmt.Errorf(
+			"only lowercase alphanumeric characters and hyphens allowed in %q: %q",
+			k, value))
+	}
+	if len(value) < 3 || len(value) > 63 {
+		errors = append(errors, fmt.Errorf(
+			"%q must be between 3 and 63 characters: %q", k, value))
+	}
+	if regexp.MustCompile(`^-`).MatchString(value) {
+		errors = append(errors, fmt.Errorf(
+			"%q cannot begin with a hyphen: %q", k, value))
+	}
+	return warnings, errors
+}

azurerm/provider.go

@@ -304,6 +304,7 @@ func Provider() terraform.ResourceProvider {
 			"azurerm_iot_dps":                                            resourceArmIotDPS(),
 			"azurerm_iothub_consumer_group":                              resourceArmIotHubConsumerGroup(),
 			"azurerm_iothub":                                             resourceArmIotHub(),
+			"azurerm_iothub_endpoint_storage_container":                  resourceArmIotHubEndpointStorageContainer(),
 			"azurerm_iothub_shared_access_policy":                        resourceArmIotHubSharedAccessPolicy(),
 			"azurerm_key_vault_access_policy":                            resourceArmKeyVaultAccessPolicy(),
 			"azurerm_key_vault_certificate":                              resourceArmKeyVaultCertificate(),

azurerm/resource_arm_iothub.go

@@ -164,6 +164,7 @@ func resourceArmIotHub() *schema.Resource {
 			"endpoint": {
 				Type:     schema.TypeList,
 				Optional: true,
+				Computed: true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"type": {
@@ -194,7 +195,7 @@ func resourceArmIotHub() *schema.Resource {
 						"name": {
 							Type:         schema.TypeString,
 							Required:     true,
-							ValidateFunc: validateIoTHubEndpointName,
+							ValidateFunc: validate.IoTHubEndpointName,
 						},
 						"batch_frequency_in_seconds": {
 							Type:             schema.TypeInt,
@@ -400,14 +401,23 @@ func resourceArmIotHubCreateUpdate(d *schema.ResourceData, meta interface{}) err
 	location := azure.NormalizeLocation(d.Get("location").(string))
 	skuInfo := expandIoTHubSku(d)
 	tags := d.Get("tags").(map[string]interface{})
+
 	fallbackRoute := expandIoTHubFallbackRoute(d)
+	routes := expandIoTHubRoutes(d)
 
-	endpoints, err := expandIoTHubEndpoints(d, subscriptionID)
-	if err != nil {
-		return fmt.Errorf("Error expanding `endpoint`: %+v", err)
+	routingProperties := devices.RoutingProperties{
+		Routes:        routes,
+		FallbackRoute: fallbackRoute,
+	}
+
+	if _, ok := d.GetOk("endpoint"); ok {
+		endpoints, err := expandIoTHubEndpoints(d, subscriptionID)
+		if err != nil {
+			return fmt.Errorf("Error expanding `endpoint`: %+v", err)
+		}
+		routingProperties.Endpoints = endpoints
 	}
 
-	routes := expandIoTHubRoutes(d)
 	ipFilterRules := expandIPFilterRules(d)
 
 	properties := devices.IotHubDescription{
@@ -416,11 +426,7 @@ func resourceArmIotHubCreateUpdate(d *schema.ResourceData, meta interface{}) err
 		Sku:      skuInfo,
 		Properties: &devices.IotHubProperties{
 			IPFilterRules: ipFilterRules,
-			Routing: &devices.RoutingProperties{
-				Endpoints:     endpoints,
-				Routes:        routes,
-				FallbackRoute: fallbackRoute,
-			},
+			Routing:       &routingProperties,
 		},
 		Tags: expandTags(tags),
 	}
@@ -911,25 +917,6 @@ func flattenIoTHubFallbackRoute(input *devices.RoutingProperties) []interface{}
 	return []interface{}{output}
 }
 
-func validateIoTHubEndpointName(v interface{}, _ string) (warnings []string, errors []error) {
-	value := v.(string)
-
-	reservedNames := []string{
-		"events",
-		"operationsMonitoringEvents",
-		"fileNotifications",
-		"$default",
-	}
-
-	for _, name := range reservedNames {
-		if name == value {
-			errors = append(errors, fmt.Errorf("The reserved endpoint name %s could not be used as a name for a custom endpoint", name))
-		}
-	}
-
-	return warnings, errors
-}
-
 func validateIoTHubFileNameFormat(v interface{}, k string) (warnings []string, errors []error) {
 	value := v.(string)