Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

azurerm_recovery_services_vault - new property classic_vmware_replicate_enabled #20473

Merged
merged 3 commits into from
Feb 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions internal/services/recoveryservices/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/hashicorp/go-azure-sdk/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationprotectioncontainermappings"
"github.com/hashicorp/go-azure-sdk/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationprotectioncontainers"
"github.com/hashicorp/go-azure-sdk/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationrecoveryplans"
"github.com/hashicorp/go-azure-sdk/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationvaultsetting"
"github.com/hashicorp/terraform-provider-azurerm/internal/common"
)

Expand All @@ -25,6 +26,7 @@ type Client struct {
BackupOperationStatusesClient *backup.OperationStatusesClient
VaultsClient *vaults.VaultsClient
VaultsConfigsClient *backupresourcevaultconfigs.BackupResourceVaultConfigsClient
VaultsSettingsClient *replicationvaultsetting.ReplicationVaultSettingClient
StorageConfigsClient *backupresourcestorageconfigsnoncrr.BackupResourceStorageConfigsNonCRRClient
FabricClient *replicationfabrics.ReplicationFabricsClient
ProtectionContainerClient *replicationprotectioncontainers.ReplicationProtectionContainersClient
Expand All @@ -39,6 +41,9 @@ func NewClient(o *common.ClientOptions) *Client {
vaultConfigsClient := backupresourcevaultconfigs.NewBackupResourceVaultConfigsClientWithBaseURI(o.ResourceManagerEndpoint)
o.ConfigureClient(&vaultConfigsClient.Client, o.ResourceManagerAuthorizer)

vaultSettingsClient := replicationvaultsetting.NewReplicationVaultSettingClientWithBaseURI(o.ResourceManagerEndpoint)
o.ConfigureClient(&vaultSettingsClient.Client, o.ResourceManagerAuthorizer)

storageConfigsClient := backupresourcestorageconfigsnoncrr.NewBackupResourceStorageConfigsNonCRRClientWithBaseURI(o.ResourceManagerEndpoint)
o.ConfigureClient(&storageConfigsClient.Client, o.ResourceManagerAuthorizer)

Expand Down Expand Up @@ -97,6 +102,7 @@ func NewClient(o *common.ClientOptions) *Client {
BackupOperationStatusesClient: &backupOperationStatusesClient,
VaultsClient: &vaultsClient,
VaultsConfigsClient: &vaultConfigsClient,
VaultsSettingsClient: &vaultSettingsClient,
StorageConfigsClient: &storageConfigsClient,
FabricClient: &fabricClient,
ProtectionContainerClient: &protectionContainerClient,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/hashicorp/go-azure-sdk/resource-manager/recoveryservices/2022-10-01/vaults"
"github.com/hashicorp/go-azure-sdk/resource-manager/recoveryservicesbackup/2021-12-01/backupresourcestorageconfigsnoncrr"
"github.com/hashicorp/go-azure-sdk/resource-manager/recoveryservicesbackup/2021-12-01/backupresourcevaultconfigs"
"github.com/hashicorp/go-azure-sdk/resource-manager/recoveryservicessiterecovery/2022-10-01/replicationvaultsetting"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
keyvaultValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/keyvault/validate"
Expand Down Expand Up @@ -140,6 +141,13 @@ func resourceRecoveryServicesVault() *pluginsdk.Resource {
Optional: true,
Default: true,
},

"classic_vmware_replication_enabled": {
Type: pluginsdk.TypeBool,
Optional: true,
Computed: true, // the service always return even if not set.
ForceNew: true,
},
},

CustomizeDiff: pluginsdk.CustomDiffWithAll(
Expand All @@ -154,6 +162,7 @@ func resourceRecoveryServicesVaultCreate(d *pluginsdk.ResourceData, meta interfa
client := meta.(*clients.Client).RecoveryServices.VaultsClient
cfgsClient := meta.(*clients.Client).RecoveryServices.VaultsConfigsClient
storageCfgsClient := meta.(*clients.Client).RecoveryServices.StorageConfigsClient
settingsClient := meta.(*clients.Client).RecoveryServices.VaultsSettingsClient
subscriptionId := meta.(*clients.Client).Account.SubscriptionId
ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d)
defer cancel()
Expand Down Expand Up @@ -324,6 +333,18 @@ func resourceRecoveryServicesVaultCreate(d *pluginsdk.ResourceData, meta interfa
return fmt.Errorf("waiting for on update for Recovery Service %s: %+v", id.String(), err)
}

if d.Get("classic_vmware_replication_enabled").(bool) {
settingsId := replicationvaultsetting.NewReplicationVaultSettingID(id.SubscriptionId, id.ResourceGroupName, id.VaultName, "default")
settingsInput := replicationvaultsetting.VaultSettingCreationInput{
Properties: replicationvaultsetting.VaultSettingCreationInputProperties{
VMwareToAzureProviderType: utils.String("Vmware"),
},
}
if err := settingsClient.CreateThenPoll(ctx, settingsId, settingsInput); err != nil {
return fmt.Errorf("creating %s: %+v", settingsId, err)
}
}

d.SetId(id.ID())
return resourceRecoveryServicesVaultRead(d, meta)
}
Expand Down Expand Up @@ -548,6 +569,7 @@ func resourceRecoveryServicesVaultRead(d *pluginsdk.ResourceData, meta interface
client := meta.(*clients.Client).RecoveryServices.VaultsClient
cfgsClient := meta.(*clients.Client).RecoveryServices.VaultsConfigsClient
storageCfgsClient := meta.(*clients.Client).RecoveryServices.StorageConfigsClient
vaultSettingsClient := meta.(*clients.Client).RecoveryServices.VaultsSettingsClient
ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
defer cancel()

Expand Down Expand Up @@ -601,7 +623,7 @@ func resourceRecoveryServicesVaultRead(d *pluginsdk.ResourceData, meta interface

cfg, err := cfgsClient.Get(ctx, cfgId)
if err != nil {
return fmt.Errorf("reading Recovery Service Vault Cfg %s: %+v", id.String(), err)
return fmt.Errorf("retrieving %s: %+v", cfgId, err)
}

if cfg.Model != nil && cfg.Model.Properties != nil && cfg.Model.Properties.SoftDeleteFeatureState != nil {
Expand Down Expand Up @@ -632,6 +654,18 @@ func resourceRecoveryServicesVaultRead(d *pluginsdk.ResourceData, meta interface
d.Set("encryption", []interface{}{encryption})
}

vaultSettingsId := replicationvaultsetting.NewReplicationVaultSettingID(id.SubscriptionId, id.ResourceGroupName, id.VaultName, "default")
vaultSetting, err := vaultSettingsClient.Get(ctx, vaultSettingsId)
if err != nil {
return fmt.Errorf("reading Recovery Service Vault Setting %s: %+v", id.String(), err)
ziyeqf marked this conversation as resolved.
Show resolved Hide resolved
}

if vaultSetting.Model != nil && vaultSetting.Model.Properties != nil {
if v := vaultSetting.Model.Properties.VMwareToAzureProviderType; v != nil {
d.Set("classic_vmware_replication_enabled", strings.EqualFold(*v, "vmware"))
}
}

return tags.FlattenAndSet(d, model.Tags)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,22 @@ func TestAccRecoveryServicesVault_TogglePublicNetworkAccessEnabled(t *testing.T)
})
}

func TestAccRecoveryServicesVault_basicWithClassicVmwareReplicateEnabled(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_recovery_services_vault", "test")
r := RecoveryServicesVaultResource{}

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.basicWithClassicVmwareReplicateEnabled(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
check.That(data.ResourceName).Key("classic_vmware_replication_enabled").HasValue("true"),
),
},
data.ImportStep(),
})
}

func (RecoveryServicesVaultResource) basic(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
Expand Down Expand Up @@ -550,7 +566,7 @@ resource "azurerm_recovery_services_vault" "test" {
resource_group_name = azurerm_resource_group.test.name
sku = "Standard"

cross_region_restore_enabled = %v
cross_region_restore_enabled = %t

soft_delete_enabled = false
}
Expand Down Expand Up @@ -1270,3 +1286,25 @@ resource "azurerm_recovery_services_vault" "test" {
}
`, data.RandomInteger, data.Locations.Primary, data.RandomString, sku)
}

func (RecoveryServicesVaultResource) basicWithClassicVmwareReplicateEnabled(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
features {}
}

resource "azurerm_resource_group" "test" {
name = "acctestRG-recovery-%d"
location = "%s"
}

resource "azurerm_recovery_services_vault" "test" {
name = "acctest-Vault-%d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
sku = "Standard"
classic_vmware_replication_enabled = true
soft_delete_enabled = false
}
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger)
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading