Modify code per review

Review [link](#6274 (review))
hashicorp · Mar 28, 2020 · c9f2e5b · c9f2e5b
1 parent 682d491
commit c9f2e5b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/...analytics/tests/resource_arm_log_analytics_datasource_windows_performance_counter_test.go b/...analytics/tests/resource_arm_log_analytics_datasource_windows_performance_counter_test.go
@@ -24,10 +24,10 @@ func TestAccAzureRMLogAnalyticsDataSourceWindowsPerformanceCounter_basic(t *test
 				Config: testAccAzureRMLogAnalyticsDataSourceWindowsPerformanceCounter_basic(data),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMLogAnalyticsDataSourceWindowsPerformanceCounterExists(data.ResourceName),
-					resource.TestCheckResourceAttr(data.ResourceName, "counter_name", "CPU"),
 					resource.TestCheckResourceAttr(data.ResourceName, "object_name", "CPU"),
-					resource.TestCheckResourceAttr(data.ResourceName, "interval_seconds", "10"),
 					resource.TestCheckResourceAttr(data.ResourceName, "instance_name", "*"),
+					resource.TestCheckResourceAttr(data.ResourceName, "counter_name", "CPU"),
+					resource.TestCheckResourceAttr(data.ResourceName, "interval_seconds", "10"),
 				),
 			},
 			data.ImportStep(),
@@ -47,10 +47,10 @@ func TestAccAzureRMLogAnalyticsDataSourceWindowsPerformanceCounter_complete(t *t
 				Config: testAccAzureRMLogAnalyticsDataSourceWindowsPerformanceCounter_complete(data),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMLogAnalyticsDataSourceWindowsPerformanceCounterExists(data.ResourceName),
-					resource.TestCheckResourceAttr(data.ResourceName, "counter_name", "Mem"),
 					resource.TestCheckResourceAttr(data.ResourceName, "object_name", "Mem"),
-					resource.TestCheckResourceAttr(data.ResourceName, "interval_seconds", "20"),
 					resource.TestCheckResourceAttr(data.ResourceName, "instance_name", "inst1"),
+					resource.TestCheckResourceAttr(data.ResourceName, "counter_name", "Mem"),
+					resource.TestCheckResourceAttr(data.ResourceName, "interval_seconds", "20"),
 				),
 			},
 			data.ImportStep(),
@@ -70,21 +70,21 @@ func TestAccAzureRMLogAnalyticsDataSourceWindowsPerformanceCounter_update(t *tes
 				Config: testAccAzureRMLogAnalyticsDataSourceWindowsPerformanceCounter_basic(data),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMLogAnalyticsDataSourceWindowsPerformanceCounterExists(data.ResourceName),
-					resource.TestCheckResourceAttr(data.ResourceName, "counter_name", "CPU"),
 					resource.TestCheckResourceAttr(data.ResourceName, "object_name", "CPU"),
-					resource.TestCheckResourceAttr(data.ResourceName, "interval_seconds", "10"),
 					resource.TestCheckResourceAttr(data.ResourceName, "instance_name", "*"),
+					resource.TestCheckResourceAttr(data.ResourceName, "counter_name", "CPU"),
+					resource.TestCheckResourceAttr(data.ResourceName, "interval_seconds", "10"),
 				),
 			},
 			data.ImportStep(),
 			{
 				Config: testAccAzureRMLogAnalyticsDataSourceWindowsPerformanceCounter_complete(data),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMLogAnalyticsDataSourceWindowsPerformanceCounterExists(data.ResourceName),
-					resource.TestCheckResourceAttr(data.ResourceName, "counter_name", "Mem"),
 					resource.TestCheckResourceAttr(data.ResourceName, "object_name", "Mem"),
-					resource.TestCheckResourceAttr(data.ResourceName, "interval_seconds", "20"),
 					resource.TestCheckResourceAttr(data.ResourceName, "instance_name", "inst1"),
+					resource.TestCheckResourceAttr(data.ResourceName, "counter_name", "Mem"),
+					resource.TestCheckResourceAttr(data.ResourceName, "interval_seconds", "20"),
 				),
 			},
 			data.ImportStep(),
