provider - support for the `recover_soft_deleted_backup_protected_vm` feature #24157

ziyeqf · 2023-12-08T03:25:58Z

features expand

❯ go test -v ./internal/provider/ -run=TestExpand                      
=== RUN   TestExpandFeatures
    features_test.go:364: [DEBUG] Test Case: "Empty Block"
    features_test.go:364: [DEBUG] Test Case: "Complete Enabled"
    features_test.go:364: [DEBUG] Test Case: "Complete Disabled"
--- PASS: TestExpandFeatures (0.00s)
=== RUN   TestExpandFeaturesApiManagement
    features_test.go:434: [DEBUG] Test Case: "Empty Block"
    features_test.go:434: [DEBUG] Test Case: "Purge Soft Delete On Destroy and Recover Soft Deleted Api Management Enabled"
    features_test.go:434: [DEBUG] Test Case: "Purge Soft Delete On Destroy and Recover Soft Deleted Api Management Disabled"
--- PASS: TestExpandFeaturesApiManagement (0.00s)
=== RUN   TestExpandFeaturesAppConfiguration
    features_test.go:504: [DEBUG] Test Case: "Empty Block"
    features_test.go:504: [DEBUG] Test Case: "Purge Soft Delete On Destroy and Recover Soft Deleted App Configuration Enabled"
    features_test.go:504: [DEBUG] Test Case: "Purge Soft Delete On Destroy and Recover Soft Deleted App Configuration Disabled"
--- PASS: TestExpandFeaturesAppConfiguration (0.00s)
=== RUN   TestExpandFeaturesApplicationInsights
    features_test.go:569: [DEBUG] Test Case: "Empty Block"
    features_test.go:569: [DEBUG] Test Case: "Disable Generated Rule"
    features_test.go:569: [DEBUG] Test Case: "Enable Generated Rule"
--- PASS: TestExpandFeaturesApplicationInsights (0.00s)
=== RUN   TestExpandFeaturesCognitiveServices
    features_test.go:634: [DEBUG] Test Case: "Empty Block"
    features_test.go:634: [DEBUG] Test Case: "Purge on Destroy Enabled"
    features_test.go:634: [DEBUG] Test Case: "Purge on Destroy Disabled"
--- PASS: TestExpandFeaturesCognitiveServices (0.00s)
=== RUN   TestExpandFeaturesKeyVault
    features_test.go:739: [DEBUG] Test Case: "Empty Block"
    features_test.go:739: [DEBUG] Test Case: "Purge Soft Delete On Destroy and Recover Soft Deleted Key Vaults Enabled"
    features_test.go:739: [DEBUG] Test Case: "Purge Soft Delete On Destroy and Recover Soft Deleted Key Vaults Disabled"
--- PASS: TestExpandFeaturesKeyVault (0.00s)
=== RUN   TestExpandFeaturesTemplateDeployment
    features_test.go:804: [DEBUG] Test Case: "Empty Block"
    features_test.go:804: [DEBUG] Test Case: "Delete Nested Items During Deletion Enabled"
    features_test.go:804: [DEBUG] Test Case: "Delete Nested Items During Deletion Disabled"
--- PASS: TestExpandFeaturesTemplateDeployment (0.00s)
=== RUN   TestExpandFeaturesVirtualMachine
    features_test.go:922: [DEBUG] Test Case: "Empty Block"
    features_test.go:922: [DEBUG] Test Case: "Delete OS Disk Enabled"
    features_test.go:922: [DEBUG] Test Case: "Graceful Shutdown Enabled"
    features_test.go:922: [DEBUG] Test Case: "Skip Shutdown and Force Delete Enabled"
    features_test.go:922: [DEBUG] Test Case: "All Disabled"
--- PASS: TestExpandFeaturesVirtualMachine (0.00s)
=== RUN   TestExpandFeaturesVirtualMachineScaleSet
    features_test.go:1036: [DEBUG] Test Case: "Empty Block"
    features_test.go:1036: [DEBUG] Test Case: "Force Delete Enabled"
    features_test.go:1036: [DEBUG] Test Case: "Roll Instances Enabled"
    features_test.go:1036: [DEBUG] Test Case: "Scale In On Delete Disabled"
    features_test.go:1036: [DEBUG] Test Case: "All Fields Disabled"
