merge master -S

.travis.yml

@@ -15,9 +15,9 @@ install:
 - make tools
 
 script:
-- make lint
 - make test
 - make vendor-status
+- make lint
 - make website-test
 
 branches:

CHANGELOG.md

@@ -13,8 +13,11 @@ IMPROVEMENTS:
 
 * dependencies: upgrading the `network` SDK to `2018-08-01` [GH-2433]
 * Data Source: `azurerm_app_service` - exporting the `possible_outbound_ip_addresses` [GH-2513]
+* Data Source:  `azurerm_container_registry` - now exports `tags` [GH-2607]
 * `azurerm_app_service` - exporting the `possible_outbound_ip_addresses` [GH-2513]
 * `azurerm_firewall` - renaming the `public_ip_address_id` property to `ip_address_id` [GH-2433]
+* `azurerm_log_analytics_workspace_linked_service` - now correctly handels uppcase `workspace_name` values  [GH-2594]
+* `azurerm_network_interface` - support for IPv6 addresses [GH-2548]
 * `azurerm_policy_assignment` - support for Managed Service Identity [GH-2549]
 * `azurerm_policy_definition` - polices can now be assigned to a management group [GH-2490]
 * `azurerm_redis_cache` - add availability zone support [GH-2580]

azurerm/data_source_arm_container_registry.go → azurerm/data_source_container_registry.go

@@ -20,31 +20,40 @@ func dataSourceArmContainerRegistry() *schema.Resource {
 			},
 
 			"resource_group_name": resourceGroupNameForDataSourceSchema(),
-			"location":            locationForDataSourceSchema(),
+
+			"location": locationForDataSourceSchema(),
+
 			"admin_enabled": {
 				Type:     schema.TypeBool,
 				Computed: true,
 			},
+
 			"admin_password": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+
 			"admin_username": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+
 			"login_server": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+
 			"sku": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+
 			"storage_account_id": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+
+			"tags": tagsForDataSourceSchema(),
 		},
 	}
 }

azurerm/data_source_log_analytics_workspace_test.go

@@ -30,7 +30,7 @@ func TestAccDataSourceAzureRMLogAnalyticsWorkspace_basic(t *testing.T) {
 }
 
 func testAccDataSourceAzureRMLogAnalyticsWorkspace_basicWithDataSource(rInt int, location string) string {
-	config := testAccAzureRMLogAnalyticsWorkspace_retentionInDaysComplete(rInt, location)
+	config := testAccAzureRMLogAnalyticsWorkspace_complete(rInt, location)
 	return fmt.Sprintf(`
 %s
 

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
 

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
 

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

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.")

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.")

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
 

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
 

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
 

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
 

azurerm/resource_arm_log_analytics_solution.go

@@ -36,7 +36,7 @@ func resourceArmLogAnalyticsSolution() *schema.Resource {
 				Type:         schema.TypeString,
 				Required:     true,
 				ForceNew:     true,
-				ValidateFunc: validate.NoEmptyStrings,
+				ValidateFunc: validateAzureRmLogAnalyticsWorkspaceName,
 			},
 
 			"workspace_resource_id": {

azurerm/resource_arm_log_analytics_solution_test.go

@@ -122,7 +122,7 @@ resource "azurerm_resource_group" "test" {
 }
 
 resource "azurerm_log_analytics_workspace" "test" {
-  name                = "acctest-dep-%d"
+  name                = "acctestLAW-%d"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
   sku                 = "PerGB2018"
@@ -151,7 +151,7 @@ resource "azurerm_resource_group" "test" {
 }
 
 resource "azurerm_log_analytics_workspace" "test" {
-  name                = "acctest-dep-%d"
+  name                = "acctestLAW-%d"
   location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
   sku                 = "PerGB2018"