Skip to content

Update backup.tf#4973

Merged
rudolphjacksonm merged 4 commits into
mainfrom
bug/4967-remove-sfdelete-base
Jul 15, 2026
Merged

Update backup.tf#4973
rudolphjacksonm merged 4 commits into
mainfrom
bug/4967-remove-sfdelete-base

Conversation

@rudolphjacksonm

@rudolphjacksonm rudolphjacksonm commented Jul 14, 2026

Copy link
Copy Markdown
Collaborator

Resolves #4967

What is being addressed

Updated base template to remove soft_delete = enabled from the azurerm_recovery_services_vault resource as this is no longer a setting which can be configured and is enabled by default on resource creation.

How is this addressed

  • Removed the deprecated soft_delete_enabled property from the azurerm_recovery_services_vault resource in templates/workspaces/base/terraform/backup/backup.tf
  • Updated CHANGELOG.md with a BUG FIXES entry referencing #4967
  • Bumped base workspace template version from 2.8.3 to 2.8.4 in porter.yaml

@github-actions

github-actions Bot commented Jul 14, 2026

Copy link
Copy Markdown

Unit Test Results

0 tests   0 ✅  0s ⏱️
0 suites  0 💤
0 files    0 ❌

Results for commit 55c95e0.

♻️ This comment has been updated with latest results.

@rudolphjacksonm

Copy link
Copy Markdown
Collaborator Author

@copilot update changelog and bump template version number

Copilot AI commented Jul 15, 2026

Copy link
Copy Markdown
Contributor

@copilot update changelog and bump template version number

Done — added a BUG FIXES entry to CHANGELOG.md for #4967 and bumped the base workspace template version from 2.8.3 to 2.8.4 in porter.yaml.

@rudolphjacksonm rudolphjacksonm marked this pull request as ready for review July 15, 2026 14:39
@rudolphjacksonm rudolphjacksonm requested a review from a team as a code owner July 15, 2026 14:39
Copilot AI review requested due to automatic review settings July 15, 2026 14:39

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR updates the Azure TRE base workspace template to stop explicitly disabling Recovery Services Vault soft delete, aligning with current Azure behavior (soft delete enabled by default and not allowed to be disabled), and preventing workspace creation failures like the one reported in #4967.

Changes:

  • Removed soft_delete_enabled = false from the base workspace azurerm_recovery_services_vault definition.
  • Bumped the base workspace template version from 2.8.3 → 2.8.4.
  • Added a corresponding BUG FIXES entry to CHANGELOG.md referencing #4967.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

File Description
templates/workspaces/base/terraform/backup/backup.tf Removes the explicit soft delete disable setting to avoid Azure API failures.
templates/workspaces/base/porter.yaml Bumps the base workspace bundle version to reflect the template change.
CHANGELOG.md Documents the fix under Unreleased BUG FIXES with a link to #4967.

@rudolphjacksonm

Copy link
Copy Markdown
Collaborator Author

/test-force-approve

@github-actions

Copy link
Copy Markdown

🤖 pr-bot 🤖

✅ Marking tests as complete (for commit 55c95e0)

(in response to this comment from @rudolphjacksonm)

@rudolphjacksonm rudolphjacksonm merged commit 85b3135 into main Jul 15, 2026
14 checks passed
@rudolphjacksonm rudolphjacksonm deleted the bug/4967-remove-sfdelete-base branch July 15, 2026 19:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Error creating Airlock Import Workspace

5 participants