Requiring existing resources to be imported / support for timeouts

azurerm/config.go

@@ -8,7 +8,6 @@ import (
 	"net/http/httputil"
 	"os"
 	"sync"
-	"time"
 
 	appinsights "github.com/Azure/azure-sdk-for-go/services/appinsights/mgmt/2015-05-01/insights"
 	"github.com/Azure/azure-sdk-for-go/services/automation/mgmt/2015-10-31/automation"
@@ -264,7 +263,6 @@ func (c *ArmClient) configureClient(client *autorest.Client, auth autorest.Autho
 	client.Authorizer = auth
 	client.Sender = autorest.CreateSender(withRequestLogging())
 	client.SkipResourceProviderRegistration = c.skipProviderRegistration
-	client.PollingDuration = 60 * time.Minute
 }
 
 func withRequestLogging() autorest.SendDecorator {

azurerm/data_source_scheduler_job_collection_test.go

@@ -41,23 +41,25 @@ func TestAccDataSourceAzureRMSchedulerJobCollection_complete(t *testing.T) {
 }
 
 func testAccDataSourceSchedulerJobCollection_basic(rInt int, location string) string {
+	template := testAccAzureRMSchedulerJobCollection_basic(rInt, location)
 	return fmt.Sprintf(`
 %s
 
 data "azurerm_scheduler_job_collection" "test" {
   name                = "${azurerm_scheduler_job_collection.test.name}"
   resource_group_name = "${azurerm_resource_group.test.name}"
 }
-`, testAccAzureRMSchedulerJobCollection_basic(rInt, location, ""))
+`, template)
 }
 
 func testAccDataSourceSchedulerJobCollection_complete(rInt int, location string) string {
+	template := testAccAzureRMSchedulerJobCollection_complete(rInt, location)
 	return fmt.Sprintf(`
 %s
 
 data "azurerm_scheduler_job_collection" "test" {
   name                = "${azurerm_scheduler_job_collection.test.name}"
   resource_group_name = "${azurerm_resource_group.test.name}"
 }
-`, testAccAzureRMSchedulerJobCollection_complete(rInt, location))
+`, template)
 }

azurerm/helpers/tf/errors.go

@@ -0,0 +1,8 @@
+package tf
+
+import "fmt"
+
+func ImportAsExistsError(resourceName, id string) error {
+	msg := "A resource with the ID %q already exists - to be managed via Terraform this resource needs to be imported into the State. Please see the resource documentation for %q for more information."
+	return fmt.Errorf(msg, id, resourceName)
+}

azurerm/helpers/tf/timeouts.go

@@ -0,0 +1,11 @@
+package tf
+
+import "github.com/hashicorp/terraform/helper/schema"
+
+func TimeoutForCreateUpdate(d *schema.ResourceData) string {
+	if d.IsNewResource() {
+		return schema.TimeoutCreate
+	}
+
+	return schema.TimeoutUpdate
+}

azurerm/loadbalancer.go

@@ -1,14 +1,12 @@
 package azurerm
 
 import (
-	"context"
 	"fmt"
 	"net/http"
 	"regexp"
 	"strings"
 
 	"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2018-04-01/network"
-	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
 )
 
@@ -43,20 +41,6 @@ func retrieveLoadBalancerById(loadBalancerId string, meta interface{}) (*network
 	return &resp, true, nil
 }
 
-func findLoadBalancerBackEndAddressPoolByName(lb *network.LoadBalancer, name string) (*network.BackendAddressPool, int, bool) {
-	if lb == nil || lb.LoadBalancerPropertiesFormat == nil || lb.LoadBalancerPropertiesFormat.BackendAddressPools == nil {
-		return nil, -1, false
-	}
-
-	for i, apc := range *lb.LoadBalancerPropertiesFormat.BackendAddressPools {
-		if apc.Name != nil && *apc.Name == name {
-			return &apc, i, true
-		}
-	}
-
-	return nil, -1, false
-}
-
 func findLoadBalancerFrontEndIpConfigurationByName(lb *network.LoadBalancer, name string) (*network.FrontendIPConfiguration, int, bool) {
 	if lb == nil || lb.LoadBalancerPropertiesFormat == nil || lb.LoadBalancerPropertiesFormat.FrontendIPConfigurations == nil {
 		return nil, -1, false
@@ -71,81 +55,6 @@ func findLoadBalancerFrontEndIpConfigurationByName(lb *network.LoadBalancer, nam
 	return nil, -1, false
 }
 
-func findLoadBalancerRuleByName(lb *network.LoadBalancer, name string) (*network.LoadBalancingRule, int, bool) {
-	if lb == nil || lb.LoadBalancerPropertiesFormat == nil || lb.LoadBalancerPropertiesFormat.LoadBalancingRules == nil {
-		return nil, -1, false
-	}
-
-	for i, lbr := range *lb.LoadBalancerPropertiesFormat.LoadBalancingRules {
-		if lbr.Name != nil && *lbr.Name == name {
-			return &lbr, i, true
-		}
-	}
-
-	return nil, -1, false
-}
-
-func findLoadBalancerNatRuleByName(lb *network.LoadBalancer, name string) (*network.InboundNatRule, int, bool) {
-	if lb == nil || lb.LoadBalancerPropertiesFormat == nil || lb.LoadBalancerPropertiesFormat.InboundNatRules == nil {
-		return nil, -1, false
-	}
-
-	for i, nr := range *lb.LoadBalancerPropertiesFormat.InboundNatRules {
-		if nr.Name != nil && *nr.Name == name {
-			return &nr, i, true
-		}
-	}
-
-	return nil, -1, false
-}
-
-func findLoadBalancerNatPoolByName(lb *network.LoadBalancer, name string) (*network.InboundNatPool, int, bool) {
-	if lb == nil || lb.LoadBalancerPropertiesFormat == nil || lb.LoadBalancerPropertiesFormat.InboundNatPools == nil {
-		return nil, -1, false
-	}
-
-	for i, np := range *lb.LoadBalancerPropertiesFormat.InboundNatPools {
-		if np.Name != nil && *np.Name == name {
-			return &np, i, true
-		}
-	}
-
-	return nil, -1, false
-}
-
-func findLoadBalancerProbeByName(lb *network.LoadBalancer, name string) (*network.Probe, int, bool) {
-	if lb == nil || lb.LoadBalancerPropertiesFormat == nil || lb.LoadBalancerPropertiesFormat.Probes == nil {
-		return nil, -1, false
-	}
-
-	for i, p := range *lb.LoadBalancerPropertiesFormat.Probes {
-		if p.Name != nil && *p.Name == name {
-			return &p, i, true
-		}
-	}
-
-	return nil, -1, false
-}
-
-func loadbalancerStateRefreshFunc(ctx context.Context, client network.LoadBalancersClient, resourceGroupName string, loadbalancer string) resource.StateRefreshFunc {
-	return func() (interface{}, string, error) {
-		res, err := client.Get(ctx, resourceGroupName, loadbalancer, "")
-		if err != nil {
-			return nil, "", fmt.Errorf("Error issuing read request in loadbalancerStateRefreshFunc to Azure ARM for Load Balancer '%s' (RG: '%s'): %s", loadbalancer, resourceGroupName, err)
-		}
-
-		return res, *res.LoadBalancerPropertiesFormat.ProvisioningState, nil
-	}
-}
-
-func validateLoadBalancerPrivateIpAddressAllocation(v interface{}, k string) (ws []string, errors []error) {
-	value := strings.ToLower(v.(string))
-	if value != "static" && value != "dynamic" {
-		errors = append(errors, fmt.Errorf("LoadBalancer Allocations can only be Static or Dynamic"))
-	}
-	return
-}
-
 // sets the loadbalancer_id in the ResourceData from the sub resources full id
 func loadBalancerSubResourceStateImporter(d *schema.ResourceData, m interface{}) ([]*schema.ResourceData, error) {
 	r, err := regexp.Compile(`.+\/loadBalancers\/.+?\/`)

azurerm/logic_apps.go

@@ -1,25 +1,27 @@
 package azurerm
 
 import (
+	"context"
 	"fmt"
 	"log"
 
 	"github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2016-06-01/logic"
 	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
 )
 
 // NOTE: this file is not a recommended way of developing Terraform resources; this exists to work around the fact that this API is dynamic (by it's nature)
 
-func resourceLogicAppActionUpdate(d *schema.ResourceData, meta interface{}, logicAppId string, name string, vals map[string]interface{}) error {
-	return resourceLogicAppComponentUpdate(d, meta, "Action", "actions", logicAppId, name, vals)
+func resourceLogicAppActionUpdate(d *schema.ResourceData, meta interface{}, logicAppId string, name string, vals map[string]interface{}, resourceName string) error {
+	return resourceLogicAppComponentUpdate(d, meta, "Action", "actions", logicAppId, name, vals, resourceName)
 }
 
-func resourceLogicAppTriggerUpdate(d *schema.ResourceData, meta interface{}, logicAppId string, name string, vals map[string]interface{}) error {
-	return resourceLogicAppComponentUpdate(d, meta, "Trigger", "triggers", logicAppId, name, vals)
+func resourceLogicAppTriggerUpdate(d *schema.ResourceData, meta interface{}, logicAppId string, name string, vals map[string]interface{}, resourceName string) error {
+	return resourceLogicAppComponentUpdate(d, meta, "Trigger", "triggers", logicAppId, name, vals, resourceName)
 }
 
-func resourceLogicAppComponentUpdate(d *schema.ResourceData, meta interface{}, kind string, propertyName string, logicAppId string, name string, vals map[string]interface{}) error {
+func resourceLogicAppComponentUpdate(d *schema.ResourceData, meta interface{}, kind string, propertyName string, logicAppId string, name string, vals map[string]interface{}, resourceName string) error {
 	client := meta.(*ArmClient).logicWorkflowsClient
 	ctx := meta.(*ArmClient).StopContext
 
@@ -56,6 +58,14 @@ func resourceLogicAppComponentUpdate(d *schema.ResourceData, meta interface{}, k
 
 	definition := read.WorkflowProperties.Definition.(map[string]interface{})
 	vs := definition[propertyName].(map[string]interface{})
+
+	idString := fmt.Sprintf("%s/%s/%s", *read.ID, propertyName, name)
+	if d.IsNewResource() {
+		if _, exists := vs[name]; exists {
+			return tf.ImportAsExistsError(resourceName, idString)
+		}
+	}
+
 	vs[name] = vals
 	definition[propertyName] = vs
 
@@ -68,13 +78,15 @@ func resourceLogicAppComponentUpdate(d *schema.ResourceData, meta interface{}, k
 		Tags: read.Tags,
 	}
 
-	_, err = client.CreateOrUpdate(ctx, resourceGroup, logicAppName, properties)
+	waitCtx, cancel := context.WithTimeout(ctx, d.Timeout(tf.TimeoutForCreateUpdate(d)))
+	defer cancel()
+	_, err = client.CreateOrUpdate(waitCtx, resourceGroup, logicAppName, properties)
 	if err != nil {
 		return fmt.Errorf("Error updating Logic App Workspace %q (Resource Group %q) for %s %q: %+v", logicAppName, resourceGroup, kind, name, err)
 	}
 
 	if d.IsNewResource() {
-		d.SetId(fmt.Sprintf("%s/%s/%s", *read.ID, propertyName, name))
+		d.SetId(idString)
 	}
 
 	return nil
@@ -130,7 +142,9 @@ func resourceLogicAppComponentRemove(d *schema.ResourceData, meta interface{}, k
 		Tags: read.Tags,
 	}
 
-	_, err = client.CreateOrUpdate(ctx, resourceGroup, logicAppName, properties)
+	waitCtx, cancel := context.WithTimeout(ctx, d.Timeout(schema.TimeoutDelete))
+	defer cancel()
+	_, err = client.CreateOrUpdate(waitCtx, resourceGroup, logicAppName, properties)
 	if err != nil {
 		return fmt.Errorf("Error removing %s %q from Logic App Workspace %q (Resource Group %q): %+v", kind, name, logicAppName, resourceGroup, err)
 	}