azurerm_mssql_managed_database - support for tags

internal/services/mssqlmanagedinstance/mssql_managed_database_resource.go

@@ -20,6 +20,7 @@ import (
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/mssql/helper"
 	miParse "github.com/hashicorp/terraform-provider-azurerm/internal/services/mssqlmanagedinstance/parse"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/mssqlmanagedinstance/validate"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/tags"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/suppress"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
@@ -31,6 +32,7 @@ type MsSqlManagedDatabaseModel struct {
 	LongTermRetentionPolicy []LongTermRetentionPolicy `tfschema:"long_term_retention_policy"`
 	ShortTermRetentionDays  int64                     `tfschema:"short_term_retention_days"`
 	PointInTimeRestore      []PointInTimeRestore      `tfschema:"point_in_time_restore"`
+	Tags                    map[string]string         `tfschema:"tags"`
 }
 
 type LongTermRetentionPolicy struct {
@@ -110,6 +112,8 @@ func (r MsSqlManagedDatabaseResource) Arguments() map[string]*pluginsdk.Schema {
 				},
 			},
 		},
+
+		"tags": tags.Schema(),
 	}
 }
 
@@ -157,15 +161,15 @@ func (r MsSqlManagedDatabaseResource) Create() sdk.ResourceFunc {
 			parameters := manageddatabases.ManagedDatabase{
 				Location:   managedInstance.Model.Location,
 				Properties: &manageddatabases.ManagedDatabaseProperties{},
+				Tags:       &model.Tags,
 			}
 
 			if len(model.PointInTimeRestore) > 0 {
 				restorePointInTime := model.PointInTimeRestore[0]
 				parameters.Properties.CreateMode = pointer.To(manageddatabases.ManagedDatabaseCreateModePointInTimeRestore)
 				parameters.Properties.RestorePointInTime = &restorePointInTime.RestorePointInTime
 
-				_, err := miParse.RestorableDroppedDatabaseID(restorePointInTime.SourceDatabaseId)
-				if err == nil {
+				if _, err := miParse.RestorableDroppedDatabaseID(restorePointInTime.SourceDatabaseId); err == nil {
 					parameters.Properties.RestorableDroppedDatabaseId = pointer.To(restorePointInTime.SourceDatabaseId)
 				} else {
 					parameters.Properties.SourceDatabaseId = pointer.To(restorePointInTime.SourceDatabaseId)
@@ -215,6 +219,7 @@ func (r MsSqlManagedDatabaseResource) Update() sdk.ResourceFunc {
 	return sdk.ResourceFunc{
 		Timeout: 30 * time.Minute,
 		Func: func(ctx context.Context, metadata sdk.ResourceMetaData) error {
+			client := metadata.Client.MSSQLManagedInstance.ManagedDatabasesClient
 			longTermRetentionClient := metadata.Client.MSSQLManagedInstance.ManagedInstancesLongTermRetentionPoliciesClient
 			shortTermRetentionClient := metadata.Client.MSSQLManagedInstance.ManagedInstancesShortTermRetentionPoliciesClient
 
@@ -233,6 +238,17 @@ func (r MsSqlManagedDatabaseResource) Update() sdk.ResourceFunc {
 
 			d := metadata.ResourceData
 
+			if d.HasChange("tags") {
+				parameters := manageddatabases.ManagedDatabase{
+					Tags: &model.Tags,
+				}
+
+				err = client.CreateOrUpdateThenPoll(ctx, id, parameters)
+				if err != nil {
+					return fmt.Errorf("updating %s: %+v", id, err)
+				}
+			}
+
 			if d.HasChange("long_term_retention_policy") {
 				longTermRetentionProps := expandLongTermRetentionPolicy(model.LongTermRetentionPolicy)
 
@@ -319,6 +335,10 @@ func (r MsSqlManagedDatabaseResource) Read() sdk.ResourceFunc {
 				model.PointInTimeRestore = flattenManagedDatabasePointInTimeRestore(v)
 			}
 
+			if model.Tags != nil {
+				state.Tags = model.Tags
+			}
+
 			return metadata.Encode(&model)
 		},
 	}

internal/services/mssqlmanagedinstance/mssql_managed_database_resource_test.go

@@ -34,6 +34,50 @@ func TestAccMsSqlManagedDatabase_basic(t *testing.T) {
 	})
 }
 
+func TestAccMsSqlManagedDatabase_complete(t *testing.T) {
+	data := acceptance.BuildTestData(t, "azurerm_mssql_managed_database", "test")
+	r := MsSqlManagedDatabase{}
+
+	data.ResourceTest(t, r, []acceptance.TestStep{
+		{
+			Config: r.complete(data),
+			Check: acceptance.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+			),
+		},
+		data.ImportStep(""),
+	})
+}
+
+func TestAccMsSqlManagedDatabase_update(t *testing.T) {
+	data := acceptance.BuildTestData(t, "azurerm_mssql_managed_database", "test")
+	r := MsSqlManagedDatabase{}
+
+	data.ResourceTest(t, r, []acceptance.TestStep{
+		{
+			Config: r.basic(data),
+			Check: acceptance.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+			),
+		},
+		data.ImportStep(""),
+		{
+			Config: r.complete(data),
+			Check: acceptance.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+			),
+		},
+		data.ImportStep(""),
+		{
+			Config: r.complete(data),
+			Check: acceptance.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+			),
+		},
+		data.ImportStep(""),
+	})
+}
+
 func TestAccMsSqlManagedDatabase_withRetentionPolicies(t *testing.T) {
 	data := acceptance.BuildTestData(t, "azurerm_mssql_managed_database", "test")
 	r := MsSqlManagedDatabase{}
@@ -103,6 +147,18 @@ resource "azurerm_mssql_managed_database" "test" {
 `, MsSqlManagedInstanceResource{}.basic(data), data.RandomInteger)
 }
 
+func (r MsSqlManagedDatabase) complete(data acceptance.TestData) string {
+	return fmt.Sprintf(`
+%[1]s
+
+resource "azurerm_mssql_managed_database" "test" {
+  managed_instance_id = azurerm_mssql_managed_instance.test.id
+  name                = "acctest-%[2]d"
+  tags                = { Environment = "Testing" }
+}
+`, MsSqlManagedInstanceResource{}.basic(data), data.RandomInteger)
+}
+
 func (r MsSqlManagedDatabase) withRetentionPolicies(data acceptance.TestData) string {
 	return fmt.Sprintf(`
 %[1]s