From ac5f4886dc1dae82ebb6bf935cdcd89d0cf7bff0 Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 4 Jan 2019 14:30:50 -0800 Subject: [PATCH] ensure create & update functions have create & update in the name --- azurerm/resource_arm_app_service_active_slot.go | 6 +++--- azurerm/resource_arm_availability_set.go | 6 +++--- azurerm/resource_arm_container_service.go | 6 +++--- azurerm/resource_arm_eventhub.go | 6 +++--- azurerm/resource_arm_eventhub_namespace.go | 6 +++--- azurerm/resource_arm_loadbalancer.go | 6 +++--- azurerm/resource_arm_loadbalancer_nat_pool.go | 6 +++--- azurerm/resource_arm_loadbalancer_rule.go | 6 +++--- azurerm/resource_arm_local_network_gateway.go | 6 +++--- azurerm/resource_arm_managed_disk.go | 6 +++--- azurerm/resource_arm_mssql_elasticpool.go | 6 +++--- azurerm/resource_arm_network_security_group.go | 6 +++--- azurerm/resource_arm_network_security_rule.go | 6 +++--- azurerm/resource_arm_public_ip.go | 6 +++--- azurerm/resource_arm_servicebus_namespace.go | 6 +++--- azurerm/resource_arm_servicebus_subscription.go | 6 +++--- azurerm/resource_arm_servicebus_topic.go | 6 +++--- azurerm/resource_arm_subnet.go | 6 +++--- azurerm/resource_arm_template_deployment.go | 6 +++--- azurerm/resource_arm_traffic_manager_endpoint.go | 6 +++--- azurerm/resource_arm_traffic_manager_profile.go | 6 +++--- azurerm/resource_arm_virtual_machine.go | 6 +++--- azurerm/resource_arm_virtual_machine_extension.go | 6 +++--- azurerm/resource_arm_virtual_machine_scale_set.go | 6 +++--- azurerm/resource_arm_virtual_network.go | 6 +++--- azurerm/resource_arm_virtual_network_peering.go | 6 +++--- 26 files changed, 78 insertions(+), 78 deletions(-) diff --git a/azurerm/resource_arm_app_service_active_slot.go b/azurerm/resource_arm_app_service_active_slot.go index edd291947290..18621a8aaa3b 100644 --- a/azurerm/resource_arm_app_service_active_slot.go +++ b/azurerm/resource_arm_app_service_active_slot.go @@ -11,9 +11,9 @@ import ( func resourceArmAppServiceActiveSlot() *schema.Resource { return &schema.Resource{ - Create: resourceArmAppServiceActiveSlotCreate, + Create: resourceArmAppServiceActiveSlotCreateUpdate, Read: resourceArmAppServiceActiveSlotRead, - Update: resourceArmAppServiceActiveSlotCreate, + Update: resourceArmAppServiceActiveSlotCreateUpdate, Delete: resourceArmAppServiceActiveSlotDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, @@ -36,7 +36,7 @@ func resourceArmAppServiceActiveSlot() *schema.Resource { } } -func resourceArmAppServiceActiveSlotCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmAppServiceActiveSlotCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).appServicesClient ctx := meta.(*ArmClient).StopContext diff --git a/azurerm/resource_arm_availability_set.go b/azurerm/resource_arm_availability_set.go index 7c34134cebef..37d9f35c3742 100644 --- a/azurerm/resource_arm_availability_set.go +++ b/azurerm/resource_arm_availability_set.go @@ -14,9 +14,9 @@ import ( func resourceArmAvailabilitySet() *schema.Resource { return &schema.Resource{ - Create: resourceArmAvailabilitySetCreate, + Create: resourceArmAvailabilitySetCreateUpdate, Read: resourceArmAvailabilitySetRead, - Update: resourceArmAvailabilitySetCreate, + Update: resourceArmAvailabilitySetCreateUpdate, Delete: resourceArmAvailabilitySetDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, @@ -61,7 +61,7 @@ func resourceArmAvailabilitySet() *schema.Resource { } } -func resourceArmAvailabilitySetCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmAvailabilitySetCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).availSetClient ctx := meta.(*ArmClient).StopContext diff --git a/azurerm/resource_arm_container_service.go b/azurerm/resource_arm_container_service.go index e6c5d916532d..92a5e6c9b96c 100644 --- a/azurerm/resource_arm_container_service.go +++ b/azurerm/resource_arm_container_service.go @@ -18,9 +18,9 @@ import ( func resourceArmContainerService() *schema.Resource { return &schema.Resource{ - Create: resourceArmContainerServiceCreate, + Create: resourceArmContainerServiceCreateUpdate, Read: resourceArmContainerServiceRead, - Update: resourceArmContainerServiceCreate, + Update: resourceArmContainerServiceCreateUpdate, Delete: resourceArmContainerServiceDelete, DeprecationMessage: `Azure Container Service (ACS) has been deprecated in favour of Azure (Managed) Kubernetes Service (AKS). @@ -191,7 +191,7 @@ More information can be found here: https://azure.microsoft.com/en-us/updates/az } } -func resourceArmContainerServiceCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmContainerServiceCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient) ctx := meta.(*ArmClient).StopContext containerServiceClient := client.containerServicesClient diff --git a/azurerm/resource_arm_eventhub.go b/azurerm/resource_arm_eventhub.go index f1c7661939b8..68b1778c71b0 100644 --- a/azurerm/resource_arm_eventhub.go +++ b/azurerm/resource_arm_eventhub.go @@ -17,9 +17,9 @@ import ( func resourceArmEventHub() *schema.Resource { return &schema.Resource{ - Create: resourceArmEventHubCreate, + Create: resourceArmEventHubCreateUpdate, Read: resourceArmEventHubRead, - Update: resourceArmEventHubCreate, + Update: resourceArmEventHubCreateUpdate, Delete: resourceArmEventHubDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, @@ -136,7 +136,7 @@ func resourceArmEventHub() *schema.Resource { } } -func resourceArmEventHubCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmEventHubCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).eventHubClient ctx := meta.(*ArmClient).StopContext log.Printf("[INFO] preparing arguments for Azure ARM EventHub creation.") diff --git a/azurerm/resource_arm_eventhub_namespace.go b/azurerm/resource_arm_eventhub_namespace.go index d149ea73e7be..d5180e92c4ee 100644 --- a/azurerm/resource_arm_eventhub_namespace.go +++ b/azurerm/resource_arm_eventhub_namespace.go @@ -24,9 +24,9 @@ var eventHubNamespaceDefaultAuthorizationRule = "RootManageSharedAccessKey" func resourceArmEventHubNamespace() *schema.Resource { return &schema.Resource{ - Create: resourceArmEventHubNamespaceCreate, + Create: resourceArmEventHubNamespaceCreateUpdate, Read: resourceArmEventHubNamespaceRead, - Update: resourceArmEventHubNamespaceCreate, + Update: resourceArmEventHubNamespaceCreateUpdate, Delete: resourceArmEventHubNamespaceDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, @@ -103,7 +103,7 @@ func resourceArmEventHubNamespace() *schema.Resource { } } -func resourceArmEventHubNamespaceCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmEventHubNamespaceCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).eventHubNamespacesClient ctx := meta.(*ArmClient).StopContext log.Printf("[INFO] preparing arguments for AzureRM EventHub Namespace creation.") diff --git a/azurerm/resource_arm_loadbalancer.go b/azurerm/resource_arm_loadbalancer.go index 701f42795f4a..af6f0b938a8f 100644 --- a/azurerm/resource_arm_loadbalancer.go +++ b/azurerm/resource_arm_loadbalancer.go @@ -17,9 +17,9 @@ import ( func resourceArmLoadBalancer() *schema.Resource { return &schema.Resource{ - Create: resourceArmLoadBalancerCreate, + Create: resourceArmLoadBalancerCreateUpdate, Read: resourceArmLoadBalancerRead, - Update: resourceArmLoadBalancerCreate, + Update: resourceArmLoadBalancerCreateUpdate, Delete: resourceArmLoadBalancerDelete, Importer: &schema.ResourceImporter{ @@ -136,7 +136,7 @@ func resourceArmLoadBalancer() *schema.Resource { } } -func resourceArmLoadBalancerCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmLoadBalancerCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).loadBalancerClient ctx := meta.(*ArmClient).StopContext diff --git a/azurerm/resource_arm_loadbalancer_nat_pool.go b/azurerm/resource_arm_loadbalancer_nat_pool.go index 694bbe8cc270..626d901b8dff 100644 --- a/azurerm/resource_arm_loadbalancer_nat_pool.go +++ b/azurerm/resource_arm_loadbalancer_nat_pool.go @@ -17,9 +17,9 @@ import ( func resourceArmLoadBalancerNatPool() *schema.Resource { return &schema.Resource{ - Create: resourceArmLoadBalancerNatPoolCreate, + Create: resourceArmLoadBalancerNatPoolCreateUpdate, Read: resourceArmLoadBalancerNatPoolRead, - Update: resourceArmLoadBalancerNatPoolCreate, + Update: resourceArmLoadBalancerNatPoolCreateUpdate, Delete: resourceArmLoadBalancerNatPoolDelete, Importer: &schema.ResourceImporter{ State: loadBalancerSubResourceStateImporter, @@ -88,7 +88,7 @@ func resourceArmLoadBalancerNatPool() *schema.Resource { } } -func resourceArmLoadBalancerNatPoolCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmLoadBalancerNatPoolCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).loadBalancerClient ctx := meta.(*ArmClient).StopContext diff --git a/azurerm/resource_arm_loadbalancer_rule.go b/azurerm/resource_arm_loadbalancer_rule.go index f4adf8874534..22809526a371 100644 --- a/azurerm/resource_arm_loadbalancer_rule.go +++ b/azurerm/resource_arm_loadbalancer_rule.go @@ -18,9 +18,9 @@ import ( func resourceArmLoadBalancerRule() *schema.Resource { return &schema.Resource{ - Create: resourceArmLoadBalancerRuleCreate, + Create: resourceArmLoadBalancerRuleCreateUpdate, Read: resourceArmLoadBalancerRuleRead, - Update: resourceArmLoadBalancerRuleCreate, + Update: resourceArmLoadBalancerRuleCreateUpdate, Delete: resourceArmLoadBalancerRuleDelete, Importer: &schema.ResourceImporter{ @@ -115,7 +115,7 @@ func resourceArmLoadBalancerRule() *schema.Resource { } } -func resourceArmLoadBalancerRuleCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmLoadBalancerRuleCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).loadBalancerClient ctx := meta.(*ArmClient).StopContext diff --git a/azurerm/resource_arm_local_network_gateway.go b/azurerm/resource_arm_local_network_gateway.go index ba9fbd758fde..0dbf59d9c1db 100644 --- a/azurerm/resource_arm_local_network_gateway.go +++ b/azurerm/resource_arm_local_network_gateway.go @@ -11,9 +11,9 @@ import ( func resourceArmLocalNetworkGateway() *schema.Resource { return &schema.Resource{ - Create: resourceArmLocalNetworkGatewayCreate, + Create: resourceArmLocalNetworkGatewayCreateUpdate, Read: resourceArmLocalNetworkGatewayRead, - Update: resourceArmLocalNetworkGatewayCreate, + Update: resourceArmLocalNetworkGatewayCreateUpdate, Delete: resourceArmLocalNetworkGatewayDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, @@ -73,7 +73,7 @@ func resourceArmLocalNetworkGateway() *schema.Resource { } } -func resourceArmLocalNetworkGatewayCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmLocalNetworkGatewayCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).localNetConnClient ctx := meta.(*ArmClient).StopContext diff --git a/azurerm/resource_arm_managed_disk.go b/azurerm/resource_arm_managed_disk.go index fff1122da70f..45d7ca8bf28a 100644 --- a/azurerm/resource_arm_managed_disk.go +++ b/azurerm/resource_arm_managed_disk.go @@ -15,9 +15,9 @@ import ( func resourceArmManagedDisk() *schema.Resource { return &schema.Resource{ - Create: resourceArmManagedDiskCreate, + Create: resourceArmManagedDiskCreateUpdate, Read: resourceArmManagedDiskRead, - Update: resourceArmManagedDiskCreate, + Update: resourceArmManagedDiskCreateUpdate, Delete: resourceArmManagedDiskDelete, Importer: &schema.ResourceImporter{ @@ -112,7 +112,7 @@ func validateDiskSizeGB(v interface{}, _ string) (warnings []string, errors []er return warnings, errors } -func resourceArmManagedDiskCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmManagedDiskCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).diskClient ctx := meta.(*ArmClient).StopContext diff --git a/azurerm/resource_arm_mssql_elasticpool.go b/azurerm/resource_arm_mssql_elasticpool.go index a93c626e89ca..1e75c96dd440 100644 --- a/azurerm/resource_arm_mssql_elasticpool.go +++ b/azurerm/resource_arm_mssql_elasticpool.go @@ -17,9 +17,9 @@ import ( func resourceArmMsSqlElasticPool() *schema.Resource { return &schema.Resource{ - Create: resourceArmMsSqlElasticPoolCreate, + Create: resourceArmMsSqlElasticPoolCreateUpdate, Read: resourceArmMsSqlElasticPoolRead, - Update: resourceArmMsSqlElasticPoolCreate, + Update: resourceArmMsSqlElasticPoolCreateUpdate, Delete: resourceArmMsSqlElasticPoolDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, @@ -254,7 +254,7 @@ func resourceArmMsSqlElasticPool() *schema.Resource { } } -func resourceArmMsSqlElasticPoolCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmMsSqlElasticPoolCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).msSqlElasticPoolsClient ctx := meta.(*ArmClient).StopContext diff --git a/azurerm/resource_arm_network_security_group.go b/azurerm/resource_arm_network_security_group.go index 2957b03af4d6..97504ea610f9 100644 --- a/azurerm/resource_arm_network_security_group.go +++ b/azurerm/resource_arm_network_security_group.go @@ -15,9 +15,9 @@ var networkSecurityGroupResourceName = "azurerm_network_security_group" func resourceArmNetworkSecurityGroup() *schema.Resource { return &schema.Resource{ - Create: resourceArmNetworkSecurityGroupCreate, + Create: resourceArmNetworkSecurityGroupCreateUpdate, Read: resourceArmNetworkSecurityGroupRead, - Update: resourceArmNetworkSecurityGroupCreate, + Update: resourceArmNetworkSecurityGroupCreateUpdate, Delete: resourceArmNetworkSecurityGroupDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, @@ -158,7 +158,7 @@ func resourceArmNetworkSecurityGroup() *schema.Resource { } } -func resourceArmNetworkSecurityGroupCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmNetworkSecurityGroupCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).secGroupClient ctx := meta.(*ArmClient).StopContext diff --git a/azurerm/resource_arm_network_security_rule.go b/azurerm/resource_arm_network_security_rule.go index fb3a08e3da5e..f5195a98ef5a 100644 --- a/azurerm/resource_arm_network_security_rule.go +++ b/azurerm/resource_arm_network_security_rule.go @@ -11,9 +11,9 @@ import ( func resourceArmNetworkSecurityRule() *schema.Resource { return &schema.Resource{ - Create: resourceArmNetworkSecurityRuleCreate, + Create: resourceArmNetworkSecurityRuleCreateUpdate, Read: resourceArmNetworkSecurityRuleRead, - Update: resourceArmNetworkSecurityRuleCreate, + Update: resourceArmNetworkSecurityRuleCreateUpdate, Delete: resourceArmNetworkSecurityRuleDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, @@ -152,7 +152,7 @@ func resourceArmNetworkSecurityRule() *schema.Resource { } } -func resourceArmNetworkSecurityRuleCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmNetworkSecurityRuleCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).secRuleClient ctx := meta.(*ArmClient).StopContext diff --git a/azurerm/resource_arm_public_ip.go b/azurerm/resource_arm_public_ip.go index d3c79b420e46..ef65a08b3342 100644 --- a/azurerm/resource_arm_public_ip.go +++ b/azurerm/resource_arm_public_ip.go @@ -15,9 +15,9 @@ import ( func resourceArmPublicIp() *schema.Resource { return &schema.Resource{ - Create: resourceArmPublicIpCreate, + Create: resourceArmPublicIpCreateUpdate, Read: resourceArmPublicIpRead, - Update: resourceArmPublicIpCreate, + Update: resourceArmPublicIpCreateUpdate, Delete: resourceArmPublicIpDelete, Importer: &schema.ResourceImporter{ @@ -117,7 +117,7 @@ func resourceArmPublicIp() *schema.Resource { } } -func resourceArmPublicIpCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmPublicIpCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).publicIPClient ctx := meta.(*ArmClient).StopContext diff --git a/azurerm/resource_arm_servicebus_namespace.go b/azurerm/resource_arm_servicebus_namespace.go index efc9f48da302..b145faa09926 100644 --- a/azurerm/resource_arm_servicebus_namespace.go +++ b/azurerm/resource_arm_servicebus_namespace.go @@ -20,9 +20,9 @@ var serviceBusNamespaceDefaultAuthorizationRule = "RootManageSharedAccessKey" func resourceArmServiceBusNamespace() *schema.Resource { return &schema.Resource{ - Create: resourceArmServiceBusNamespaceCreate, + Create: resourceArmServiceBusNamespaceCreateUpdate, Read: resourceArmServiceBusNamespaceRead, - Update: resourceArmServiceBusNamespaceCreate, + Update: resourceArmServiceBusNamespaceCreateUpdate, Delete: resourceArmServiceBusNamespaceDelete, Importer: &schema.ResourceImporter{ @@ -108,7 +108,7 @@ func resourceArmServiceBusNamespace() *schema.Resource { } } -func resourceArmServiceBusNamespaceCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmServiceBusNamespaceCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).serviceBusNamespacesClient ctx := meta.(*ArmClient).StopContext diff --git a/azurerm/resource_arm_servicebus_subscription.go b/azurerm/resource_arm_servicebus_subscription.go index 4e13258c581d..db6ecf737456 100644 --- a/azurerm/resource_arm_servicebus_subscription.go +++ b/azurerm/resource_arm_servicebus_subscription.go @@ -12,9 +12,9 @@ import ( func resourceArmServiceBusSubscription() *schema.Resource { return &schema.Resource{ - Create: resourceArmServiceBusSubscriptionCreate, + Create: resourceArmServiceBusSubscriptionCreateUpdate, Read: resourceArmServiceBusSubscriptionRead, - Update: resourceArmServiceBusSubscriptionCreate, + Update: resourceArmServiceBusSubscriptionCreateUpdate, Delete: resourceArmServiceBusSubscriptionDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, @@ -101,7 +101,7 @@ func resourceArmServiceBusSubscription() *schema.Resource { } } -func resourceArmServiceBusSubscriptionCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmServiceBusSubscriptionCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).serviceBusSubscriptionsClient ctx := meta.(*ArmClient).StopContext log.Printf("[INFO] preparing arguments for Azure ARM ServiceBus Subscription creation.") diff --git a/azurerm/resource_arm_servicebus_topic.go b/azurerm/resource_arm_servicebus_topic.go index 1b234a59fb1d..a24d57e4905f 100644 --- a/azurerm/resource_arm_servicebus_topic.go +++ b/azurerm/resource_arm_servicebus_topic.go @@ -13,9 +13,9 @@ import ( func resourceArmServiceBusTopic() *schema.Resource { return &schema.Resource{ - Create: resourceArmServiceBusTopicCreate, + Create: resourceArmServiceBusTopicCreateUpdate, Read: resourceArmServiceBusTopicRead, - Update: resourceArmServiceBusTopicCreate, + Update: resourceArmServiceBusTopicCreateUpdate, Delete: resourceArmServiceBusTopicDelete, Importer: &schema.ResourceImporter{ @@ -116,7 +116,7 @@ func resourceArmServiceBusTopic() *schema.Resource { } } -func resourceArmServiceBusTopicCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmServiceBusTopicCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).serviceBusTopicsClient ctx := meta.(*ArmClient).StopContext log.Printf("[INFO] preparing arguments for Azure ServiceBus Topic creation.") diff --git a/azurerm/resource_arm_subnet.go b/azurerm/resource_arm_subnet.go index 92a2ba294831..ecab344485e1 100644 --- a/azurerm/resource_arm_subnet.go +++ b/azurerm/resource_arm_subnet.go @@ -13,9 +13,9 @@ var subnetResourceName = "azurerm_subnet" func resourceArmSubnet() *schema.Resource { return &schema.Resource{ - Create: resourceArmSubnetCreate, + Create: resourceArmSubnetCreateUpdate, Read: resourceArmSubnetRead, - Update: resourceArmSubnetCreate, + Update: resourceArmSubnetCreateUpdate, Delete: resourceArmSubnetDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, @@ -70,7 +70,7 @@ func resourceArmSubnet() *schema.Resource { } } -func resourceArmSubnetCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmSubnetCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).subnetClient ctx := meta.(*ArmClient).StopContext diff --git a/azurerm/resource_arm_template_deployment.go b/azurerm/resource_arm_template_deployment.go index cdad713d91e5..aeab59c1f123 100644 --- a/azurerm/resource_arm_template_deployment.go +++ b/azurerm/resource_arm_template_deployment.go @@ -18,9 +18,9 @@ import ( func resourceArmTemplateDeployment() *schema.Resource { return &schema.Resource{ - Create: resourceArmTemplateDeploymentCreate, + Create: resourceArmTemplateDeploymentCreateUpdate, Read: resourceArmTemplateDeploymentRead, - Update: resourceArmTemplateDeploymentCreate, + Update: resourceArmTemplateDeploymentCreateUpdate, Delete: resourceArmTemplateDeploymentDelete, Schema: map[string]*schema.Schema{ @@ -70,7 +70,7 @@ func resourceArmTemplateDeployment() *schema.Resource { } } -func resourceArmTemplateDeploymentCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmTemplateDeploymentCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient) deployClient := client.deploymentsClient ctx := client.StopContext diff --git a/azurerm/resource_arm_traffic_manager_endpoint.go b/azurerm/resource_arm_traffic_manager_endpoint.go index bcb05f512941..3aaf78642100 100644 --- a/azurerm/resource_arm_traffic_manager_endpoint.go +++ b/azurerm/resource_arm_traffic_manager_endpoint.go @@ -13,9 +13,9 @@ import ( func resourceArmTrafficManagerEndpoint() *schema.Resource { return &schema.Resource{ - Create: resourceArmTrafficManagerEndpointCreate, + Create: resourceArmTrafficManagerEndpointCreateUpdate, Read: resourceArmTrafficManagerEndpointRead, - Update: resourceArmTrafficManagerEndpointCreate, + Update: resourceArmTrafficManagerEndpointCreateUpdate, Delete: resourceArmTrafficManagerEndpointDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, @@ -112,7 +112,7 @@ func resourceArmTrafficManagerEndpoint() *schema.Resource { } } -func resourceArmTrafficManagerEndpointCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmTrafficManagerEndpointCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).trafficManagerEndpointsClient log.Printf("[INFO] preparing arguments for TrafficManager Endpoint creation.") diff --git a/azurerm/resource_arm_traffic_manager_profile.go b/azurerm/resource_arm_traffic_manager_profile.go index c956333c6808..06277ccb998a 100644 --- a/azurerm/resource_arm_traffic_manager_profile.go +++ b/azurerm/resource_arm_traffic_manager_profile.go @@ -15,9 +15,9 @@ import ( func resourceArmTrafficManagerProfile() *schema.Resource { return &schema.Resource{ - Create: resourceArmTrafficManagerProfileCreate, + Create: resourceArmTrafficManagerProfileCreateUpdate, Read: resourceArmTrafficManagerProfileRead, - Update: resourceArmTrafficManagerProfileCreate, + Update: resourceArmTrafficManagerProfileCreateUpdate, Delete: resourceArmTrafficManagerProfileDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, @@ -114,7 +114,7 @@ func resourceArmTrafficManagerProfile() *schema.Resource { } } -func resourceArmTrafficManagerProfileCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmTrafficManagerProfileCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).trafficManagerProfilesClient log.Printf("[INFO] preparing arguments for Azure ARM virtual network creation.") diff --git a/azurerm/resource_arm_virtual_machine.go b/azurerm/resource_arm_virtual_machine.go index c4f8d747bee7..56294b23242c 100644 --- a/azurerm/resource_arm_virtual_machine.go +++ b/azurerm/resource_arm_virtual_machine.go @@ -21,9 +21,9 @@ var virtualMachineResourceName = "azurerm_virtual_machine" func resourceArmVirtualMachine() *schema.Resource { return &schema.Resource{ - Create: resourceArmVirtualMachineCreate, + Create: resourceArmVirtualMachineCreateUpdate, Read: resourceArmVirtualMachineRead, - Update: resourceArmVirtualMachineCreate, + Update: resourceArmVirtualMachineCreateUpdate, Delete: resourceArmVirtualMachineDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, @@ -553,7 +553,7 @@ func resourceArmVirtualMachine() *schema.Resource { } } -func resourceArmVirtualMachineCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmVirtualMachineCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).vmClient ctx := meta.(*ArmClient).StopContext diff --git a/azurerm/resource_arm_virtual_machine_extension.go b/azurerm/resource_arm_virtual_machine_extension.go index 9257987a25bb..6e4bcce43cbe 100644 --- a/azurerm/resource_arm_virtual_machine_extension.go +++ b/azurerm/resource_arm_virtual_machine_extension.go @@ -12,9 +12,9 @@ import ( func resourceArmVirtualMachineExtensions() *schema.Resource { return &schema.Resource{ - Create: resourceArmVirtualMachineExtensionsCreate, + Create: resourceArmVirtualMachineExtensionsCreateUpdate, Read: resourceArmVirtualMachineExtensionsRead, - Update: resourceArmVirtualMachineExtensionsCreate, + Update: resourceArmVirtualMachineExtensionsCreateUpdate, Delete: resourceArmVirtualMachineExtensionsDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, @@ -78,7 +78,7 @@ func resourceArmVirtualMachineExtensions() *schema.Resource { } } -func resourceArmVirtualMachineExtensionsCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmVirtualMachineExtensionsCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).vmExtensionClient ctx := meta.(*ArmClient).StopContext diff --git a/azurerm/resource_arm_virtual_machine_scale_set.go b/azurerm/resource_arm_virtual_machine_scale_set.go index 07dee3ade3d7..dd499f5fd6c8 100644 --- a/azurerm/resource_arm_virtual_machine_scale_set.go +++ b/azurerm/resource_arm_virtual_machine_scale_set.go @@ -20,9 +20,9 @@ import ( func resourceArmVirtualMachineScaleSet() *schema.Resource { return &schema.Resource{ - Create: resourceArmVirtualMachineScaleSetCreate, + Create: resourceArmVirtualMachineScaleSetCreateUpdate, Read: resourceArmVirtualMachineScaleSetRead, - Update: resourceArmVirtualMachineScaleSetCreate, + Update: resourceArmVirtualMachineScaleSetCreateUpdate, Delete: resourceArmVirtualMachineScaleSetDelete, Importer: &schema.ResourceImporter{ @@ -739,7 +739,7 @@ func resourceArmVirtualMachineScaleSet() *schema.Resource { } } -func resourceArmVirtualMachineScaleSetCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmVirtualMachineScaleSetCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).vmScaleSetClient ctx := meta.(*ArmClient).StopContext diff --git a/azurerm/resource_arm_virtual_network.go b/azurerm/resource_arm_virtual_network.go index 1fb88b513476..f09a1019689f 100644 --- a/azurerm/resource_arm_virtual_network.go +++ b/azurerm/resource_arm_virtual_network.go @@ -18,9 +18,9 @@ var virtualNetworkResourceName = "azurerm_virtual_network" func resourceArmVirtualNetwork() *schema.Resource { return &schema.Resource{ - Create: resourceArmVirtualNetworkCreate, + Create: resourceArmVirtualNetworkCreateUpdate, Read: resourceArmVirtualNetworkRead, - Update: resourceArmVirtualNetworkCreate, + Update: resourceArmVirtualNetworkCreateUpdate, Delete: resourceArmVirtualNetworkDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, @@ -91,7 +91,7 @@ func resourceArmVirtualNetwork() *schema.Resource { } } -func resourceArmVirtualNetworkCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmVirtualNetworkCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).vnetClient ctx := meta.(*ArmClient).StopContext diff --git a/azurerm/resource_arm_virtual_network_peering.go b/azurerm/resource_arm_virtual_network_peering.go index 8b574db59e66..9f7a6e97e583 100644 --- a/azurerm/resource_arm_virtual_network_peering.go +++ b/azurerm/resource_arm_virtual_network_peering.go @@ -16,9 +16,9 @@ var peerMutex = &sync.Mutex{} func resourceArmVirtualNetworkPeering() *schema.Resource { return &schema.Resource{ - Create: resourceArmVirtualNetworkPeeringCreate, + Create: resourceArmVirtualNetworkPeeringCreateUpdate, Read: resourceArmVirtualNetworkPeeringRead, - Update: resourceArmVirtualNetworkPeeringCreate, + Update: resourceArmVirtualNetworkPeeringCreateUpdate, Delete: resourceArmVirtualNetworkPeeringDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, @@ -72,7 +72,7 @@ func resourceArmVirtualNetworkPeering() *schema.Resource { } } -func resourceArmVirtualNetworkPeeringCreate(d *schema.ResourceData, meta interface{}) error { +func resourceArmVirtualNetworkPeeringCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).vnetPeeringsClient ctx := meta.(*ArmClient).StopContext