Merge pull request #5806 from terraform-providers/b/express-route-gat…

…eway r/express_route_gateway: fixes from #5523
hashicorp · Feb 19, 2020 · ec44fe6 · ec44fe6
2 parents f015b0f + 339a727
commit ec44fe6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/azurerm/internal/services/network/resource_arm_express_route_gateway.go b/azurerm/internal/services/network/resource_arm_express_route_gateway.go
@@ -30,10 +30,10 @@ func resourceArmExpressRouteGateway() *schema.Resource {
 		},
 
 		Timeouts: &schema.ResourceTimeout{
-			Create: schema.DefaultTimeout(60 * time.Minute),
+			Create: schema.DefaultTimeout(90 * time.Minute),
 			Read:   schema.DefaultTimeout(5 * time.Minute),
-			Update: schema.DefaultTimeout(60 * time.Minute),
-			Delete: schema.DefaultTimeout(60 * time.Minute),
+			Update: schema.DefaultTimeout(90 * time.Minute),
+			Delete: schema.DefaultTimeout(90 * time.Minute),
 		},
 
 		Schema: map[string]*schema.Schema{

diff --git a/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go
@@ -183,6 +183,7 @@ resource "azurerm_express_route_gateway" "import" {
   name                = azurerm_express_route_gateway.test.name
   resource_group_name = azurerm_express_route_gateway.test.name
   location            = azurerm_express_route_gateway.test.location
+  virtual_hub_id      = azurerm_express_route_gateway.test.virtual_hub_id
   scale_units         = azurerm_express_route_gateway.test.scale_units
 }
 `, template)

diff --git a/website/docs/r/express_route_gateway.html.markdown b/website/docs/r/express_route_gateway.html.markdown
@@ -37,7 +37,7 @@ resource "azurerm_express_route_gateway" "example" {
   resource_group_name = azurerm_resource_group.example.name
   location            = azurerm_resource_group.example.location
   virtual_hub_id      = azurerm_virtual_hub.example.id
-  scale_unts          = 1
+  scale_units         = 1
 
   tags = {
     environment = "Production"