azure app service does not support minors for java 11

hashicorp · Nov 3, 2019 · 71ca7ed · 71ca7ed
1 parent a0ad9a8
commit 71ca7ed
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 53 deletions.
diff --git a/azurerm/resource_arm_app_service_slot_test.go b/azurerm/resource_arm_app_service_slot_test.go
@@ -1387,29 +1387,6 @@ func TestAccAzureRMAppServiceSlot_windowsJava8Minor(t *testing.T) {
 	})
 }
 
-func TestAccAzureRMAppServiceSlot_windowsJava11Minor(t *testing.T) {
-	resourceName := "azurerm_app_service_slot.test"
-	ri := tf.AccRandTimeInt()
-	config := testAccAzureRMAppServiceSlot_windowsJava(ri, testLocation(), "11.0.1", "TOMCAT", "9.0")
-
-	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testCheckAzureRMAppServiceSlotDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: config,
-				Check: resource.ComposeTestCheckFunc(
-					testCheckAzureRMAppServiceSlotExists(resourceName),
-					resource.TestCheckResourceAttr(resourceName, "site_config.0.java_version", "11.0.1"),
-					resource.TestCheckResourceAttr(resourceName, "site_config.0.java_container", "TOMCAT"),
-					resource.TestCheckResourceAttr(resourceName, "site_config.0.java_container_version", "9.0"),
-				),
-			},
-		},
-	})
-}
-
 func TestAccAzureRMAppServiceSlot_windowsPHP7(t *testing.T) {
 	resourceName := "azurerm_app_service_slot.test"
 	ri := tf.AccRandTimeInt()

diff --git a/azurerm/resource_arm_app_service_test.go b/azurerm/resource_arm_app_service_test.go
@@ -1476,34 +1476,6 @@ func TestAccAzureRMAppService_windowsJava8Minor(t *testing.T) {
 	})
 }
 
-func TestAccAzureRMAppService_windowsJava11Minor(t *testing.T) {
-	resourceName := "azurerm_app_service.test"
-	ri := tf.AccRandTimeInt()
-	config := testAccAzureRMAppService_windowsJava(ri, testLocation(), "11.0.1", "TOMCAT", "9.0")
-
-	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testCheckAzureRMAppServiceDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: config,
-				Check: resource.ComposeTestCheckFunc(
-					testCheckAzureRMAppServiceExists(resourceName),
-					resource.TestCheckResourceAttr(resourceName, "site_config.0.java_version", "11.0.1"),
-					resource.TestCheckResourceAttr(resourceName, "site_config.0.java_container", "TOMCAT"),
-					resource.TestCheckResourceAttr(resourceName, "site_config.0.java_container_version", "9.0"),
-				),
-			},
-			{
-				ResourceName:      resourceName,
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-		},
-	})
-}
-
 func TestAccAzureRMAppService_windowsPHP7(t *testing.T) {
 	resourceName := "azurerm_app_service.test"
 	ri := tf.AccRandTimeInt()

diff --git a/website/docs/r/app_service.html.markdown b/website/docs/r/app_service.html.markdown
@@ -189,7 +189,7 @@ A `site_config` block supports the following:
 
 * `ip_restriction` - (Optional) A [List of objects](/docs/configuration/attr-as-blocks.html) representing ip restrictions as defined below.
 
-* `java_version` - (Optional) The version of Java to use. If specified `java_container` and `java_container_version` must also be specified. Possible values are `1.7`, `1.8` and `11` and their minor/patch versions (e.g. `1.7.0_80`, `1.8.0_181`, `11.0.2`)
+* `java_version` - (Optional) The version of Java to use. If specified `java_container` and `java_container_version` must also be specified. Possible values are `1.7`, `1.8` and `11` and their specific versions - except for Java 11 (e.g. `1.7.0_80`, `1.8.0_181`, `11`)
 
 * `java_container` - (Optional) The Java Container to use. If specified `java_version` and `java_container_version` must also be specified. Possible values are `JETTY` and `TOMCAT`.
 

diff --git a/website/docs/r/app_service_slot.html.markdown b/website/docs/r/app_service_slot.html.markdown
@@ -202,7 +202,7 @@ The following arguments are supported:
 
 * `java_container_version` - (Optional) The version of the Java Container to use. If specified `java_version` and `java_container` must also be specified.
 
-* `java_version` - (Optional) The version of Java to use. If specified `java_container` and `java_container_version` must also be specified. Possible values are `1.7`, `1.8` and `11` and their minor/patch versions (e.g. `1.7.0_80`, `1.8.0_181`, `11.0.2`)
+* `java_version` - (Optional) The version of Java to use. If specified `java_container` and `java_container_version` must also be specified. Possible values are `1.7`, `1.8` and `11` and their specific versions - except for Java 11 (e.g. `1.7.0_80`, `1.8.0_181`, `11`)
 
 * `local_mysql_enabled` - (Optional) Is "MySQL In App" Enabled? This runs a local MySQL instance with your app and shares resources from the App Service plan.