--- PASS: TestExpandFeaturesVirtualMachineScaleSet (0.00s)
=== RUN   TestExpandFeaturesLogAnalyticsWorkspace
    features_test.go:1100: [DEBUG] Test Case: "Empty Block"
    features_test.go:1100: [DEBUG] Test Case: "Permanent Delete Enabled"
    features_test.go:1100: [DEBUG] Test Case: "Permanent Delete Disabled"
--- PASS: TestExpandFeaturesLogAnalyticsWorkspace (0.00s)
=== RUN   TestExpandFeaturesResourceGroup
    features_test.go:1165: [DEBUG] Test Case: "Empty Block"
    features_test.go:1165: [DEBUG] Test Case: "Prevent Deletion If Contains Resources Enabled"
    features_test.go:1165: [DEBUG] Test Case: "Prevent Deletion If Contains Resources Disabled"
--- PASS: TestExpandFeaturesResourceGroup (0.00s)
=== RUN   TestExpandFeaturesRecoveryServicesVault
    features_test.go:1230: [DEBUG] Test Case: "Empty Block"
    features_test.go:1230: [DEBUG] Test Case: "Purge Soft Delete On Destroy and Recover Soft Deleted Protected VM Enabled"
    features_test.go:1230: [DEBUG] Test Case: "Purge Soft Delete On Destroy and Recover Soft Deleted Protected VM Disabled"
--- PASS: TestExpandFeaturesRecoveryServicesVault (0.00s)
=== RUN   TestExpandFeaturesManagedDisk
    features_test.go:1295: [DEBUG] Test Case: "Empty Block"
    features_test.go:1295: [DEBUG] Test Case: "No Downtime Resize Enabled"
    features_test.go:1295: [DEBUG] Test Case: "No Downtime Resize Disabled"
--- PASS: TestExpandFeaturesManagedDisk (0.00s)
=== RUN   TestExpandFeaturesSubscription
    features_test.go:1343: [DEBUG] Test Case: "Empty Block"
    features_test.go:1343: [DEBUG] Test Case: "No Downtime Resize Enabled"
--- PASS: TestExpandFeaturesSubscription (0.00s)
PASS
ok  	github.com/hashicorp/terraform-provider-azurerm/internal/provider

magodo

Thanks for this PR!
I've taken a look through and left some comments inline, but this is mostly looking good to me 👍

internal/features/user_flags.go

internal/provider/features_test.go

internal/services/recoveryservices/backup_protected_vm_resource.go

internal/services/recoveryservices/backup_protected_vm_resource_test.go

ziyeqf · 2023-12-11T07:51:21Z

internal/provider/provider.go

internal/services/recoveryservices/backup_protected_vm_resource.go

magodo

LGTM now!

katbyte · 2024-02-16T02:28:10Z

internal/provider/features.go

@@ -255,6 +255,21 @@ func schemaFeatures(supportLegacyTestSuite bool) *pluginsdk.Schema {
 			},
 		},

