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_fluid_relay_server - fix versionless_id support for key_vault_key_id #28864

Merged
merged 3 commits into from
Feb 25, 2025

Conversation

jackofallops
Copy link
Member

  • azurerm_fluid_relay_server - fix versionless_id support for key_vault_key_id

This is a (please select all that apply):

  • Bug Fix
  • New Feature (ie adding a service, resource, or data source)
  • Enhancement
  • Breaking Change

@jackofallops
Copy link
Member Author

Tests all good:
image

Comment on lines 430 to 472
func (f FluidRelayResource) customerManagedKeyVersionless(data acceptance.TestData) string {
return fmt.Sprintf(`


%[1]s

resource "azurerm_fluid_relay_server" "test" {
name = "acctestRG-fuildRelayServer-%[2]d"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
identity {
type = "UserAssigned"
identity_ids = [azurerm_user_assigned_identity.test.id]
}
customer_managed_key {
key_vault_key_id = azurerm_key_vault_key.test.versionless_id
user_assigned_identity_id = azurerm_user_assigned_identity.test.id
}
}
`, f.templateWithCMK(data), data.RandomInteger, data.Locations.Primary)
}

func (f FluidRelayResource) customerManagedKeyVersionlessUpdated(data acceptance.TestData) string {
return fmt.Sprintf(`


%[1]s

resource "azurerm_fluid_relay_server" "test" {
name = "acctestRG-fuildRelayServer-%[2]d"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
identity {
type = "UserAssigned"
identity_ids = [azurerm_user_assigned_identity.test.id]
}
customer_managed_key {
key_vault_key_id = azurerm_key_vault_key.test.versionless_id
user_assigned_identity_id = azurerm_user_assigned_identity.test.id
}
}
`, f.templateWithCMK(data), data.RandomInteger, data.Locations.Primary)
}
Copy link
Member

Choose a reason for hiding this comment

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

I'm having trouble spotting the difference between these two test configs

Copy link
Member Author

Choose a reason for hiding this comment

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

🙈

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed, and re-run:

image

Copy link
Member

@stephybun stephybun left a comment

Choose a reason for hiding this comment

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

Thanks @jackofallops LGTM 🐳

@jackofallops jackofallops merged commit 58c8deb into main Feb 25, 2025
31 checks passed
@jackofallops jackofallops deleted the b/fluid-relay-support-versionless-keyvault-id branch February 25, 2025 10:12
@github-actions github-actions bot added this to the v4.21.0 milestone Feb 25, 2025
jackofallops added a commit that referenced this pull request Feb 25, 2025
jackofallops added a commit that referenced this pull request Feb 27, 2025
* Update CHANGELOG.md for #28840

* Update CHANGELOG.md #28808

* Update CHANGELOG.md #27962

* Update CHANGELOG.md for #28859

* Update for #28825

* Update CHANGELOG.md for #28864

* Update CHANGELOG.md #28539

* Update CHANGELOG.md #28685

* Update CHANGELOG.md for #28818

* Update for #28857 #28799 #28856

* Update for #28122

* Update for #28248 #27805

* Update for #28853

* Update for #28316 #28494 #28696

* Update for #28754

* Update CHANGELOG.md #28771

* Update CHANGELOG.md #28842

* Update for #28879

* Update for #28199

* Update CHANGELOG.md #28862

* prep for release v4.21.0

---------

Co-authored-by: sreallymatt <[email protected]>
Co-authored-by: Wodans Son <[email protected]>
Co-authored-by: stephybun <[email protected]>
Co-authored-by: catriona-m <[email protected]>
Co-authored-by: Matthew Frahry <[email protected]>
Co-authored-by: Wyatt Fry <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants