azurerm_synapse_spark_pool/azurerm_synapse_workspace- fix acctests (hashicorp#30168)

Author: ezhong-msft

internal/services/synapse/synapse_spark_pool_resource.go

@@ -11,6 +11,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/services/preview/synapse/mgmt/v2.0/synapse" // nolint: staticcheck
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/features"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/synapse/parse"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/synapse/validate"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tags"
@@ -21,7 +22,7 @@ import (
 )
 
 func resourceSynapseSparkPool() *pluginsdk.Resource {
-	return &pluginsdk.Resource{
+	r := &pluginsdk.Resource{
 		Create: resourceSynapseSparkPoolCreate,
 		Read:   resourceSynapseSparkPoolRead,
 		Update: resourceSynapseSparkPoolUpdate,
@@ -216,15 +217,34 @@ func resourceSynapseSparkPool() *pluginsdk.Resource {
 				Type:     pluginsdk.TypeString,
 				Required: true,
 				ValidateFunc: validation.StringInSlice([]string{
-					"3.2",
-					"3.3",
 					"3.4",
 				}, false),
 			},
 
 			"tags": tags.Schema(),
 		},
 	}
+
+	if !features.FivePointOh() {
+		r.Schema["spark_version"] = &pluginsdk.Schema{
+			Type:     pluginsdk.TypeString,
+			Required: true,
+			ValidateFunc: validation.All(validation.StringInSlice([]string{
+				"3.2",
+				"3.3",
+				"3.4",
+			}, false),
+				func(v interface{}, k string) (warnings []string, errors []error) {
+					if val, ok := v.(string); ok && (val == "3.2" || val == "3.3") {
+						warnings = append(warnings, fmt.Sprintf("Spark version %s is deprecated and will be removed in a future version of the AzureRM provider. Please consider upgrading to version 3.4 or later.", val))
+					}
+					return
+				},
+			),
+		}
+	}
+
+	return r
 }
 
 func resourceSynapseSparkPoolCreate(d *pluginsdk.ResourceData, meta interface{}) error {

internal/services/synapse/synapse_spark_pool_resource_test.go

@@ -99,14 +99,6 @@ func TestAccSynapseSparkPool_sparkVersion(t *testing.T) {
 	r := SynapseSparkPoolResource{}
 
 	data.ResourceTest(t, r, []acceptance.TestStep{
-		{
-			Config: r.sparkVersion(data, "3.2"),
-			Check: acceptance.ComposeTestCheckFunc(
-				check.That(data.ResourceName).ExistsInAzure(r),
-			),
-		},
-		// not returned by service
-		data.ImportStep("spark_events_folder", "spark_log_folder"),
 		{
 			Config: r.sparkVersion(data, "3.3"),
 			Check: acceptance.ComposeTestCheckFunc(

internal/services/synapse/synapse_workspace_resource_test.go

@@ -98,8 +98,8 @@ func TestAccSynapseWorkspace_update(t *testing.T) {
 			Check: acceptance.ComposeTestCheckFunc(
 				check.That(data.ResourceName).ExistsInAzure(r),
 			),
+			ExpectNonEmptyPlan: true, // removing workspace AAD admin also removes the SQL AAD admin and visa versa so it needs to be recreated
 		},
-		data.ImportStep("sql_administrator_login_password"),
 		{
 			Config: r.basic(data),
 			Check: acceptance.ComposeTestCheckFunc(
@@ -353,7 +353,7 @@ resource "azurerm_synapse_workspace" "test" {
     ENV = "Test"
   }
 }
-`, template, data.RandomString, data.Locations.Secondary, data.RandomString, data.RandomString, data.RandomInteger, data.RandomInteger)
+`, template, data.RandomString, data.Locations.Ternary, data.RandomString, data.RandomString, data.RandomInteger, data.RandomInteger)
 }
 
 func (r SynapseWorkspaceResource) withAadAdmin(data acceptance.TestData) string {

website/docs/5.0-upgrade-guide.html.markdown

@@ -379,6 +379,10 @@ Please follow the format in the example below for listing breaking changes in re
 * The deprecated `static_website` block has been removed and superseded by the `azurerm_storage_account_static_website` resource.
 * The property `minimum_tls_version` no longer accepts `TLS1_0` or `TLS1_1` as a value.
 
+### `azurerm_synapse_spark_pool`
+
+* The `spark_version` property no longer accepts `3.2` or `3.3` as a value.
+
 ### `azurerm_storage_container`
 
 * The deprecated `storage_account_name` property has been removed in favour of the `storage_account_id` property.

website/docs/r/synapse_spark_pool.html.markdown

@@ -97,7 +97,7 @@ The following arguments are supported:
 
 * `node_size` - (Required) The level of node in the Spark Pool. Possible values are `Small`, `Medium`, `Large`, `None`, `XLarge`, `XXLarge` and `XXXLarge`.
 
-* `spark_version` - (Required) The Apache Spark version. Possible values are `3.2`, `3.3`, and `3.4`.
+* `spark_version` - (Required) The Apache Spark version. Currently, the only possible value is `3.4`.
 
 * `node_count` - (Optional) The number of nodes in the Spark Pool. Exactly one of `node_count` or `auto_scale` must be specified.