Test Fix: TestAccAppService_x (#13671)

hashicorp · Oct 11, 2021 · 80861e9 · 80861e9
1 parent 1629ba0
commit 80861e9
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 132 deletions.
diff --git a/internal/services/web/app_service_resource_test.go b/internal/services/web/app_service_resource_test.go
@@ -1383,42 +1383,6 @@ func TestAccAppService_windowsJava11Tomcat(t *testing.T) {
 	})
 }
 
-func TestAccAppService_windowsJava7Minor(t *testing.T) {
-	data := acceptance.BuildTestData(t, "azurerm_app_service", "test")
-	r := AppServiceResource{}
-
-	data.ResourceTest(t, r, []acceptance.TestStep{
-		{
-			Config: r.windowsJava(data, "1.7.0_80", "TOMCAT", "9.0"),
-			Check: acceptance.ComposeTestCheckFunc(
-				check.That(data.ResourceName).ExistsInAzure(r),
-				check.That(data.ResourceName).Key("site_config.0.java_version").HasValue("1.7.0_80"),
-				check.That(data.ResourceName).Key("site_config.0.java_container").HasValue("TOMCAT"),
-				check.That(data.ResourceName).Key("site_config.0.java_container_version").HasValue("9.0"),
-			),
-		},
-		data.ImportStep(),
-	})
-}
-
-func TestAccAppService_windowsJava8Minor(t *testing.T) {
-	data := acceptance.BuildTestData(t, "azurerm_app_service", "test")
-	r := AppServiceResource{}
-
-	data.ResourceTest(t, r, []acceptance.TestStep{
-		{
-			Config: r.windowsJava(data, "1.8.0_181", "TOMCAT", "9.0"),
-			Check: acceptance.ComposeTestCheckFunc(
-				check.That(data.ResourceName).ExistsInAzure(r),
-				check.That(data.ResourceName).Key("site_config.0.java_version").HasValue("1.8.0_181"),
-				check.That(data.ResourceName).Key("site_config.0.java_container").HasValue("TOMCAT"),
-				check.That(data.ResourceName).Key("site_config.0.java_container_version").HasValue("9.0"),
-			),
-		},
-		data.ImportStep(),
-	})
-}
-
 func TestAccAppService_windowsPHP7(t *testing.T) {
 	data := acceptance.BuildTestData(t, "azurerm_app_service", "test")
 	r := AppServiceResource{}

diff --git a/internal/services/web/app_service_slot_resource_test.go b/internal/services/web/app_service_slot_resource_test.go
@@ -973,40 +973,6 @@ func TestAccAppServiceSlot_windowsJava11Tomcat(t *testing.T) {
 	})
 }
 
-func TestAccAppServiceSlot_windowsJava7Minor(t *testing.T) {
-	data := acceptance.BuildTestData(t, "azurerm_app_service_slot", "test")
-	r := AppServiceSlotResource{}
-
-	data.ResourceTest(t, r, []acceptance.TestStep{
-		{
-			Config: r.windowsJava(data, "1.7.0_80", "TOMCAT", "9.0"),
-			Check: acceptance.ComposeTestCheckFunc(
-				check.That(data.ResourceName).ExistsInAzure(r),
-				check.That(data.ResourceName).Key("site_config.0.java_version").HasValue("1.7.0_80"),
-				check.That(data.ResourceName).Key("site_config.0.java_container").HasValue("TOMCAT"),
-				check.That(data.ResourceName).Key("site_config.0.java_container_version").HasValue("9.0"),
-			),
-		},
-	})
-}
-
-func TestAccAppServiceSlot_windowsJava8Minor(t *testing.T) {
-	data := acceptance.BuildTestData(t, "azurerm_app_service_slot", "test")
-	r := AppServiceSlotResource{}
-
-	data.ResourceTest(t, r, []acceptance.TestStep{
-		{
-			Config: r.windowsJava(data, "1.8.0_181", "TOMCAT", "9.0"),
-			Check: acceptance.ComposeTestCheckFunc(
-				check.That(data.ResourceName).ExistsInAzure(r),
-				check.That(data.ResourceName).Key("site_config.0.java_version").HasValue("1.8.0_181"),
-				check.That(data.ResourceName).Key("site_config.0.java_container").HasValue("TOMCAT"),
-				check.That(data.ResourceName).Key("site_config.0.java_container_version").HasValue("9.0"),
-			),
-		},
-	})
-}
-
 func TestAccAppServiceSlot_windowsPHP7(t *testing.T) {
 	data := acceptance.BuildTestData(t, "azurerm_app_service_slot", "test")
 	r := AppServiceSlotResource{}
@@ -1162,23 +1128,6 @@ func TestAccAppServiceSlot_httpBlobStorageLogs(t *testing.T) {
 	})
 }
 
