Set id attribute of databricks_metastore data source (#3503)

In addition to filling `metastore_id` we set `id` to the same value

Author: alexott

catalog/data_metastore.go

@@ -12,20 +12,21 @@ import (
 
 func DataSourceMetastore() common.Resource {
 	type AccountMetastoreByID struct {
-		Id        string                 `json:"metastore_id,omitempty" tf:"computed"`
-		Name      string                 `json:"name,omitempty" tf:"computed"`
-		Region    string                 `json:"region,omitempty" tf:"computed"`
-		Metastore *catalog.MetastoreInfo `json:"metastore_info,omitempty" tf:"computed" `
+		Id          string                 `json:"id,omitempty" tf:"computed"`
+		MetastoreId string                 `json:"metastore_id,omitempty" tf:"computed"`
+		Name        string                 `json:"name,omitempty" tf:"computed"`
+		Region      string                 `json:"region,omitempty" tf:"computed"`
+		Metastore   *catalog.MetastoreInfo `json:"metastore_info,omitempty" tf:"computed" `
 	}
 	return common.AccountData(func(ctx context.Context, data *AccountMetastoreByID, acc *databricks.AccountClient) error {
-		if data.Id == "" && data.Name == "" && data.Region == "" {
+		if data.MetastoreId == "" && data.Name == "" && data.Region == "" {
 			return fmt.Errorf("one of metastore_id, name or region must be provided")
 		}
-		if (data.Id != "" && data.Name != "") || (data.Region != "" && data.Id != "") || (data.Region != "" && data.Name != "") {
+		if (data.MetastoreId != "" && data.Name != "") || (data.Region != "" && data.MetastoreId != "") || (data.Region != "" && data.Name != "") {
 			return fmt.Errorf("only one of metastore_id, name or region must be provided")
 		}
-		if data.Id != "" {
-			minfo, err := acc.Metastores.GetByMetastoreId(ctx, data.Id)
+		if data.MetastoreId != "" {
+			minfo, err := acc.Metastores.GetByMetastoreId(ctx, data.MetastoreId)
 			if err != nil {
 				return err
 			}
@@ -58,6 +59,7 @@ func DataSourceMetastore() common.Resource {
 			data.Metastore = &minfos[0]
 		}
 		data.Id = data.Metastore.MetastoreId
+		data.MetastoreId = data.Metastore.MetastoreId
 		data.Name = data.Metastore.Name
 		data.Region = data.Metastore.Region
 		return nil

catalog/data_metastore_test.go

@@ -130,6 +130,7 @@ func TestMetastoreByRegion(t *testing.T) {
 		region = "westus"
 		`,
 	}.ApplyAndExpectData(t, map[string]any{
+		"id":                            "abc",
 		"name":                          "xyz",
 		"region":                        "westus",
 		"metastore_info.0.name":         "xyz",

docs/data-sources/metastore.md

@@ -36,7 +36,7 @@ output "some_metastore" {
 
 Provide one of the arguments to get information about a metastore:
 
-* `metastore_id` - Id of the metastore
+* `metastore_id` - ID of the metastore
 * `name` - Name of the metastore
 * `region` - Region of the metastore
 
@@ -45,6 +45,7 @@ Provide one of the arguments to get information about a metastore:
 
 This data source exports the following attributes:
 
+* `id` - ID of the metastore
 * `metastore_info` - MetastoreInfo object for a [databricks_metastore](../resources/metastore.md). This contains the following attributes:
   * `name` - Name of metastore.
   * `storage_root` - Path on cloud storage account, where managed `databricks_table` are stored.