data bricks workspaces managed service/disk support managed hsm key, …

…deprecate xx_key_vault_id for cross subscription support as not required

add deprecate in 5.0 beta

internal/customermanagedkeys/key_vault_or_managed_hsm_key.go

@@ -5,7 +5,9 @@ package customermanagedkeys
 
 import (
 	"fmt"
+	"strings"
 
+	"github.com/hashicorp/go-azure-helpers/lang/pointer"
 	"github.com/hashicorp/go-azure-sdk/sdk/environments"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/keyvault/parse"
 	hsmParse "github.com/hashicorp/terraform-provider-azurerm/internal/services/managedhsm/parse"
@@ -85,6 +87,48 @@ func (k *KeyVaultOrManagedHSMKey) BaseUri() string {
 	return ""
 }
 
+func (k *KeyVaultOrManagedHSMKey) Name() string {
+	if k.KeyVaultKeyId != nil {
+		return k.KeyVaultKeyId.Name
+	}
+
+	if k.ManagedHSMKeyId != nil {
+		return k.ManagedHSMKeyId.KeyName
+	}
+
+	if k.ManagedHSMKeyVersionlessId != nil {
+		return k.ManagedHSMKeyVersionlessId.KeyName
+	}
+
+	return ""
+}
+
+func (k *KeyVaultOrManagedHSMKey) Version() string {
+	if k.KeyVaultKeyId != nil {
+		return k.KeyVaultKeyId.Version
+	}
+
+	if k.ManagedHSMKeyId != nil {
+		return k.ManagedHSMKeyId.KeyVersion
+	}
+
+	return ""
+}
+
+// VersionPtr returns a pointer to the version string if it exists, otherwise nil.
+// This is useful for resources supporting versioned and versionless keys.
+func (k *KeyVaultOrManagedHSMKey) VersionPtr() *string {
+	if k.KeyVaultKeyId != nil && k.KeyVaultKeyId.Version != "" {
+		return pointer.To(k.KeyVaultKeyId.Version)
+	}
+
+	if k.ManagedHSMKeyId != nil {
+		return pointer.To(k.ManagedHSMKeyId.KeyVersion)
+	}
+
+	return nil
+}
+
 func parseKeyvaultID(keyRaw string, requireVersion VersionType, _ environments.Api) (*parse.NestedItemId, error) {
 	keyID, err := parse.ParseOptionallyVersionedNestedKeyID(keyRaw)
 	if err != nil {
@@ -197,3 +241,9 @@ func FlattenKeyVaultOrManagedHSMID(id string, hsmEnv environments.Api) (*KeyVaul
 
 	return nil, fmt.Errorf("cannot parse given id to key vault key nor managed hsm key: %s", id)
 }
+
+func FlattenKeyVaultOrManagedHSMIDByComponents(baseUri, name, version string, hsmEnv environments.Api) (*KeyVaultOrManagedHSMKey, error) {
+	id := fmt.Sprintf("%s/keys/%s/%s", strings.TrimRight(baseUri, "/"), name, version)
+	id = strings.TrimSuffix(id, "/")
+	return FlattenKeyVaultOrManagedHSMID(id, hsmEnv)
+}