fixing the build post re-basing

hashicorp · Jan 31, 2019 · 785bafe · 785bafe
1 parent 5b48d5f
commit 785bafe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/azurerm/resource_arm_autoscale_setting_test.go b/azurerm/resource_arm_autoscale_setting_test.go
@@ -5,7 +5,6 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/acctest"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
@@ -51,7 +50,6 @@ func TestAccAzureRMAutoScaleSetting_requiresImport(t *testing.T) {
 
 	resourceName := "azurerm_autoscale_setting.test"
 	ri := tf.AccRandTimeInt()
-	rs := acctest.RandString(6)
 	location := testLocation()
 
 	resource.ParallelTest(t, resource.TestCase{
@@ -60,13 +58,13 @@ func TestAccAzureRMAutoScaleSetting_requiresImport(t *testing.T) {
 		CheckDestroy: testCheckAzureRMAutoScaleSettingDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAzureRMAutoScaleSetting_basic(ri, rs, location),
+				Config: testAccAzureRMAutoScaleSetting_basic(ri, location),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMAutoScaleSettingExists(resourceName),
 				),
 			},
 			{
-				Config:      testAccAzureRMAutoScaleSetting_requiresImport(ri, rs, location),
+				Config:      testAccAzureRMAutoScaleSetting_requiresImport(ri, location),
 				ExpectError: testRequiresImportError("azurerm_autoscale_setting"),
 			},
 		},
@@ -420,8 +418,8 @@ resource "azurerm_autoscale_setting" "test" {
 `, template, rInt)
 }
 
-func testAccAzureRMAutoScaleSetting_requiresImport(rInt int, rString string, location string) string {
-	template := testAccAzureRMAutoScaleSetting_basic(rInt, rString, location)
+func testAccAzureRMAutoScaleSetting_requiresImport(rInt int, location string) string {
+	template := testAccAzureRMAutoScaleSetting_basic(rInt, location)
 	return fmt.Sprintf(`
 %s
 

diff --git a/azurerm/resource_arm_monitor_autoscale_setting_test.go b/azurerm/resource_arm_monitor_autoscale_setting_test.go
@@ -51,7 +51,6 @@ func TestAccAzureRMMonitorAutoScaleSetting_requiresImport(t *testing.T) {
 
 	resourceName := "azurerm_monitor_autoscale_setting.test"
 	ri := tf.AccRandTimeInt()
-	rs := acctest.RandString(6)
 	location := testLocation()
 
 	resource.ParallelTest(t, resource.TestCase{
@@ -60,13 +59,13 @@ func TestAccAzureRMMonitorAutoScaleSetting_requiresImport(t *testing.T) {
 		CheckDestroy: testCheckAzureRMMonitorAutoScaleSettingDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAzureRMMonitorAutoScaleSetting_basic(ri, rs, location),
+				Config: testAccAzureRMMonitorAutoScaleSetting_basic(ri, location),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMMonitorAutoScaleSettingExists(resourceName),
 				),
 			},
 			{
-				Config:      testAccAzureRMMonitorAutoScaleSetting_requiresImport(ri, rs, location),
+				Config:      testAccAzureRMMonitorAutoScaleSetting_requiresImport(ri, location),
 				ExpectError: testRequiresImportError("azurerm_monitor_autoscale_setting"),
 			},
 		},
@@ -421,8 +420,8 @@ resource "azurerm_monitor_autoscale_setting" "test" {
 `, template, rInt)
 }
 
-func testAccAzureRMMonitorAutoScaleSetting_requiresImport(rInt int, rString string, location string) string {
-	template := testAccAzureRMMonitorAutoScaleSetting_basic(rInt, rString, location)
+func testAccAzureRMMonitorAutoScaleSetting_requiresImport(rInt int, location string) string {
+	template := testAccAzureRMMonitorAutoScaleSetting_basic(rInt, location)
 	return fmt.Sprintf(`
 %s
 
@@ -602,7 +601,7 @@ func testAccAzureRMMonitorAutoScaleSetting_multipleRules(rInt int, location stri
 	return fmt.Sprintf(`
 %s
 
-resource "azurerm_autoscale_setting" "test" {
+resource "azurerm_monitor_autoscale_setting" "test" {
   name                = "acctestautoscale-%d"
   resource_group_name = "${azurerm_resource_group.test.name}"
   location            = "${azurerm_resource_group.test.location}"