@@ -172,10 +172,10 @@ resource "azurerm_log_analytics_datasource_windows_performance_counter" "test" {
   name                = "acctestLADS-WPC-%d"
   resource_group_name = azurerm_resource_group.test.name
   workspace_name      = azurerm_log_analytics_workspace.test.name
-  counter_name        = "CPU"
   object_name         = "CPU"
-  interval_seconds    = 10
   instance_name       = "*"
+  counter_name        = "CPU"
+  interval_seconds    = 10
 }
 `, template, data.RandomInteger)
 }
@@ -189,10 +189,10 @@ resource "azurerm_log_analytics_datasource_windows_performance_counter" "test" {
   name                = "acctestLADS-WPC-%d"
   resource_group_name = azurerm_resource_group.test.name
   workspace_name      = azurerm_log_analytics_workspace.test.name
-  counter_name        = "Mem"
   object_name         = "Mem"
-  interval_seconds    = 20
   instance_name       = "inst1"
+  counter_name        = "Mem"
+  interval_seconds    = 20
 }
 `, template, data.RandomInteger)
 }
@@ -206,10 +206,10 @@ resource "azurerm_log_analytics_datasource_windows_performance_counter" "import"
   name                = azurerm_log_analytics_datasource_windows_performance_counter.test.name
   resource_group_name = azurerm_log_analytics_datasource_windows_performance_counter.test.resource_group_name
   workspace_name      = azurerm_log_analytics_datasource_windows_performance_counter.test.workspace_name
-  counter_name        = azurerm_log_analytics_datasource_windows_performance_counter.test.counter_name
   object_name         = azurerm_log_analytics_datasource_windows_performance_counter.test.object_name
-  interval_seconds    = azurerm_log_analytics_datasource_windows_performance_counter.test.interval_seconds
   instance_name       = azurerm_log_analytics_datasource_windows_performance_counter.test.instance_name
+  counter_name        = azurerm_log_analytics_datasource_windows_performance_counter.test.counter_name
+  interval_seconds    = azurerm_log_analytics_datasource_windows_performance_counter.test.interval_seconds
 }
 `, template)
 }
@@ -221,7 +221,7 @@ provider "azurerm" {
 }
 
 resource "azurerm_resource_group" "test" {
-  name     = "acctestRG-%d"
+  name     = "acctestRG-la-%d"
   location = "%s"
 }
 

diff --git a/website/docs/r/log_analytics_datasource_windows_performance_counter.html.markdown b/website/docs/r/log_analytics_datasource_windows_performance_counter.html.markdown
@@ -33,10 +33,10 @@ resource "azurerm_log_analytics_datasource_windows_performance_counter" "example
   name                = "example-lad-wpc"
   resource_group_name = azurerm_resource_group.example.name
   workspace_name      = azurerm_log_analytics_workspace.example.name
-  counter_name        = "CPU"
   object_name         = "CPU"
-  interval_seconds    = 10
   instance_name       = "*"
+  counter_name        = "CPU"
+  interval_seconds    = 10
 }
 ```
 
@@ -50,13 +50,13 @@ The following arguments are supported:
 
 * `workspace_name` - (Required) The name of the Log Analytics Workspace where the Log Analytics Windows Performance Counter DataSource should exist. Changing this forces a new Log Analytics Windows Performance Counter DataSource to be created.
 
-* `counter_name` - (Required) The friendly name of the performance counter.
+* `object_name` - (Required) The object name of the Log Analytics Windows Performance Counter DataSource.
 
 * `instance_name` - (Required) The name of the virtual machine instance to which the Windows Performance Counter DataSource be applied. Specify a `*` will apply to all instances.
 
-* `interval_seconds` - (Required) The time of sample interval in seconds. Supports values between 10 and 2147483647.
+* `counter_name` - (Required) The friendly name of the performance counter.
 
-* `object_name` - (Required) The object name of the Log Analytics Windows Performance Counter DataSource.
+* `interval_seconds` - (Required) The time of sample interval in seconds. Supports values between 10 and 2147483647.
 
 ## Attributes Reference