+		"recovery_services_vault": {


this should be plural

Suggested change

"recovery_services_vault": {

"recovery_services_vaults": {

katbyte

We have a bunch of test failures:

can we please fix up all tests?

ziyeqf · 2024-02-22T06:52:41Z

The service seems to have a new issue (Azure/azure-rest-api-specs#27869) and needs workaround on #24978

katbyte

#24978 has been merged but i am still seeing test failures

ziyeqf · 2024-03-22T03:24:37Z

#24978 has been merged but i am still seeing test failures

Code updated and the tests pass now. I removed the change on site_recovery_xxx files, as it should not be involved.

katbyte

the tests for this also still seem quite flakey?

katbyte · 2024-04-18T16:16:57Z

website/docs/guides/features-block.html.markdown

@@ -199,6 +205,12 @@ The `resource_group` block supports the following:

 ---

+The `recovery_services_vault` block supports the following:
+
+* `recover_soft_deleted_backup_protected_vm` - (Optional) Should the `azurerm_backup_protected_vm` resource recover a Soft-Deleted protected VM? Defaults to `true`.


I think this should default to false?

katbyte · 2024-04-18T16:17:34Z

internal/provider/features.go

+					"recover_soft_deleted_backup_protected_vm": {
+						Type:     pluginsdk.TypeBool,
+						Optional: true,
+						Default:  true,


this is going to change the existing behaviour?

Suggested change

Default: true,

Default: false,

ziyeqf · 2024-04-19T02:25:58Z

recover_soft_deleted_backup_protected_vm

TBH these tests on main branch are also flakey..

katbyte

This doesn't seem to be a flakey test failure:

------- Stdout: -------
=== RUN   TestAccBackupProtectedVm_updateBackupPolicyId
=== PAUSE TestAccBackupProtectedVm_updateBackupPolicyId
=== CONT  TestAccBackupProtectedVm_updateBackupPolicyId
    testcase.go:113: Step 1/5 error: Error running pre-apply refresh: exit status 1
        
        Error: Duplicate provider configuration
        
          on terraform_plugin_test.tf line 26:
          26: provider "azurerm" {
        
        A default (non-aliased) provider configuration for "azurerm" was already
        given at terraform_plugin_test.tf:21,1-19. If multiple configurations are
        required, set the "alias" argument for alternative configurations.
    testing_new.go:79: Error retrieving state, there may be dangling resources: exit status 1
        
        Error: Duplicate provider configuration
        
          on terraform_plugin_test.tf line 26:
          26: provider "azurerm" {
        
        A default (non-aliased) provider configuration for "azurerm" was already
        given at terraform_plugin_test.tf:21,1-19. If multiple configurations are
        required, set the "alias" argument for alternative configurations.
--- FAIL: TestAccBackupProtectedVm_updateBackupPolicyId (5.44s)
FAIL

Should be good to merge once the test is fixed

ziyeqf · 2024-05-07T06:00:06Z

uh...my fault. updated

❯❯ tftest recoveryservices TestAccBackupProtectedVm_updateBackupPolicyId
=== RUN   TestAccBackupProtectedVm_updateBackupPolicyId
=== PAUSE TestAccBackupProtectedVm_updateBackupPolicyId
=== CONT  TestAccBackupProtectedVm_updateBackupPolicyId
--- PASS: TestAccBackupProtectedVm_updateBackupPolicyId (877.88s)
PASS
ok      github.com/hashicorp/terraform-provider-azurerm/internal/services/recoveryservices      879.994s

katbyte

LGTM 📨

github-actions · 2024-06-09T02:09:26Z

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

github-actions bot added documentation service/recovery-services size/XL waiting-response and removed waiting-response labels Dec 8, 2023

azurerm_backup_protected_vm - support recover soft deleted vm

ad0e160

ziyeqf force-pushed the tengzh/recovery/soft_deleted_recover branch from ad42736 to ad0e160 Compare December 8, 2023 07:50

github-actions bot removed the waiting-response label Dec 8, 2023

update test case

1176de9

magodo requested changes Dec 8, 2023

View reviewed changes

github-actions bot added the waiting-response label Dec 8, 2023

update per comment

ef91282

github-actions bot removed the waiting-response label Dec 11, 2023

ziyeqf requested a review from magodo December 11, 2023 08:32

magodo requested changes Dec 11, 2023

View reviewed changes

internal/provider/provider.go Outdated Show resolved Hide resolved

internal/services/recoveryservices/backup_protected_vm_resource.go Outdated Show resolved Hide resolved

internal/services/recoveryservices/backup_protected_vm_resource.go Show resolved Hide resolved

github-actions bot added the waiting-response label Dec 11, 2023

update per comments

e8c66fe

github-actions bot removed the waiting-response label Dec 11, 2023

ziyeqf requested a review from magodo December 11, 2023 10:31

magodo marked this pull request as ready for review December 12, 2023 01:57

magodo reviewed Dec 12, 2023

View reviewed changes

github-actions bot added waiting-response and removed waiting-response labels Dec 12, 2023

katbyte requested changes Feb 16, 2024

View reviewed changes

ziyeqf added 2 commits February 18, 2024 13:08

update per comment

72f5f7f

Merge branch 'main' into tengzh/recovery/soft_deleted_recover

d2c6303

github-actions bot added the waiting-response label Feb 18, 2024

format code

628d288

katbyte requested changes Feb 20, 2024

View reviewed changes

github-actions bot added the waiting-response label Feb 20, 2024

update test case

af7da92

github-actions bot removed the waiting-response label Feb 20, 2024

katbyte requested changes Mar 21, 2024

View reviewed changes

github-actions bot added the waiting-response label Mar 21, 2024

Merge branch 'main' into tengzh/recovery/soft_deleted_recover

a574a8a

github-actions bot removed the waiting-response label Mar 22, 2024

revert site recovery test file

753b2a2

katbyte requested changes Apr 18, 2024

View reviewed changes

katbyte added the waiting-response label Apr 18, 2024

recover_soft_deleted_backup_protected_vm defaults to false

532986a

github-actions bot removed the waiting-response label Apr 19, 2024

Merge branch 'main' into tengzh/recovery/soft_deleted_recover

417ac3b

katbyte added waiting-response and removed waiting-response labels May 6, 2024

katbyte approved these changes May 6, 2024

View reviewed changes

fix test

16cefaf

katbyte changed the title ~~azurerm_backup_protected_vm - support recover soft deleted vm~~ provider - support for the recover_soft_deleted_backup_protected_vm feature May 9, 2024

katbyte approved these changes May 9, 2024

View reviewed changes

katbyte merged commit d6cf769 into hashicorp:main May 9, 2024
33 checks passed

katbyte added a commit that referenced this pull request May 9, 2024

Update CHANGELOG.md #24157

97e6dd2

github-actions bot added this to the v3.103.0 milestone May 9, 2024

ziyeqf deleted the tengzh/recovery/soft_deleted_recover branch May 10, 2024 01:45

github-actions bot locked as resolved and limited conversation to collaborators Jun 9, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

provider - support for the `recover_soft_deleted_backup_protected_vm` feature #24157

provider - support for the `recover_soft_deleted_backup_protected_vm` feature #24157

ziyeqf commented Dec 8, 2023 •

edited

Loading

magodo left a comment

ziyeqf commented Dec 11, 2023 •

edited

Loading

magodo left a comment

katbyte Feb 16, 2024

katbyte left a comment

ziyeqf commented Feb 22, 2024 •

edited

Loading

katbyte left a comment

ziyeqf commented Mar 22, 2024

katbyte left a comment

katbyte Apr 18, 2024

katbyte Apr 18, 2024

ziyeqf commented Apr 19, 2024

katbyte left a comment

ziyeqf commented May 7, 2024

katbyte left a comment

github-actions bot commented Jun 9, 2024

provider - support for the recover_soft_deleted_backup_protected_vm feature #24157

provider - support for the recover_soft_deleted_backup_protected_vm feature #24157

Conversation

ziyeqf commented Dec 8, 2023 • edited Loading

features expand

magodo left a comment

Choose a reason for hiding this comment

ziyeqf commented Dec 11, 2023 • edited Loading

magodo left a comment

Choose a reason for hiding this comment

katbyte Feb 16, 2024

Choose a reason for hiding this comment

katbyte left a comment

Choose a reason for hiding this comment

ziyeqf commented Feb 22, 2024 • edited Loading

katbyte left a comment

Choose a reason for hiding this comment

ziyeqf commented Mar 22, 2024

katbyte left a comment

Choose a reason for hiding this comment

katbyte Apr 18, 2024

Choose a reason for hiding this comment

katbyte Apr 18, 2024

Choose a reason for hiding this comment

ziyeqf commented Apr 19, 2024

katbyte left a comment

Choose a reason for hiding this comment

ziyeqf commented May 7, 2024

katbyte left a comment

Choose a reason for hiding this comment

github-actions bot commented Jun 9, 2024

provider - support for the `recover_soft_deleted_backup_protected_vm` feature #24157

provider - support for the `recover_soft_deleted_backup_protected_vm` feature #24157

ziyeqf commented Dec 8, 2023 •

edited

Loading

ziyeqf commented Dec 11, 2023 •

edited

Loading

ziyeqf commented Feb 22, 2024 •

edited

Loading