From 8c0d13420fd3de96826cdfe9c951807d5b5623cf Mon Sep 17 00:00:00 2001 From: Tony Fortes Ramos Date: Tue, 23 Oct 2018 13:16:16 +0200 Subject: [PATCH 01/14] azurerm_log_analytics_linked_service: Add client --- azurerm/config.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/azurerm/config.go b/azurerm/config.go index 420af3f3bd7f..58351536b4a0 100644 --- a/azurerm/config.go +++ b/azurerm/config.go @@ -108,7 +108,6 @@ type ArmClient struct { eventHubConsumerGroupClient eventhub.ConsumerGroupsClient eventHubNamespacesClient eventhub.NamespacesClient - workspacesClient operationalinsights.WorkspacesClient solutionsClient operationsmanagement.SolutionsClient redisClient redis.Client @@ -197,6 +196,10 @@ type ArmClient struct { keyVaultClient keyvault.VaultsClient keyVaultManagementClient keyVault.BaseClient + // LogServices + linkedServicesClient operationalinsights.LinkedServicesClient + workspacesClient operationalinsights.WorkspacesClient + // Logic logicWorkflowsClient logic.WorkflowsClient @@ -996,6 +999,10 @@ func (c *ArmClient) registerOperationalInsightsClients(endpoint, subscriptionId solutionsClient := operationsmanagement.NewSolutionsClientWithBaseURI(endpoint, subscriptionId, "Microsoft.OperationsManagement", "solutions", "testing") c.configureClient(&solutionsClient.Client, auth) c.solutionsClient = solutionsClient + + lsClient := operationalinsights.NewLinkedServicesClientWithBaseURI(endpoint, subscriptionId) + c.configureClient(&lsClient.Client, auth) + c.linkedServicesClient = lsClient } func (c *ArmClient) registerRecoveryServiceClients(endpoint, subscriptionId string, auth autorest.Authorizer) { From ec496afdede5c7bcede0504a8c205e76347fc5c0 Mon Sep 17 00:00:00 2001 From: Tony Fortes Ramos Date: Tue, 23 Oct 2018 13:17:05 +0200 Subject: [PATCH 02/14] azurerm_log_analytics_linked_service: Add linked service resource --- azurerm/provider.go | 197 +++++++++--------- ...source_arm_log_analytics_linked_service.go | 178 ++++++++++++++++ 2 files changed, 277 insertions(+), 98 deletions(-) create mode 100644 azurerm/resource_arm_log_analytics_linked_service.go diff --git a/azurerm/provider.go b/azurerm/provider.go index afb1c3b2195e..927955bfb974 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -130,104 +130,105 @@ func Provider() terraform.ResourceProvider { }, ResourcesMap: map[string]*schema.Resource{ - "azurerm_azuread_application": resourceArmActiveDirectoryApplication(), - "azurerm_azuread_service_principal": resourceArmActiveDirectoryServicePrincipal(), - "azurerm_azuread_service_principal_password": resourceArmActiveDirectoryServicePrincipalPassword(), - "azurerm_api_management": resourceArmApiManagementService(), - "azurerm_application_gateway": resourceArmApplicationGateway(), - "azurerm_application_insights": resourceArmApplicationInsights(), - "azurerm_application_security_group": resourceArmApplicationSecurityGroup(), - "azurerm_app_service": resourceArmAppService(), - "azurerm_app_service_plan": resourceArmAppServicePlan(), - "azurerm_app_service_active_slot": resourceArmAppServiceActiveSlot(), - "azurerm_app_service_custom_hostname_binding": resourceArmAppServiceCustomHostnameBinding(), - "azurerm_app_service_slot": resourceArmAppServiceSlot(), - "azurerm_automation_account": resourceArmAutomationAccount(), - "azurerm_automation_credential": resourceArmAutomationCredential(), - "azurerm_automation_dsc_configuration": resourceArmAutomationDscConfiguration(), - "azurerm_automation_dsc_nodeconfiguration": resourceArmAutomationDscNodeConfiguration(), - "azurerm_automation_module": resourceArmAutomationModule(), - "azurerm_automation_runbook": resourceArmAutomationRunbook(), - "azurerm_automation_schedule": resourceArmAutomationSchedule(), - "azurerm_autoscale_setting": resourceArmAutoScaleSetting(), - "azurerm_availability_set": resourceArmAvailabilitySet(), - "azurerm_cdn_endpoint": resourceArmCdnEndpoint(), - "azurerm_cdn_profile": resourceArmCdnProfile(), - "azurerm_cognitive_account": resourceArmCognitiveAccount(), - "azurerm_container_registry": resourceArmContainerRegistry(), - "azurerm_container_service": resourceArmContainerService(), - "azurerm_container_group": resourceArmContainerGroup(), - "azurerm_cosmosdb_account": resourceArmCosmosDBAccount(), - "azurerm_databricks_workspace": resourceArmDatabricksWorkspace(), - "azurerm_data_lake_analytics_account": resourceArmDataLakeAnalyticsAccount(), - "azurerm_data_lake_analytics_firewall_rule": resourceArmDataLakeAnalyticsFirewallRule(), - "azurerm_data_lake_store": resourceArmDataLakeStore(), - "azurerm_data_lake_store_file": resourceArmDataLakeStoreFile(), - "azurerm_data_lake_store_firewall_rule": resourceArmDataLakeStoreFirewallRule(), - "azurerm_dev_test_lab": resourceArmDevTestLab(), - "azurerm_dev_test_policy": resourceArmDevTestPolicy(), - "azurerm_dev_test_linux_virtual_machine": resourceArmDevTestLinuxVirtualMachine(), - "azurerm_dev_test_virtual_network": resourceArmDevTestVirtualNetwork(), - "azurerm_dev_test_windows_virtual_machine": resourceArmDevTestWindowsVirtualMachine(), - "azurerm_dns_a_record": resourceArmDnsARecord(), - "azurerm_dns_aaaa_record": resourceArmDnsAAAARecord(), - "azurerm_dns_caa_record": resourceArmDnsCaaRecord(), - "azurerm_dns_cname_record": resourceArmDnsCNameRecord(), - "azurerm_dns_mx_record": resourceArmDnsMxRecord(), - "azurerm_dns_ns_record": resourceArmDnsNsRecord(), - "azurerm_dns_ptr_record": resourceArmDnsPtrRecord(), - "azurerm_dns_srv_record": resourceArmDnsSrvRecord(), - "azurerm_dns_txt_record": resourceArmDnsTxtRecord(), - "azurerm_dns_zone": resourceArmDnsZone(), - "azurerm_eventgrid_topic": resourceArmEventGridTopic(), - "azurerm_eventhub": resourceArmEventHub(), - "azurerm_eventhub_authorization_rule": resourceArmEventHubAuthorizationRule(), - "azurerm_eventhub_consumer_group": resourceArmEventHubConsumerGroup(), - "azurerm_eventhub_namespace": resourceArmEventHubNamespace(), - "azurerm_eventhub_namespace_authorization_rule": resourceArmEventHubNamespaceAuthorizationRule(), - "azurerm_express_route_circuit": resourceArmExpressRouteCircuit(), - "azurerm_express_route_circuit_authorization": resourceArmExpressRouteCircuitAuthorization(), - "azurerm_express_route_circuit_peering": resourceArmExpressRouteCircuitPeering(), - "azurerm_firewall": resourceArmFirewall(), - "azurerm_firewall_network_rule_collection": resourceArmFirewallNetworkRuleCollection(), - "azurerm_function_app": resourceArmFunctionApp(), - "azurerm_image": resourceArmImage(), - "azurerm_iothub": resourceArmIotHub(), - "azurerm_key_vault": resourceArmKeyVault(), - "azurerm_key_vault_access_policy": resourceArmKeyVaultAccessPolicy(), - "azurerm_key_vault_certificate": resourceArmKeyVaultCertificate(), - "azurerm_key_vault_key": resourceArmKeyVaultKey(), - "azurerm_key_vault_secret": resourceArmKeyVaultSecret(), - "azurerm_kubernetes_cluster": resourceArmKubernetesCluster(), - "azurerm_lb": resourceArmLoadBalancer(), - "azurerm_lb_backend_address_pool": resourceArmLoadBalancerBackendAddressPool(), - "azurerm_lb_nat_rule": resourceArmLoadBalancerNatRule(), - "azurerm_lb_nat_pool": resourceArmLoadBalancerNatPool(), - "azurerm_lb_probe": resourceArmLoadBalancerProbe(), - "azurerm_lb_rule": resourceArmLoadBalancerRule(), - "azurerm_local_network_gateway": resourceArmLocalNetworkGateway(), - "azurerm_log_analytics_solution": resourceArmLogAnalyticsSolution(), - "azurerm_log_analytics_workspace": resourceArmLogAnalyticsWorkspace(), - "azurerm_logic_app_action_custom": resourceArmLogicAppActionCustom(), - "azurerm_logic_app_action_http": resourceArmLogicAppActionHTTP(), - "azurerm_logic_app_trigger_custom": resourceArmLogicAppTriggerCustom(), - "azurerm_logic_app_trigger_http_request": resourceArmLogicAppTriggerHttpRequest(), - "azurerm_logic_app_trigger_recurrence": resourceArmLogicAppTriggerRecurrence(), - "azurerm_logic_app_workflow": resourceArmLogicAppWorkflow(), - "azurerm_managed_disk": resourceArmManagedDisk(), - "azurerm_management_lock": resourceArmManagementLock(), - "azurerm_management_group": resourceArmManagementGroup(), - "azurerm_metric_alertrule": resourceArmMetricAlertRule(), - "azurerm_monitor_action_group": resourceArmMonitorActionGroup(), - "azurerm_monitor_activity_log_alert": resourceArmMonitorActivityLogAlert(), - "azurerm_monitor_log_profile": resourceArmMonitorLogProfile(), - "azurerm_monitor_metric_alert": resourceArmMonitorMetricAlert(), - "azurerm_mysql_configuration": resourceArmMySQLConfiguration(), - "azurerm_mysql_database": resourceArmMySqlDatabase(), - "azurerm_mysql_firewall_rule": resourceArmMySqlFirewallRule(), - "azurerm_mysql_server": resourceArmMySqlServer(), - "azurerm_mysql_virtual_network_rule": resourceArmMySqlVirtualNetworkRule(), - "azurerm_network_interface": resourceArmNetworkInterface(), + "azurerm_azuread_application": resourceArmActiveDirectoryApplication(), + "azurerm_azuread_service_principal": resourceArmActiveDirectoryServicePrincipal(), + "azurerm_azuread_service_principal_password": resourceArmActiveDirectoryServicePrincipalPassword(), + "azurerm_api_management": resourceArmApiManagementService(), + "azurerm_application_gateway": resourceArmApplicationGateway(), + "azurerm_application_insights": resourceArmApplicationInsights(), + "azurerm_application_security_group": resourceArmApplicationSecurityGroup(), + "azurerm_app_service": resourceArmAppService(), + "azurerm_app_service_plan": resourceArmAppServicePlan(), + "azurerm_app_service_active_slot": resourceArmAppServiceActiveSlot(), + "azurerm_app_service_custom_hostname_binding": resourceArmAppServiceCustomHostnameBinding(), + "azurerm_app_service_slot": resourceArmAppServiceSlot(), + "azurerm_automation_account": resourceArmAutomationAccount(), + "azurerm_automation_credential": resourceArmAutomationCredential(), + "azurerm_automation_dsc_configuration": resourceArmAutomationDscConfiguration(), + "azurerm_automation_dsc_nodeconfiguration": resourceArmAutomationDscNodeConfiguration(), + "azurerm_automation_module": resourceArmAutomationModule(), + "azurerm_automation_runbook": resourceArmAutomationRunbook(), + "azurerm_automation_schedule": resourceArmAutomationSchedule(), + "azurerm_autoscale_setting": resourceArmAutoScaleSetting(), + "azurerm_availability_set": resourceArmAvailabilitySet(), + "azurerm_cdn_endpoint": resourceArmCdnEndpoint(), + "azurerm_cdn_profile": resourceArmCdnProfile(), + "azurerm_cognitive_account": resourceArmCognitiveAccount(), + "azurerm_container_registry": resourceArmContainerRegistry(), + "azurerm_container_service": resourceArmContainerService(), + "azurerm_container_group": resourceArmContainerGroup(), + "azurerm_cosmosdb_account": resourceArmCosmosDBAccount(), + "azurerm_databricks_workspace": resourceArmDatabricksWorkspace(), + "azurerm_data_lake_analytics_account": resourceArmDataLakeAnalyticsAccount(), + "azurerm_data_lake_analytics_firewall_rule": resourceArmDataLakeAnalyticsFirewallRule(), + "azurerm_data_lake_store": resourceArmDataLakeStore(), + "azurerm_data_lake_store_file": resourceArmDataLakeStoreFile(), + "azurerm_data_lake_store_firewall_rule": resourceArmDataLakeStoreFirewallRule(), + "azurerm_dev_test_lab": resourceArmDevTestLab(), + "azurerm_dev_test_policy": resourceArmDevTestPolicy(), + "azurerm_dev_test_linux_virtual_machine": resourceArmDevTestLinuxVirtualMachine(), + "azurerm_dev_test_virtual_network": resourceArmDevTestVirtualNetwork(), + "azurerm_dev_test_windows_virtual_machine": resourceArmDevTestWindowsVirtualMachine(), + "azurerm_dns_a_record": resourceArmDnsARecord(), + "azurerm_dns_aaaa_record": resourceArmDnsAAAARecord(), + "azurerm_dns_caa_record": resourceArmDnsCaaRecord(), + "azurerm_dns_cname_record": resourceArmDnsCNameRecord(), + "azurerm_dns_mx_record": resourceArmDnsMxRecord(), + "azurerm_dns_ns_record": resourceArmDnsNsRecord(), + "azurerm_dns_ptr_record": resourceArmDnsPtrRecord(), + "azurerm_dns_srv_record": resourceArmDnsSrvRecord(), + "azurerm_dns_txt_record": resourceArmDnsTxtRecord(), + "azurerm_dns_zone": resourceArmDnsZone(), + "azurerm_eventgrid_topic": resourceArmEventGridTopic(), + "azurerm_eventhub": resourceArmEventHub(), + "azurerm_eventhub_authorization_rule": resourceArmEventHubAuthorizationRule(), + "azurerm_eventhub_consumer_group": resourceArmEventHubConsumerGroup(), + "azurerm_eventhub_namespace": resourceArmEventHubNamespace(), + "azurerm_eventhub_namespace_authorization_rule": resourceArmEventHubNamespaceAuthorizationRule(), + "azurerm_express_route_circuit": resourceArmExpressRouteCircuit(), + "azurerm_express_route_circuit_authorization": resourceArmExpressRouteCircuitAuthorization(), + "azurerm_express_route_circuit_peering": resourceArmExpressRouteCircuitPeering(), + "azurerm_firewall": resourceArmFirewall(), + "azurerm_firewall_network_rule_collection": resourceArmFirewallNetworkRuleCollection(), + "azurerm_function_app": resourceArmFunctionApp(), + "azurerm_image": resourceArmImage(), + "azurerm_iothub": resourceArmIotHub(), + "azurerm_key_vault": resourceArmKeyVault(), + "azurerm_key_vault_access_policy": resourceArmKeyVaultAccessPolicy(), + "azurerm_key_vault_certificate": resourceArmKeyVaultCertificate(), + "azurerm_key_vault_key": resourceArmKeyVaultKey(), + "azurerm_key_vault_secret": resourceArmKeyVaultSecret(), + "azurerm_kubernetes_cluster": resourceArmKubernetesCluster(), + "azurerm_lb": resourceArmLoadBalancer(), + "azurerm_lb_backend_address_pool": resourceArmLoadBalancerBackendAddressPool(), + "azurerm_lb_nat_rule": resourceArmLoadBalancerNatRule(), + "azurerm_lb_nat_pool": resourceArmLoadBalancerNatPool(), + "azurerm_lb_probe": resourceArmLoadBalancerProbe(), + "azurerm_lb_rule": resourceArmLoadBalancerRule(), + "azurerm_local_network_gateway": resourceArmLocalNetworkGateway(), + "azurerm_log_analytics_linked_service": resourceArmLogAnalyticsLinkedService(), + "azurerm_log_analytics_solution": resourceArmLogAnalyticsSolution(), + "azurerm_log_analytics_workspace": resourceArmLogAnalyticsWorkspace(), + "azurerm_logic_app_action_custom": resourceArmLogicAppActionCustom(), + "azurerm_logic_app_action_http": resourceArmLogicAppActionHTTP(), + "azurerm_logic_app_trigger_custom": resourceArmLogicAppTriggerCustom(), + "azurerm_logic_app_trigger_http_request": resourceArmLogicAppTriggerHttpRequest(), + "azurerm_logic_app_trigger_recurrence": resourceArmLogicAppTriggerRecurrence(), + "azurerm_logic_app_workflow": resourceArmLogicAppWorkflow(), + "azurerm_managed_disk": resourceArmManagedDisk(), + "azurerm_management_lock": resourceArmManagementLock(), + "azurerm_management_group": resourceArmManagementGroup(), + "azurerm_metric_alertrule": resourceArmMetricAlertRule(), + "azurerm_monitor_action_group": resourceArmMonitorActionGroup(), + "azurerm_monitor_activity_log_alert": resourceArmMonitorActivityLogAlert(), + "azurerm_monitor_log_profile": resourceArmMonitorLogProfile(), + "azurerm_monitor_metric_alert": resourceArmMonitorMetricAlert(), + "azurerm_mysql_configuration": resourceArmMySQLConfiguration(), + "azurerm_mysql_database": resourceArmMySqlDatabase(), + "azurerm_mysql_firewall_rule": resourceArmMySqlFirewallRule(), + "azurerm_mysql_server": resourceArmMySqlServer(), + "azurerm_mysql_virtual_network_rule": resourceArmMySqlVirtualNetworkRule(), + "azurerm_network_interface": resourceArmNetworkInterface(), "azurerm_network_interface_application_gateway_backend_address_pool_association": resourceArmNetworkInterfaceApplicationGatewayBackendAddressPoolAssociation(), "azurerm_network_interface_backend_address_pool_association": resourceArmNetworkInterfaceBackendAddressPoolAssociation(), "azurerm_network_interface_nat_rule_association": resourceArmNetworkInterfaceNatRuleAssociation(), diff --git a/azurerm/resource_arm_log_analytics_linked_service.go b/azurerm/resource_arm_log_analytics_linked_service.go new file mode 100644 index 000000000000..611c35e4968a --- /dev/null +++ b/azurerm/resource_arm_log_analytics_linked_service.go @@ -0,0 +1,178 @@ +package azurerm + +import ( + "fmt" + "log" + + "github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights" + "github.com/hashicorp/terraform/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" +) + +func resourceArmLogAnalyticsLinkedService() *schema.Resource { + return &schema.Resource{ + Create: resourceArmLogAnalyticsLinkedServiceCreateUpdate, + Read: resourceArmLogAnalyticsLinkedServiceRead, + Update: resourceArmLogAnalyticsLinkedServiceCreateUpdate, + Delete: resourceArmLogAnalyticsLinkedServiceDelete, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Schema: map[string]*schema.Schema{ + "resource_group_name": resourceGroupNameDiffSuppressSchema(), + + "workspace_name": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + + "linked_service_name": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + Default: "automation", + }, + + "linked_service_properties": { + Type: schema.TypeMap, + Required: true, + ForceNew: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "resource_id": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + }, + }, + }, + }, + + "tags": tagsSchema(), + + // Exported properties + "name": { + Type: schema.TypeString, + Computed: true, + }, + }, + } +} + +func resourceArmLogAnalyticsLinkedServiceCreateUpdate(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).linkedServicesClient + ctx := meta.(*ArmClient).StopContext + log.Printf("[INFO] preparing arguments for AzureRM Log Analytics linked services creation.") + + resGroup := d.Get("resource_group_name").(string) + + workspaceName := d.Get("workspace_name").(string) + lsName := d.Get("linked_service_name").(string) + + props := d.Get("linked_service_properties").(map[string]interface{}) + resourceID := props["resource_id"].(string) + + tags := d.Get("tags").(map[string]interface{}) + + parameters := operationalinsights.LinkedService{ + // Name: &name, + Tags: expandTags(tags), + LinkedServiceProperties: &operationalinsights.LinkedServiceProperties{ + ResourceID: &resourceID, + }, + } + + _, err := client.CreateOrUpdate(ctx, resGroup, workspaceName, lsName, parameters) + if err != nil { + return err + } + + read, err := client.Get(ctx, resGroup, workspaceName, lsName) + if err != nil { + return err + } + + if read.ID == nil { + return fmt.Errorf("Cannot read Log Analytics Linked Service '%s' (resource group %s) ID", lsName, resGroup) + } + + d.SetId(*read.ID) + + return resourceArmLogAnalyticsLinkedServiceRead(d, meta) + +} + +func resourceArmLogAnalyticsLinkedServiceRead(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).linkedServicesClient + ctx := meta.(*ArmClient).StopContext + id, err := parseAzureResourceID(d.Id()) + if err != nil { + return err + } + resGroup := id.ResourceGroup + workspaceName := id.Path["workspaces"] + lsName := id.Path["linkedservices"] + + resp, err := client.Get(ctx, resGroup, workspaceName, lsName) + if err != nil { + if utils.ResponseWasNotFound(resp.Response) { + d.SetId("") + return nil + } + return fmt.Errorf("Error making Read request on AzureRM Log Analytics Linked Service '%s': %+v", lsName, err) + } + if resp.ID == nil { + d.SetId("") + return nil + } + + d.Set("name", *resp.Name) + d.Set("resource_group_name", resGroup) + d.Set("workspace_name", workspaceName) + d.Set("linked_service_name", lsName) + + linkedServiceProperties := flattenLogAnalyticsLinkedServiceProperties(resp.LinkedServiceProperties) + if err := d.Set("linked_service_properties", linkedServiceProperties); err != nil { + return fmt.Errorf("Error flattening Log Analytics Linked Service Properties: %+v", err) + } + + flattenAndSetTags(d, resp.Tags) + return nil +} + +func flattenLogAnalyticsLinkedServiceProperties(input *operationalinsights.LinkedServiceProperties) interface{} { + properties := make(map[string]interface{}, 0) + + // resource id linked service + if resourceID := input.ResourceID; resourceID != nil { + properties["resource_id"] = interface{}(*resourceID) + } + + return interface{}(properties) +} + +func resourceArmLogAnalyticsLinkedServiceDelete(d *schema.ResourceData, meta interface{}) error { + client := meta.(*ArmClient).linkedServicesClient + ctx := meta.(*ArmClient).StopContext + id, err := parseAzureResourceID(d.Id()) + if err != nil { + return err + } + resGroup := id.ResourceGroup + workspaceName := id.Path["workspaces"] + lsName := id.Path["linkedservices"] + + resp, err := client.Delete(ctx, resGroup, workspaceName, lsName) + + if err != nil { + if utils.ResponseWasNotFound(resp) { + return nil + } + + return fmt.Errorf("Error issuing AzureRM delete request for Log Analytics Linked Service '%s': %+v", lsName, err) + } + + return nil +} From 4ac5edf80673f629ce97a0f92ddabf96f8005ece Mon Sep 17 00:00:00 2001 From: Tony Fortes Ramos Date: Tue, 23 Oct 2018 23:30:34 +0200 Subject: [PATCH 03/14] azurerm_log_analytics_linked_service: add acceptance tests --- ...e_arm_log_analytics_linked_service_test.go | 202 ++++++++++++++++++ 1 file changed, 202 insertions(+) create mode 100644 azurerm/resource_arm_log_analytics_linked_service_test.go diff --git a/azurerm/resource_arm_log_analytics_linked_service_test.go b/azurerm/resource_arm_log_analytics_linked_service_test.go new file mode 100644 index 000000000000..889ac17ce7b2 --- /dev/null +++ b/azurerm/resource_arm_log_analytics_linked_service_test.go @@ -0,0 +1,202 @@ +package azurerm + +import ( + "fmt" + "net/http" + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/terraform" +) + +func TestAccAzureRMLogAnalyticsLinkedService_requiredOnly(t *testing.T) { + resourceName := "azurerm_log_analytics_linked_service.test" + ri := acctest.RandInt() + config := testAccAzureRMLogAnalyticsLinkedServiceRequiredOnly(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMLogAnalyticsLinkedServiceDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMLogAnalyticsLinkedServiceExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "name", fmt.Sprintf("acctestworkspace-%d/Automation", ri)), + resource.TestCheckResourceAttr(resourceName, "workspace_name", fmt.Sprintf("acctestworkspace-%d", ri)), + resource.TestCheckResourceAttr(resourceName, "linked_service_name", "automation"), + ), + }, + }, + }) +} + +func TestAccAzureRMLogAnalyticsLinkedService_optionalArguments(t *testing.T) { + resourceName := "azurerm_log_analytics_linked_service.test" + ri := acctest.RandInt() + config := testAccAzureRMLogAnalyticsLinkedServiceOptionalArguments(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMLogAnalyticsLinkedServiceDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMLogAnalyticsLinkedServiceExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "linked_service_name", "automation"), + ), + }, + }, + }) +} + +func testCheckAzureRMLogAnalyticsLinkedServiceDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*ArmClient).linkedServicesClient + ctx := testAccProvider.Meta().(*ArmClient).StopContext + + for _, rs := range s.RootModule().Resources { + if rs.Type != "azurerm_log_analytics_linked_service" { + continue + } + + resourceGroup := rs.Primary.Attributes["resource_group_name"] + workspaceName := rs.Primary.Attributes["workspace_name"] + lsName := rs.Primary.Attributes["linked_service_name"] + + resp, err := conn.Get(ctx, resourceGroup, workspaceName, lsName) + + if err != nil { + return nil + } + + if resp.ID == nil { + return nil + } + + if resp.StatusCode != http.StatusNotFound { + return fmt.Errorf("Log Analytics Linked Service still exists:\n%#v", resp) + } + } + + return nil +} + +func testCheckAzureRMLogAnalyticsLinkedServiceExists(name string) resource.TestCheckFunc { + return func(s *terraform.State) error { + // Ensure we have enough information in state to look up in API + rs, ok := s.RootModule().Resources[name] + if !ok { + return fmt.Errorf("Not found: %s", name) + } + + resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"] + workspaceName := rs.Primary.Attributes["workspace_name"] + lsName := rs.Primary.Attributes["linked_service_name"] + name := rs.Primary.Attributes["name"] + + if !hasResourceGroup { + return fmt.Errorf("Bad: no resource group found in state for Log Analytics Linked Service: '%s'", name) + } + + conn := testAccProvider.Meta().(*ArmClient).linkedServicesClient + ctx := testAccProvider.Meta().(*ArmClient).StopContext + + resp, err := conn.Get(ctx, resourceGroup, workspaceName, lsName) + if err != nil { + return fmt.Errorf("Bad: Get on Log Analytics Linked Service Client: %+v", err) + } + + if resp.StatusCode == http.StatusNotFound { + return fmt.Errorf("Bad: Log Analytics Linked Service '%s' (resource group: '%s') does not exist", name, resourceGroup) + } + + return nil + } +} + +func testAccAzureRMLogAnalyticsLinkedServiceRequiredOnly(rInt int, location string) string { + return fmt.Sprintf(` + resource "azurerm_resource_group" "test" { + name = "acctestresourcegroup-%d" + location = "%v" + } + + resource "azurerm_automation_account" "test" { + name = "acctestautomation-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + name = "Basic" + } + + tags { + environment = "development" + } + } + + resource "azurerm_log_analytics_workspace" "test" { + name = "acctestworkspace-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku = "PerGB2018" + retention_in_days = 30 + } + + resource "azurerm_log_analytics_linked_service" "test" { + resource_group_name = "${azurerm_resource_group.test.name}" + workspace_name = "${azurerm_log_analytics_workspace.test.name}" + + linked_service_properties { + resource_id = "${azurerm_automation_account.test.id}" + } + } + +`, rInt, location, rInt, rInt) +} + +func testAccAzureRMLogAnalyticsLinkedServiceOptionalArguments(rInt int, location string) string { + return fmt.Sprintf(` + resource "azurerm_resource_group" "test" { + name = "acctestresourcegroup-%d" + location = "%v" + } + + resource "azurerm_automation_account" "test" { + name = "acctestautomation-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + name = "Basic" + } + + tags { + environment = "development" + } + } + + resource "azurerm_log_analytics_workspace" "test" { + name = "acctestworkspace-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku = "PerGB2018" + retention_in_days = 30 + } + + resource "azurerm_log_analytics_linked_service" "test" { + resource_group_name = "${azurerm_resource_group.test.name}" + workspace_name = "${azurerm_log_analytics_workspace.test.name}" + linked_service_name = "automation" + + linked_service_properties { + resource_id = "${azurerm_automation_account.test.id}" + } + } + +`, rInt, location, rInt, rInt) +} From 053cf1544ab5a8682e9473f40dac54fbdd784ebf Mon Sep 17 00:00:00 2001 From: Tony Fortes Ramos Date: Wed, 24 Oct 2018 00:26:10 +0200 Subject: [PATCH 04/14] azurerm_log_analytics_linked_service: add import tests --- ...t_arm_log_analytics_linked_service_test.go | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 azurerm/import_arm_log_analytics_linked_service_test.go diff --git a/azurerm/import_arm_log_analytics_linked_service_test.go b/azurerm/import_arm_log_analytics_linked_service_test.go new file mode 100644 index 000000000000..d83e26c1329d --- /dev/null +++ b/azurerm/import_arm_log_analytics_linked_service_test.go @@ -0,0 +1,56 @@ +package azurerm + +import ( + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" +) + +func TestAccAzureRMLogAnalyticsLinkedService_importRequiredOnly(t *testing.T) { + resourceName := "azurerm_log_analytics_linked_service.test" + + ri := acctest.RandInt() + config := testAccAzureRMLogAnalyticsLinkedServiceRequiredOnly(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMLogAnalyticsLinkedServiceDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAzureRMLogAnalyticsLinkedService_importOptionalArguments(t *testing.T) { + resourceName := "azurerm_log_analytics_linked_service.test" + + ri := acctest.RandInt() + config := testAccAzureRMLogAnalyticsLinkedServiceOptionalArguments(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMLogAnalyticsLinkedServiceDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} From 94f966795cc1a49c7976d3373a03f8b39a598896 Mon Sep 17 00:00:00 2001 From: Tony Fortes Ramos Date: Wed, 24 Oct 2018 00:48:34 +0200 Subject: [PATCH 05/14] azurerm_log_analytics_linked_service: add documentation --- website/azurerm.erb | 4 + ...log_analytics_linked_service.html.markdown | 86 +++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 website/docs/r/log_analytics_linked_service.html.markdown diff --git a/website/azurerm.erb b/website/azurerm.erb index 3ad2f05d931e..b3117efbf304 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -993,6 +993,10 @@ > OMS Resources
    + > + azurerm_log_analytics_linked_service + + > azurerm_log_analytics_solution diff --git a/website/docs/r/log_analytics_linked_service.html.markdown b/website/docs/r/log_analytics_linked_service.html.markdown new file mode 100644 index 000000000000..8f3e0242f4cd --- /dev/null +++ b/website/docs/r/log_analytics_linked_service.html.markdown @@ -0,0 +1,86 @@ +--- +layout: "azurerm" +page_title: "Azure Resource Manager: azurerm_log_analytics_linked_service" +sidebar_current: "docs-azurerm-resource-oms-log-analytics-linked-service" +description: |- + Manages a Log Analytics (formally Operational Insights) Linked Service. +--- + +# azurerm_log_analytics_linked_service + +Links a Log Analytics (formally Operational Insights) Workspace to another resource. The (currently) only linkable service is an Azure Automation Account. + +## Example Usage + +```hcl +resource "azurerm_resource_group" "test" { + name = "resourcegroup-01" + location = "West Europe" +} + +resource "azurerm_automation_account" "test" { + name = "automation-01" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + + sku { + name = "Basic" + } + + tags { + environment = "development" + } +} + +resource "azurerm_log_analytics_workspace" "test" { + name = "workspace-01" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" + sku = "PerGB2018" + retention_in_days = 30 +} + +resource "azurerm_log_analytics_linked_service" "test" { + resource_group_name = "${azurerm_resource_group.test.name}" + workspace_name = "${azurerm_log_analytics_workspace.test.name}" + + linked_service_properties { + resource_id = "${azurerm_automation_account.test.id}" + } +} +``` + +## Argument Reference + +The following arguments are supported: + +* `resource_group_name` - (Required) The name of the resource group in which the Log Analytics Linked Service is created. Changing this forces a new resource to be created. + +* `workspace_name` - (Required) Name of the Log Analytics Workspace that will contain the linkedServices resource. Changing this forces a new resource to be created. + +* `linked_service_name` - (Optional) Name of the type of linkedServices resource to connecto to the Log Analytics Workspace specified in `workspace_name`. Currently it defaults to and only supports `automation` as a value. Changing this forces a new resource to be created. + +* `linked_service_properties` - (Required) A `linked_service_properties` block as defined below. + +* `tags` - (Optional) A mapping of tags to assign to the resource. + +`linked_service_properties` supports the following: + +* `resource_id` - (Required) The resource id of the resource that will be linked to the workspace. + + +## Attributes Reference + +The following attributes are exported: + +* `id` - The Log Analytics Linked Service ID. + +* `name` - The automatically generated name of the Linked Service. This cannot be specified. The format is always `/` e.g. `workspace1/Automation` + +## Import + +Log Analytics Workspaces can be imported using the `resource id`, e.g. + +```shell +terraform import azurerm_log_analytics_linked_service.test /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.OperationalInsights/workspaces/workspace1/linkedservices/automation +``` From c2053a837320f7560ba3afcc4c8384b60d5e86b1 Mon Sep 17 00:00:00 2001 From: Tony Fortes Ramos Date: Wed, 24 Oct 2018 00:49:02 +0200 Subject: [PATCH 06/14] azurerm_log_analytics_linked_service: fix formatting --- ...e_arm_log_analytics_linked_service_test.go | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/azurerm/resource_arm_log_analytics_linked_service_test.go b/azurerm/resource_arm_log_analytics_linked_service_test.go index 889ac17ce7b2..3f589e13ff79 100644 --- a/azurerm/resource_arm_log_analytics_linked_service_test.go +++ b/azurerm/resource_arm_log_analytics_linked_service_test.go @@ -126,17 +126,17 @@ func testAccAzureRMLogAnalyticsLinkedServiceRequiredOnly(rInt int, location stri } resource "azurerm_automation_account" "test" { - name = "acctestautomation-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + name = "acctestautomation-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" - sku { - name = "Basic" - } + sku { + name = "Basic" + } - tags { - environment = "development" - } + tags { + environment = "development" + } } resource "azurerm_log_analytics_workspace" "test" { @@ -167,17 +167,17 @@ func testAccAzureRMLogAnalyticsLinkedServiceOptionalArguments(rInt int, location } resource "azurerm_automation_account" "test" { - name = "acctestautomation-%d" - location = "${azurerm_resource_group.test.location}" - resource_group_name = "${azurerm_resource_group.test.name}" + name = "acctestautomation-%d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" - sku { - name = "Basic" - } + sku { + name = "Basic" + } - tags { - environment = "development" - } + tags { + environment = "development" + } } resource "azurerm_log_analytics_workspace" "test" { From 5d9345acd92db1abc293e79f93858ec1349d7c75 Mon Sep 17 00:00:00 2001 From: Tony Fortes Ramos Date: Wed, 24 Oct 2018 00:55:43 +0200 Subject: [PATCH 07/14] azurerm_log_analytics_linked_service: go fmt azurerm/config.go --- azurerm/config.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/azurerm/config.go b/azurerm/config.go index 58351536b4a0..fdac772543fa 100644 --- a/azurerm/config.go +++ b/azurerm/config.go @@ -108,7 +108,7 @@ type ArmClient struct { eventHubConsumerGroupClient eventhub.ConsumerGroupsClient eventHubNamespacesClient eventhub.NamespacesClient - solutionsClient operationsmanagement.SolutionsClient + solutionsClient operationsmanagement.SolutionsClient redisClient redis.Client redisFirewallClient redis.FirewallRulesClient @@ -196,9 +196,9 @@ type ArmClient struct { keyVaultClient keyvault.VaultsClient keyVaultManagementClient keyVault.BaseClient - // LogServices + // Log Analytics linkedServicesClient operationalinsights.LinkedServicesClient - workspacesClient operationalinsights.WorkspacesClient + workspacesClient operationalinsights.WorkspacesClient // Logic logicWorkflowsClient logic.WorkflowsClient From 46828aaaabb2eb5708c52e2bebbb3dbe1d1cd5d0 Mon Sep 17 00:00:00 2001 From: Tony Fortes Ramos Date: Wed, 24 Oct 2018 01:31:06 +0200 Subject: [PATCH 08/14] azurerm_log_analytics_linked_service: go fmt provider.go --- azurerm/provider.go | 198 ++++++++++++++++++++++---------------------- 1 file changed, 99 insertions(+), 99 deletions(-) diff --git a/azurerm/provider.go b/azurerm/provider.go index 927955bfb974..8cc3c964e17d 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -130,105 +130,105 @@ func Provider() terraform.ResourceProvider { }, ResourcesMap: map[string]*schema.Resource{ - "azurerm_azuread_application": resourceArmActiveDirectoryApplication(), - "azurerm_azuread_service_principal": resourceArmActiveDirectoryServicePrincipal(), - "azurerm_azuread_service_principal_password": resourceArmActiveDirectoryServicePrincipalPassword(), - "azurerm_api_management": resourceArmApiManagementService(), - "azurerm_application_gateway": resourceArmApplicationGateway(), - "azurerm_application_insights": resourceArmApplicationInsights(), - "azurerm_application_security_group": resourceArmApplicationSecurityGroup(), - "azurerm_app_service": resourceArmAppService(), - "azurerm_app_service_plan": resourceArmAppServicePlan(), - "azurerm_app_service_active_slot": resourceArmAppServiceActiveSlot(), - "azurerm_app_service_custom_hostname_binding": resourceArmAppServiceCustomHostnameBinding(), - "azurerm_app_service_slot": resourceArmAppServiceSlot(), - "azurerm_automation_account": resourceArmAutomationAccount(), - "azurerm_automation_credential": resourceArmAutomationCredential(), - "azurerm_automation_dsc_configuration": resourceArmAutomationDscConfiguration(), - "azurerm_automation_dsc_nodeconfiguration": resourceArmAutomationDscNodeConfiguration(), - "azurerm_automation_module": resourceArmAutomationModule(), - "azurerm_automation_runbook": resourceArmAutomationRunbook(), - "azurerm_automation_schedule": resourceArmAutomationSchedule(), - "azurerm_autoscale_setting": resourceArmAutoScaleSetting(), - "azurerm_availability_set": resourceArmAvailabilitySet(), - "azurerm_cdn_endpoint": resourceArmCdnEndpoint(), - "azurerm_cdn_profile": resourceArmCdnProfile(), - "azurerm_cognitive_account": resourceArmCognitiveAccount(), - "azurerm_container_registry": resourceArmContainerRegistry(), - "azurerm_container_service": resourceArmContainerService(), - "azurerm_container_group": resourceArmContainerGroup(), - "azurerm_cosmosdb_account": resourceArmCosmosDBAccount(), - "azurerm_databricks_workspace": resourceArmDatabricksWorkspace(), - "azurerm_data_lake_analytics_account": resourceArmDataLakeAnalyticsAccount(), - "azurerm_data_lake_analytics_firewall_rule": resourceArmDataLakeAnalyticsFirewallRule(), - "azurerm_data_lake_store": resourceArmDataLakeStore(), - "azurerm_data_lake_store_file": resourceArmDataLakeStoreFile(), - "azurerm_data_lake_store_firewall_rule": resourceArmDataLakeStoreFirewallRule(), - "azurerm_dev_test_lab": resourceArmDevTestLab(), - "azurerm_dev_test_policy": resourceArmDevTestPolicy(), - "azurerm_dev_test_linux_virtual_machine": resourceArmDevTestLinuxVirtualMachine(), - "azurerm_dev_test_virtual_network": resourceArmDevTestVirtualNetwork(), - "azurerm_dev_test_windows_virtual_machine": resourceArmDevTestWindowsVirtualMachine(), - "azurerm_dns_a_record": resourceArmDnsARecord(), - "azurerm_dns_aaaa_record": resourceArmDnsAAAARecord(), - "azurerm_dns_caa_record": resourceArmDnsCaaRecord(), - "azurerm_dns_cname_record": resourceArmDnsCNameRecord(), - "azurerm_dns_mx_record": resourceArmDnsMxRecord(), - "azurerm_dns_ns_record": resourceArmDnsNsRecord(), - "azurerm_dns_ptr_record": resourceArmDnsPtrRecord(), - "azurerm_dns_srv_record": resourceArmDnsSrvRecord(), - "azurerm_dns_txt_record": resourceArmDnsTxtRecord(), - "azurerm_dns_zone": resourceArmDnsZone(), - "azurerm_eventgrid_topic": resourceArmEventGridTopic(), - "azurerm_eventhub": resourceArmEventHub(), - "azurerm_eventhub_authorization_rule": resourceArmEventHubAuthorizationRule(), - "azurerm_eventhub_consumer_group": resourceArmEventHubConsumerGroup(), - "azurerm_eventhub_namespace": resourceArmEventHubNamespace(), - "azurerm_eventhub_namespace_authorization_rule": resourceArmEventHubNamespaceAuthorizationRule(), - "azurerm_express_route_circuit": resourceArmExpressRouteCircuit(), - "azurerm_express_route_circuit_authorization": resourceArmExpressRouteCircuitAuthorization(), - "azurerm_express_route_circuit_peering": resourceArmExpressRouteCircuitPeering(), - "azurerm_firewall": resourceArmFirewall(), - "azurerm_firewall_network_rule_collection": resourceArmFirewallNetworkRuleCollection(), - "azurerm_function_app": resourceArmFunctionApp(), - "azurerm_image": resourceArmImage(), - "azurerm_iothub": resourceArmIotHub(), - "azurerm_key_vault": resourceArmKeyVault(), - "azurerm_key_vault_access_policy": resourceArmKeyVaultAccessPolicy(), - "azurerm_key_vault_certificate": resourceArmKeyVaultCertificate(), - "azurerm_key_vault_key": resourceArmKeyVaultKey(), - "azurerm_key_vault_secret": resourceArmKeyVaultSecret(), - "azurerm_kubernetes_cluster": resourceArmKubernetesCluster(), - "azurerm_lb": resourceArmLoadBalancer(), - "azurerm_lb_backend_address_pool": resourceArmLoadBalancerBackendAddressPool(), - "azurerm_lb_nat_rule": resourceArmLoadBalancerNatRule(), - "azurerm_lb_nat_pool": resourceArmLoadBalancerNatPool(), - "azurerm_lb_probe": resourceArmLoadBalancerProbe(), - "azurerm_lb_rule": resourceArmLoadBalancerRule(), - "azurerm_local_network_gateway": resourceArmLocalNetworkGateway(), - "azurerm_log_analytics_linked_service": resourceArmLogAnalyticsLinkedService(), - "azurerm_log_analytics_solution": resourceArmLogAnalyticsSolution(), - "azurerm_log_analytics_workspace": resourceArmLogAnalyticsWorkspace(), - "azurerm_logic_app_action_custom": resourceArmLogicAppActionCustom(), - "azurerm_logic_app_action_http": resourceArmLogicAppActionHTTP(), - "azurerm_logic_app_trigger_custom": resourceArmLogicAppTriggerCustom(), - "azurerm_logic_app_trigger_http_request": resourceArmLogicAppTriggerHttpRequest(), - "azurerm_logic_app_trigger_recurrence": resourceArmLogicAppTriggerRecurrence(), - "azurerm_logic_app_workflow": resourceArmLogicAppWorkflow(), - "azurerm_managed_disk": resourceArmManagedDisk(), - "azurerm_management_lock": resourceArmManagementLock(), - "azurerm_management_group": resourceArmManagementGroup(), - "azurerm_metric_alertrule": resourceArmMetricAlertRule(), - "azurerm_monitor_action_group": resourceArmMonitorActionGroup(), - "azurerm_monitor_activity_log_alert": resourceArmMonitorActivityLogAlert(), - "azurerm_monitor_log_profile": resourceArmMonitorLogProfile(), - "azurerm_monitor_metric_alert": resourceArmMonitorMetricAlert(), - "azurerm_mysql_configuration": resourceArmMySQLConfiguration(), - "azurerm_mysql_database": resourceArmMySqlDatabase(), - "azurerm_mysql_firewall_rule": resourceArmMySqlFirewallRule(), - "azurerm_mysql_server": resourceArmMySqlServer(), - "azurerm_mysql_virtual_network_rule": resourceArmMySqlVirtualNetworkRule(), - "azurerm_network_interface": resourceArmNetworkInterface(), + "azurerm_azuread_application": resourceArmActiveDirectoryApplication(), + "azurerm_azuread_service_principal": resourceArmActiveDirectoryServicePrincipal(), + "azurerm_azuread_service_principal_password": resourceArmActiveDirectoryServicePrincipalPassword(), + "azurerm_api_management": resourceArmApiManagementService(), + "azurerm_application_gateway": resourceArmApplicationGateway(), + "azurerm_application_insights": resourceArmApplicationInsights(), + "azurerm_application_security_group": resourceArmApplicationSecurityGroup(), + "azurerm_app_service": resourceArmAppService(), + "azurerm_app_service_plan": resourceArmAppServicePlan(), + "azurerm_app_service_active_slot": resourceArmAppServiceActiveSlot(), + "azurerm_app_service_custom_hostname_binding": resourceArmAppServiceCustomHostnameBinding(), + "azurerm_app_service_slot": resourceArmAppServiceSlot(), + "azurerm_automation_account": resourceArmAutomationAccount(), + "azurerm_automation_credential": resourceArmAutomationCredential(), + "azurerm_automation_dsc_configuration": resourceArmAutomationDscConfiguration(), + "azurerm_automation_dsc_nodeconfiguration": resourceArmAutomationDscNodeConfiguration(), + "azurerm_automation_module": resourceArmAutomationModule(), + "azurerm_automation_runbook": resourceArmAutomationRunbook(), + "azurerm_automation_schedule": resourceArmAutomationSchedule(), + "azurerm_autoscale_setting": resourceArmAutoScaleSetting(), + "azurerm_availability_set": resourceArmAvailabilitySet(), + "azurerm_cdn_endpoint": resourceArmCdnEndpoint(), + "azurerm_cdn_profile": resourceArmCdnProfile(), + "azurerm_cognitive_account": resourceArmCognitiveAccount(), + "azurerm_container_registry": resourceArmContainerRegistry(), + "azurerm_container_service": resourceArmContainerService(), + "azurerm_container_group": resourceArmContainerGroup(), + "azurerm_cosmosdb_account": resourceArmCosmosDBAccount(), + "azurerm_databricks_workspace": resourceArmDatabricksWorkspace(), + "azurerm_data_lake_analytics_account": resourceArmDataLakeAnalyticsAccount(), + "azurerm_data_lake_analytics_firewall_rule": resourceArmDataLakeAnalyticsFirewallRule(), + "azurerm_data_lake_store": resourceArmDataLakeStore(), + "azurerm_data_lake_store_file": resourceArmDataLakeStoreFile(), + "azurerm_data_lake_store_firewall_rule": resourceArmDataLakeStoreFirewallRule(), + "azurerm_dev_test_lab": resourceArmDevTestLab(), + "azurerm_dev_test_policy": resourceArmDevTestPolicy(), + "azurerm_dev_test_linux_virtual_machine": resourceArmDevTestLinuxVirtualMachine(), + "azurerm_dev_test_virtual_network": resourceArmDevTestVirtualNetwork(), + "azurerm_dev_test_windows_virtual_machine": resourceArmDevTestWindowsVirtualMachine(), + "azurerm_dns_a_record": resourceArmDnsARecord(), + "azurerm_dns_aaaa_record": resourceArmDnsAAAARecord(), + "azurerm_dns_caa_record": resourceArmDnsCaaRecord(), + "azurerm_dns_cname_record": resourceArmDnsCNameRecord(), + "azurerm_dns_mx_record": resourceArmDnsMxRecord(), + "azurerm_dns_ns_record": resourceArmDnsNsRecord(), + "azurerm_dns_ptr_record": resourceArmDnsPtrRecord(), + "azurerm_dns_srv_record": resourceArmDnsSrvRecord(), + "azurerm_dns_txt_record": resourceArmDnsTxtRecord(), + "azurerm_dns_zone": resourceArmDnsZone(), + "azurerm_eventgrid_topic": resourceArmEventGridTopic(), + "azurerm_eventhub": resourceArmEventHub(), + "azurerm_eventhub_authorization_rule": resourceArmEventHubAuthorizationRule(), + "azurerm_eventhub_consumer_group": resourceArmEventHubConsumerGroup(), + "azurerm_eventhub_namespace": resourceArmEventHubNamespace(), + "azurerm_eventhub_namespace_authorization_rule": resourceArmEventHubNamespaceAuthorizationRule(), + "azurerm_express_route_circuit": resourceArmExpressRouteCircuit(), + "azurerm_express_route_circuit_authorization": resourceArmExpressRouteCircuitAuthorization(), + "azurerm_express_route_circuit_peering": resourceArmExpressRouteCircuitPeering(), + "azurerm_firewall": resourceArmFirewall(), + "azurerm_firewall_network_rule_collection": resourceArmFirewallNetworkRuleCollection(), + "azurerm_function_app": resourceArmFunctionApp(), + "azurerm_image": resourceArmImage(), + "azurerm_iothub": resourceArmIotHub(), + "azurerm_key_vault": resourceArmKeyVault(), + "azurerm_key_vault_access_policy": resourceArmKeyVaultAccessPolicy(), + "azurerm_key_vault_certificate": resourceArmKeyVaultCertificate(), + "azurerm_key_vault_key": resourceArmKeyVaultKey(), + "azurerm_key_vault_secret": resourceArmKeyVaultSecret(), + "azurerm_kubernetes_cluster": resourceArmKubernetesCluster(), + "azurerm_lb": resourceArmLoadBalancer(), + "azurerm_lb_backend_address_pool": resourceArmLoadBalancerBackendAddressPool(), + "azurerm_lb_nat_rule": resourceArmLoadBalancerNatRule(), + "azurerm_lb_nat_pool": resourceArmLoadBalancerNatPool(), + "azurerm_lb_probe": resourceArmLoadBalancerProbe(), + "azurerm_lb_rule": resourceArmLoadBalancerRule(), + "azurerm_local_network_gateway": resourceArmLocalNetworkGateway(), + "azurerm_log_analytics_linked_service": resourceArmLogAnalyticsLinkedService(), + "azurerm_log_analytics_solution": resourceArmLogAnalyticsSolution(), + "azurerm_log_analytics_workspace": resourceArmLogAnalyticsWorkspace(), + "azurerm_logic_app_action_custom": resourceArmLogicAppActionCustom(), + "azurerm_logic_app_action_http": resourceArmLogicAppActionHTTP(), + "azurerm_logic_app_trigger_custom": resourceArmLogicAppTriggerCustom(), + "azurerm_logic_app_trigger_http_request": resourceArmLogicAppTriggerHttpRequest(), + "azurerm_logic_app_trigger_recurrence": resourceArmLogicAppTriggerRecurrence(), + "azurerm_logic_app_workflow": resourceArmLogicAppWorkflow(), + "azurerm_managed_disk": resourceArmManagedDisk(), + "azurerm_management_lock": resourceArmManagementLock(), + "azurerm_management_group": resourceArmManagementGroup(), + "azurerm_metric_alertrule": resourceArmMetricAlertRule(), + "azurerm_monitor_action_group": resourceArmMonitorActionGroup(), + "azurerm_monitor_activity_log_alert": resourceArmMonitorActivityLogAlert(), + "azurerm_monitor_log_profile": resourceArmMonitorLogProfile(), + "azurerm_monitor_metric_alert": resourceArmMonitorMetricAlert(), + "azurerm_mysql_configuration": resourceArmMySQLConfiguration(), + "azurerm_mysql_database": resourceArmMySqlDatabase(), + "azurerm_mysql_firewall_rule": resourceArmMySqlFirewallRule(), + "azurerm_mysql_server": resourceArmMySqlServer(), + "azurerm_mysql_virtual_network_rule": resourceArmMySqlVirtualNetworkRule(), + "azurerm_network_interface": resourceArmNetworkInterface(), "azurerm_network_interface_application_gateway_backend_address_pool_association": resourceArmNetworkInterfaceApplicationGatewayBackendAddressPoolAssociation(), "azurerm_network_interface_backend_address_pool_association": resourceArmNetworkInterfaceBackendAddressPoolAssociation(), "azurerm_network_interface_nat_rule_association": resourceArmNetworkInterfaceNatRuleAssociation(), From 13c4ac0b5898eceb9ad6ad4805cc1641ab5f14f2 Mon Sep 17 00:00:00 2001 From: Tony Fortes Ramos Date: Wed, 24 Oct 2018 14:13:14 +0200 Subject: [PATCH 09/14] azurerm_log_analytics_workspace_linked_service: changed resource name --- ...nalytics_workspace_linked_service_test.go} | 16 ++++----- azurerm/provider.go | 2 +- ...log_analytics_workspace_linked_service.go} | 22 ++++++------ ...nalytics_workspace_linked_service_test.go} | 34 +++++++++---------- website/azurerm.erb | 8 ++--- ...cs_workspace_linked_service.html.markdown} | 13 ++++--- 6 files changed, 47 insertions(+), 48 deletions(-) rename azurerm/{import_arm_log_analytics_linked_service_test.go => import_arm_log_analytics_workspace_linked_service_test.go} (54%) rename azurerm/{resource_arm_log_analytics_linked_service.go => resource_arm_log_analytics_workspace_linked_service.go} (80%) rename azurerm/{resource_arm_log_analytics_linked_service_test.go => resource_arm_log_analytics_workspace_linked_service_test.go} (77%) rename website/docs/r/{log_analytics_linked_service.html.markdown => log_analytics_workspace_linked_service.html.markdown} (76%) diff --git a/azurerm/import_arm_log_analytics_linked_service_test.go b/azurerm/import_arm_log_analytics_workspace_linked_service_test.go similarity index 54% rename from azurerm/import_arm_log_analytics_linked_service_test.go rename to azurerm/import_arm_log_analytics_workspace_linked_service_test.go index d83e26c1329d..320b70858cff 100644 --- a/azurerm/import_arm_log_analytics_linked_service_test.go +++ b/azurerm/import_arm_log_analytics_workspace_linked_service_test.go @@ -7,16 +7,16 @@ import ( "github.com/hashicorp/terraform/helper/resource" ) -func TestAccAzureRMLogAnalyticsLinkedService_importRequiredOnly(t *testing.T) { - resourceName := "azurerm_log_analytics_linked_service.test" +func TestAccAzureRMLogAnalyticsWorkspaceLinkedService_importRequiredOnly(t *testing.T) { + resourceName := "azurerm_log_analytics_workspace_linked_service.test" ri := acctest.RandInt() - config := testAccAzureRMLogAnalyticsLinkedServiceRequiredOnly(ri, testLocation()) + config := testAccAzureRMLogAnalyticsWorkspaceLinkedServiceRequiredOnly(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testCheckAzureRMLogAnalyticsLinkedServiceDestroy, + CheckDestroy: testCheckAzureRMLogAnalyticsWorkspaceLinkedServiceDestroy, Steps: []resource.TestStep{ { Config: config, @@ -31,16 +31,16 @@ func TestAccAzureRMLogAnalyticsLinkedService_importRequiredOnly(t *testing.T) { }) } -func TestAccAzureRMLogAnalyticsLinkedService_importOptionalArguments(t *testing.T) { - resourceName := "azurerm_log_analytics_linked_service.test" +func TestAccAzureRMLogAnalyticsWorkspaceLinkedService_importOptionalArguments(t *testing.T) { + resourceName := "azurerm_log_analytics_workspace_linked_service.test" ri := acctest.RandInt() - config := testAccAzureRMLogAnalyticsLinkedServiceOptionalArguments(ri, testLocation()) + config := testAccAzureRMLogAnalyticsWorkspaceLinkedServiceOptionalArguments(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testCheckAzureRMLogAnalyticsLinkedServiceDestroy, + CheckDestroy: testCheckAzureRMLogAnalyticsWorkspaceLinkedServiceDestroy, Steps: []resource.TestStep{ { Config: config, diff --git a/azurerm/provider.go b/azurerm/provider.go index 8cc3c964e17d..b62ebce691bb 100644 --- a/azurerm/provider.go +++ b/azurerm/provider.go @@ -206,9 +206,9 @@ func Provider() terraform.ResourceProvider { "azurerm_lb_probe": resourceArmLoadBalancerProbe(), "azurerm_lb_rule": resourceArmLoadBalancerRule(), "azurerm_local_network_gateway": resourceArmLocalNetworkGateway(), - "azurerm_log_analytics_linked_service": resourceArmLogAnalyticsLinkedService(), "azurerm_log_analytics_solution": resourceArmLogAnalyticsSolution(), "azurerm_log_analytics_workspace": resourceArmLogAnalyticsWorkspace(), + "azurerm_log_analytics_workspace_linked_service": resourceArmLogAnalyticsWorkspaceLinkedService(), "azurerm_logic_app_action_custom": resourceArmLogicAppActionCustom(), "azurerm_logic_app_action_http": resourceArmLogicAppActionHTTP(), "azurerm_logic_app_trigger_custom": resourceArmLogicAppTriggerCustom(), diff --git a/azurerm/resource_arm_log_analytics_linked_service.go b/azurerm/resource_arm_log_analytics_workspace_linked_service.go similarity index 80% rename from azurerm/resource_arm_log_analytics_linked_service.go rename to azurerm/resource_arm_log_analytics_workspace_linked_service.go index 611c35e4968a..2dd423d39509 100644 --- a/azurerm/resource_arm_log_analytics_linked_service.go +++ b/azurerm/resource_arm_log_analytics_workspace_linked_service.go @@ -9,12 +9,12 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceArmLogAnalyticsLinkedService() *schema.Resource { +func resourceArmLogAnalyticsWorkspaceLinkedService() *schema.Resource { return &schema.Resource{ - Create: resourceArmLogAnalyticsLinkedServiceCreateUpdate, - Read: resourceArmLogAnalyticsLinkedServiceRead, - Update: resourceArmLogAnalyticsLinkedServiceCreateUpdate, - Delete: resourceArmLogAnalyticsLinkedServiceDelete, + Create: resourceArmLogAnalyticsWorkspaceLinkedServiceCreateUpdate, + Read: resourceArmLogAnalyticsWorkspaceLinkedServiceRead, + Update: resourceArmLogAnalyticsWorkspaceLinkedServiceCreateUpdate, + Delete: resourceArmLogAnalyticsWorkspaceLinkedServiceDelete, Importer: &schema.ResourceImporter{ State: schema.ImportStatePassthrough, }, @@ -61,7 +61,7 @@ func resourceArmLogAnalyticsLinkedService() *schema.Resource { } } -func resourceArmLogAnalyticsLinkedServiceCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceArmLogAnalyticsWorkspaceLinkedServiceCreateUpdate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).linkedServicesClient ctx := meta.(*ArmClient).StopContext log.Printf("[INFO] preparing arguments for AzureRM Log Analytics linked services creation.") @@ -100,11 +100,11 @@ func resourceArmLogAnalyticsLinkedServiceCreateUpdate(d *schema.ResourceData, me d.SetId(*read.ID) - return resourceArmLogAnalyticsLinkedServiceRead(d, meta) + return resourceArmLogAnalyticsWorkspaceLinkedServiceRead(d, meta) } -func resourceArmLogAnalyticsLinkedServiceRead(d *schema.ResourceData, meta interface{}) error { +func resourceArmLogAnalyticsWorkspaceLinkedServiceRead(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).linkedServicesClient ctx := meta.(*ArmClient).StopContext id, err := parseAzureResourceID(d.Id()) @@ -133,7 +133,7 @@ func resourceArmLogAnalyticsLinkedServiceRead(d *schema.ResourceData, meta inter d.Set("workspace_name", workspaceName) d.Set("linked_service_name", lsName) - linkedServiceProperties := flattenLogAnalyticsLinkedServiceProperties(resp.LinkedServiceProperties) + linkedServiceProperties := flattenLogAnalyticsWorkspaceLinkedServiceProperties(resp.LinkedServiceProperties) if err := d.Set("linked_service_properties", linkedServiceProperties); err != nil { return fmt.Errorf("Error flattening Log Analytics Linked Service Properties: %+v", err) } @@ -142,7 +142,7 @@ func resourceArmLogAnalyticsLinkedServiceRead(d *schema.ResourceData, meta inter return nil } -func flattenLogAnalyticsLinkedServiceProperties(input *operationalinsights.LinkedServiceProperties) interface{} { +func flattenLogAnalyticsWorkspaceLinkedServiceProperties(input *operationalinsights.LinkedServiceProperties) interface{} { properties := make(map[string]interface{}, 0) // resource id linked service @@ -153,7 +153,7 @@ func flattenLogAnalyticsLinkedServiceProperties(input *operationalinsights.Linke return interface{}(properties) } -func resourceArmLogAnalyticsLinkedServiceDelete(d *schema.ResourceData, meta interface{}) error { +func resourceArmLogAnalyticsWorkspaceLinkedServiceDelete(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient).linkedServicesClient ctx := meta.(*ArmClient).StopContext id, err := parseAzureResourceID(d.Id()) diff --git a/azurerm/resource_arm_log_analytics_linked_service_test.go b/azurerm/resource_arm_log_analytics_workspace_linked_service_test.go similarity index 77% rename from azurerm/resource_arm_log_analytics_linked_service_test.go rename to azurerm/resource_arm_log_analytics_workspace_linked_service_test.go index 3f589e13ff79..99fbf5d05c05 100644 --- a/azurerm/resource_arm_log_analytics_linked_service_test.go +++ b/azurerm/resource_arm_log_analytics_workspace_linked_service_test.go @@ -10,20 +10,20 @@ import ( "github.com/hashicorp/terraform/terraform" ) -func TestAccAzureRMLogAnalyticsLinkedService_requiredOnly(t *testing.T) { - resourceName := "azurerm_log_analytics_linked_service.test" +func TestAccAzureRMLogAnalyticsWorkspaceLinkedService_requiredOnly(t *testing.T) { + resourceName := "azurerm_log_analytics_workspace_linked_service.test" ri := acctest.RandInt() - config := testAccAzureRMLogAnalyticsLinkedServiceRequiredOnly(ri, testLocation()) + config := testAccAzureRMLogAnalyticsWorkspaceLinkedServiceRequiredOnly(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testCheckAzureRMLogAnalyticsLinkedServiceDestroy, + CheckDestroy: testCheckAzureRMLogAnalyticsWorkspaceLinkedServiceDestroy, Steps: []resource.TestStep{ { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMLogAnalyticsLinkedServiceExists(resourceName), + testCheckAzureRMLogAnalyticsWorkspaceLinkedServiceExists(resourceName), resource.TestCheckResourceAttr(resourceName, "name", fmt.Sprintf("acctestworkspace-%d/Automation", ri)), resource.TestCheckResourceAttr(resourceName, "workspace_name", fmt.Sprintf("acctestworkspace-%d", ri)), resource.TestCheckResourceAttr(resourceName, "linked_service_name", "automation"), @@ -33,20 +33,20 @@ func TestAccAzureRMLogAnalyticsLinkedService_requiredOnly(t *testing.T) { }) } -func TestAccAzureRMLogAnalyticsLinkedService_optionalArguments(t *testing.T) { - resourceName := "azurerm_log_analytics_linked_service.test" +func TestAccAzureRMLogAnalyticsWorkspaceLinkedService_optionalArguments(t *testing.T) { + resourceName := "azurerm_log_analytics_workspace_linked_service.test" ri := acctest.RandInt() - config := testAccAzureRMLogAnalyticsLinkedServiceOptionalArguments(ri, testLocation()) + config := testAccAzureRMLogAnalyticsWorkspaceLinkedServiceOptionalArguments(ri, testLocation()) resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders, - CheckDestroy: testCheckAzureRMLogAnalyticsLinkedServiceDestroy, + CheckDestroy: testCheckAzureRMLogAnalyticsWorkspaceLinkedServiceDestroy, Steps: []resource.TestStep{ { Config: config, Check: resource.ComposeTestCheckFunc( - testCheckAzureRMLogAnalyticsLinkedServiceExists(resourceName), + testCheckAzureRMLogAnalyticsWorkspaceLinkedServiceExists(resourceName), resource.TestCheckResourceAttr(resourceName, "linked_service_name", "automation"), ), }, @@ -54,12 +54,12 @@ func TestAccAzureRMLogAnalyticsLinkedService_optionalArguments(t *testing.T) { }) } -func testCheckAzureRMLogAnalyticsLinkedServiceDestroy(s *terraform.State) error { +func testCheckAzureRMLogAnalyticsWorkspaceLinkedServiceDestroy(s *terraform.State) error { conn := testAccProvider.Meta().(*ArmClient).linkedServicesClient ctx := testAccProvider.Meta().(*ArmClient).StopContext for _, rs := range s.RootModule().Resources { - if rs.Type != "azurerm_log_analytics_linked_service" { + if rs.Type != "azurerm_log_analytics_workspace_linked_service" { continue } @@ -85,7 +85,7 @@ func testCheckAzureRMLogAnalyticsLinkedServiceDestroy(s *terraform.State) error return nil } -func testCheckAzureRMLogAnalyticsLinkedServiceExists(name string) resource.TestCheckFunc { +func testCheckAzureRMLogAnalyticsWorkspaceLinkedServiceExists(name string) resource.TestCheckFunc { return func(s *terraform.State) error { // Ensure we have enough information in state to look up in API rs, ok := s.RootModule().Resources[name] @@ -118,7 +118,7 @@ func testCheckAzureRMLogAnalyticsLinkedServiceExists(name string) resource.TestC } } -func testAccAzureRMLogAnalyticsLinkedServiceRequiredOnly(rInt int, location string) string { +func testAccAzureRMLogAnalyticsWorkspaceLinkedServiceRequiredOnly(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestresourcegroup-%d" @@ -147,7 +147,7 @@ func testAccAzureRMLogAnalyticsLinkedServiceRequiredOnly(rInt int, location stri retention_in_days = 30 } - resource "azurerm_log_analytics_linked_service" "test" { + resource "azurerm_log_analytics_workspace_linked_service" "test" { resource_group_name = "${azurerm_resource_group.test.name}" workspace_name = "${azurerm_log_analytics_workspace.test.name}" @@ -159,7 +159,7 @@ func testAccAzureRMLogAnalyticsLinkedServiceRequiredOnly(rInt int, location stri `, rInt, location, rInt, rInt) } -func testAccAzureRMLogAnalyticsLinkedServiceOptionalArguments(rInt int, location string) string { +func testAccAzureRMLogAnalyticsWorkspaceLinkedServiceOptionalArguments(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { name = "acctestresourcegroup-%d" @@ -188,7 +188,7 @@ func testAccAzureRMLogAnalyticsLinkedServiceOptionalArguments(rInt int, location retention_in_days = 30 } - resource "azurerm_log_analytics_linked_service" "test" { + resource "azurerm_log_analytics_workspace_linked_service" "test" { resource_group_name = "${azurerm_resource_group.test.name}" workspace_name = "${azurerm_log_analytics_workspace.test.name}" linked_service_name = "automation" diff --git a/website/azurerm.erb b/website/azurerm.erb index b3117efbf304..10f0e8b33f65 100644 --- a/website/azurerm.erb +++ b/website/azurerm.erb @@ -993,10 +993,6 @@ > OMS Resources diff --git a/website/docs/r/log_analytics_linked_service.html.markdown b/website/docs/r/log_analytics_workspace_linked_service.html.markdown similarity index 76% rename from website/docs/r/log_analytics_linked_service.html.markdown rename to website/docs/r/log_analytics_workspace_linked_service.html.markdown index 8f3e0242f4cd..3c2c7d2eee11 100644 --- a/website/docs/r/log_analytics_linked_service.html.markdown +++ b/website/docs/r/log_analytics_workspace_linked_service.html.markdown @@ -1,12 +1,12 @@ --- layout: "azurerm" -page_title: "Azure Resource Manager: azurerm_log_analytics_linked_service" -sidebar_current: "docs-azurerm-resource-oms-log-analytics-linked-service" +page_title: "Azure Resource Manager: azurerm_log_analytics_workspace_linked_service" +sidebar_current: "docs-azurerm-resource-oms-log-analytics-workspace-linked-service" description: |- Manages a Log Analytics (formally Operational Insights) Linked Service. --- -# azurerm_log_analytics_linked_service +# azurerm_log_analytics_workspace_linked_service Links a Log Analytics (formally Operational Insights) Workspace to another resource. The (currently) only linkable service is an Azure Automation Account. @@ -40,7 +40,7 @@ resource "azurerm_log_analytics_workspace" "test" { retention_in_days = 30 } -resource "azurerm_log_analytics_linked_service" "test" { +resource "azurerm_log_analytics_workspace_linked_service" "test" { resource_group_name = "${azurerm_resource_group.test.name}" workspace_name = "${azurerm_log_analytics_workspace.test.name}" @@ -58,7 +58,7 @@ The following arguments are supported: * `workspace_name` - (Required) Name of the Log Analytics Workspace that will contain the linkedServices resource. Changing this forces a new resource to be created. -* `linked_service_name` - (Optional) Name of the type of linkedServices resource to connecto to the Log Analytics Workspace specified in `workspace_name`. Currently it defaults to and only supports `automation` as a value. Changing this forces a new resource to be created. +* `linked_service_name` - (Optional) Name of the type of linkedServices resource to connect to the Log Analytics Workspace specified in `workspace_name`. Currently it defaults to and only supports `automation` as a value. Changing this forces a new resource to be created. * `linked_service_properties` - (Required) A `linked_service_properties` block as defined below. @@ -68,7 +68,6 @@ The following arguments are supported: * `resource_id` - (Required) The resource id of the resource that will be linked to the workspace. - ## Attributes Reference The following attributes are exported: @@ -82,5 +81,5 @@ The following attributes are exported: Log Analytics Workspaces can be imported using the `resource id`, e.g. ```shell -terraform import azurerm_log_analytics_linked_service.test /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.OperationalInsights/workspaces/workspace1/linkedservices/automation +terraform import azurerm_log_analytics_workspace_linked_service.test /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.OperationalInsights/workspaces/workspace1/linkedservices/automation ``` From 0bd0648e36898be3a3cc6733fdabd95f0499a3ac Mon Sep 17 00:00:00 2001 From: Tony Fortes Ramos Date: Thu, 25 Oct 2018 13:56:49 +0200 Subject: [PATCH 10/14] azurerm_log_analytics_linked_service: fix documentation typo --- website/docs/r/log_analytics_linked_service.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/log_analytics_linked_service.html.markdown b/website/docs/r/log_analytics_linked_service.html.markdown index 8f3e0242f4cd..09e76cc0085f 100644 --- a/website/docs/r/log_analytics_linked_service.html.markdown +++ b/website/docs/r/log_analytics_linked_service.html.markdown @@ -58,7 +58,7 @@ The following arguments are supported: * `workspace_name` - (Required) Name of the Log Analytics Workspace that will contain the linkedServices resource. Changing this forces a new resource to be created. -* `linked_service_name` - (Optional) Name of the type of linkedServices resource to connecto to the Log Analytics Workspace specified in `workspace_name`. Currently it defaults to and only supports `automation` as a value. Changing this forces a new resource to be created. +* `linked_service_name` - (Optional) Name of the type of linkedServices resource to connect to the Log Analytics Workspace specified in `workspace_name`. Currently it defaults to and only supports `automation` as a value. Changing this forces a new resource to be created. * `linked_service_properties` - (Required) A `linked_service_properties` block as defined below. From 3c5c62398d8fb06dc746ff11ead7795e5e98f6ff Mon Sep 17 00:00:00 2001 From: Tony Fortes Ramos Date: Sat, 27 Oct 2018 02:00:30 +0200 Subject: [PATCH 11/14] azurerm_log_analytics_workspace_linked_service: move import tests --- ...analytics_workspace_linked_service_test.go | 56 ------------------- ...analytics_workspace_linked_service_test.go | 48 ++++++++++++++++ 2 files changed, 48 insertions(+), 56 deletions(-) delete mode 100644 azurerm/import_arm_log_analytics_workspace_linked_service_test.go diff --git a/azurerm/import_arm_log_analytics_workspace_linked_service_test.go b/azurerm/import_arm_log_analytics_workspace_linked_service_test.go deleted file mode 100644 index 320b70858cff..000000000000 --- a/azurerm/import_arm_log_analytics_workspace_linked_service_test.go +++ /dev/null @@ -1,56 +0,0 @@ -package azurerm - -import ( - "testing" - - "github.com/hashicorp/terraform/helper/acctest" - "github.com/hashicorp/terraform/helper/resource" -) - -func TestAccAzureRMLogAnalyticsWorkspaceLinkedService_importRequiredOnly(t *testing.T) { - resourceName := "azurerm_log_analytics_workspace_linked_service.test" - - ri := acctest.RandInt() - config := testAccAzureRMLogAnalyticsWorkspaceLinkedServiceRequiredOnly(ri, testLocation()) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMLogAnalyticsWorkspaceLinkedServiceDestroy, - Steps: []resource.TestStep{ - { - Config: config, - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} - -func TestAccAzureRMLogAnalyticsWorkspaceLinkedService_importOptionalArguments(t *testing.T) { - resourceName := "azurerm_log_analytics_workspace_linked_service.test" - - ri := acctest.RandInt() - config := testAccAzureRMLogAnalyticsWorkspaceLinkedServiceOptionalArguments(ri, testLocation()) - - resource.Test(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMLogAnalyticsWorkspaceLinkedServiceDestroy, - Steps: []resource.TestStep{ - { - Config: config, - }, - - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - }, - }, - }) -} diff --git a/azurerm/resource_arm_log_analytics_workspace_linked_service_test.go b/azurerm/resource_arm_log_analytics_workspace_linked_service_test.go index 99fbf5d05c05..b53e33e23d8c 100644 --- a/azurerm/resource_arm_log_analytics_workspace_linked_service_test.go +++ b/azurerm/resource_arm_log_analytics_workspace_linked_service_test.go @@ -118,6 +118,54 @@ func testCheckAzureRMLogAnalyticsWorkspaceLinkedServiceExists(name string) resou } } +func TestAccAzureRMLogAnalyticsWorkspaceLinkedService_importRequiredOnly(t *testing.T) { + resourceName := "azurerm_log_analytics_workspace_linked_service.test" + + ri := acctest.RandInt() + config := testAccAzureRMLogAnalyticsWorkspaceLinkedServiceRequiredOnly(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMLogAnalyticsWorkspaceLinkedServiceDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAzureRMLogAnalyticsWorkspaceLinkedService_importOptionalArguments(t *testing.T) { + resourceName := "azurerm_log_analytics_workspace_linked_service.test" + + ri := acctest.RandInt() + config := testAccAzureRMLogAnalyticsWorkspaceLinkedServiceOptionalArguments(ri, testLocation()) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testCheckAzureRMLogAnalyticsWorkspaceLinkedServiceDestroy, + Steps: []resource.TestStep{ + { + Config: config, + }, + + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + func testAccAzureRMLogAnalyticsWorkspaceLinkedServiceRequiredOnly(rInt int, location string) string { return fmt.Sprintf(` resource "azurerm_resource_group" "test" { From 53a407bcd49b42ed39b5bc880679725a68a62f27 Mon Sep 17 00:00:00 2001 From: Tony Fortes Ramos Date: Sat, 27 Oct 2018 02:34:21 +0200 Subject: [PATCH 12/14] azurerm_log_analytics_workspace_linked_service: add input validation --- ..._log_analytics_workspace_linked_service.go | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/azurerm/resource_arm_log_analytics_workspace_linked_service.go b/azurerm/resource_arm_log_analytics_workspace_linked_service.go index 2dd423d39509..ac7d4be5a7f9 100644 --- a/azurerm/resource_arm_log_analytics_workspace_linked_service.go +++ b/azurerm/resource_arm_log_analytics_workspace_linked_service.go @@ -6,6 +6,8 @@ import ( "github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights" "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -23,16 +25,18 @@ func resourceArmLogAnalyticsWorkspaceLinkedService() *schema.Resource { "resource_group_name": resourceGroupNameDiffSuppressSchema(), "workspace_name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validateAzureRmLogAnalyticsWorkspaceName, }, "linked_service_name": { - Type: schema.TypeString, - Optional: true, - ForceNew: true, - Default: "automation", + Type: schema.TypeString, + Optional: true, + ForceNew: true, + Default: "automation", + ValidateFunc: validation.NoZeroValues, }, "linked_service_properties": { @@ -42,9 +46,10 @@ func resourceArmLogAnalyticsWorkspaceLinkedService() *schema.Resource { Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "resource_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: azure.ValidateResourceID, }, }, }, From 9ded9ec01f0ad3e644b59245d99be6c24b28dc0f Mon Sep 17 00:00:00 2001 From: Tony Fortes Ramos Date: Sat, 27 Oct 2018 02:36:29 +0200 Subject: [PATCH 13/14] azurerm_log_analytics_workspace_linked_service: wrap errors with text --- .../resource_arm_log_analytics_workspace_linked_service.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azurerm/resource_arm_log_analytics_workspace_linked_service.go b/azurerm/resource_arm_log_analytics_workspace_linked_service.go index ac7d4be5a7f9..e1ebb34b2427 100644 --- a/azurerm/resource_arm_log_analytics_workspace_linked_service.go +++ b/azurerm/resource_arm_log_analytics_workspace_linked_service.go @@ -91,12 +91,12 @@ func resourceArmLogAnalyticsWorkspaceLinkedServiceCreateUpdate(d *schema.Resourc _, err := client.CreateOrUpdate(ctx, resGroup, workspaceName, lsName, parameters) if err != nil { - return err + return fmt.Errorf("Error issuing create request for Log Analytics Workspace Linked Service %q/%q (Resource Group %q): %+v", workspaceName, lsName, resGroup, err) } read, err := client.Get(ctx, resGroup, workspaceName, lsName) if err != nil { - return err + return fmt.Errorf("Error retrieving Analytics Workspace Linked Service %q/%q (Resource Group %q): %+v", workspaceName, lsName, resGroup, err) } if read.ID == nil { From dd6a37d5bfb90708e612266a9584fa5db59e69a5 Mon Sep 17 00:00:00 2001 From: Tony Fortes Ramos Date: Sat, 27 Oct 2018 02:36:53 +0200 Subject: [PATCH 14/14] azurerm_log_analytics_workspace_linked_service: remove commented code --- azurerm/resource_arm_log_analytics_workspace_linked_service.go | 1 - 1 file changed, 1 deletion(-) diff --git a/azurerm/resource_arm_log_analytics_workspace_linked_service.go b/azurerm/resource_arm_log_analytics_workspace_linked_service.go index e1ebb34b2427..c49b9b65bf05 100644 --- a/azurerm/resource_arm_log_analytics_workspace_linked_service.go +++ b/azurerm/resource_arm_log_analytics_workspace_linked_service.go @@ -82,7 +82,6 @@ func resourceArmLogAnalyticsWorkspaceLinkedServiceCreateUpdate(d *schema.Resourc tags := d.Get("tags").(map[string]interface{}) parameters := operationalinsights.LinkedService{ - // Name: &name, Tags: expandTags(tags), LinkedServiceProperties: &operationalinsights.LinkedServiceProperties{ ResourceID: &resourceID,