-func TestAccAppServiceSlot_emptyHttpBlobStorageLogs(t *testing.T) {
-	data := acceptance.BuildTestData(t, "azurerm_app_service_slot", "test")
-	r := AppServiceSlotResource{}
-
-	data.ResourceTest(t, r, []acceptance.TestStep{
-		{
-			Config: r.emptyHttpBlobStorageLogs(data),
-			Check: acceptance.ComposeTestCheckFunc(
-				check.That(data.ResourceName).ExistsInAzure(r),
-				check.That(data.ResourceName).Key("logs.0.http_logs.0.azure_blob_storage.#").HasValue("0"),
-				check.That(data.ResourceName).Key("logs.0.http_logs.0.file_system.#").HasValue("0"),
-			),
-		},
-		data.ImportStep(),
-	})
-}
-
 func TestAccAppServiceSlot_detailedErrorMessagesLogs(t *testing.T) {
 	data := acceptance.BuildTestData(t, "azurerm_app_service_slot", "test")
 	r := AppServiceSlotResource{}
@@ -3650,50 +3599,6 @@ resource "azurerm_app_service_slot" "test" {
 `, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger)
 }
 
-func (r AppServiceSlotResource) emptyHttpBlobStorageLogs(data acceptance.TestData) string {
-	return fmt.Sprintf(`
-provider "azurerm" {
-  features {}
-}
-
-resource "azurerm_resource_group" "test" {
-  name     = "acctestRG-%d"
-  location = "%s"
-}
-
-resource "azurerm_app_service_plan" "test" {
-  name                = "acctestASP-%d"
-  location            = azurerm_resource_group.test.location
-  resource_group_name = azurerm_resource_group.test.name
-
-  sku {
-    tier = "Standard"
-    size = "S1"
-  }
-}
-
-resource "azurerm_app_service" "test" {
-  name                = "acctestAS-%d"
-  location            = azurerm_resource_group.test.location
-  resource_group_name = azurerm_resource_group.test.name
-  app_service_plan_id = azurerm_app_service_plan.test.id
-}
-
-resource "azurerm_app_service_slot" "test" {
-  name                = "acctestASSlot-%d"
-  location            = azurerm_resource_group.test.location
-  resource_group_name = azurerm_resource_group.test.name
-  app_service_plan_id = azurerm_app_service_plan.test.id
-  app_service_name    = azurerm_app_service.test.name
-
-  logs {
-    http_logs {
-    }
-  }
-}
-`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger)
-}
-
 func (r AppServiceSlotResource) detailedErrorMessages(data acceptance.TestData, detailedErrorEnabled bool) string {
 	return fmt.Sprintf(`
 provider "azurerm" {

diff --git a/internal/services/web/app_service_source_control_token_resource_test.go b/internal/services/web/app_service_source_control_token_resource_test.go
@@ -44,7 +44,7 @@ func (r AppServiceSourceControlResource) Exists(ctx context.Context, client *cli
 		return nil, fmt.Errorf("retrieving %s: %+v", state.ID, err)
 	}
 
-	return utils.Bool(resp.SourceControlProperties != nil), nil
+	return utils.Bool(resp.SourceControlProperties != nil && resp.SourceControlProperties.Token != nil && *resp.SourceControlProperties.Token != ""), nil
 }
 
 func testAccAppServiceSourceControlToken(token, tokenSecret string) string {