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.

Sign up for GitHub

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_media_services_account: fix crash around key_delivery_access_control #20685

Merged
merged 5 commits into from
Mar 2, 2023
Merged

azurerm_media_services_account: fix crash around key_delivery_access_control #20685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6a84136
`azurerm_media_services_account`: crash #20645 fix
ziyeqf Feb 28, 2023
8c8a5d6
force update to trigger ci
ziyeqf Feb 28, 2023
511f391
update per comment
ziyeqf Mar 2, 2023
c23a94d
Update media_services_account_resource.go
mbfrahry Mar 2, 2023
98a7f5c
Update media_services_account_resource.go
mbfrahry Mar 2, 2023
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
2 changes: 1 addition & 1 deletion internal/services/media/media_services_account_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ func flattenMediaServicesAccountIdentity(input *accounts.MediaServiceIdentity) (
}

func expandMediaServicesAccountKeyDelivery(input []interface{}) *accounts.KeyDelivery {
if len(input) == 0 {
if len(input) == 0 || input[0] == nil {
return nil
}

Expand Down
2 changes: 1 addition & 1 deletion internal/services/media/media_services_account_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ resource "azurerm_key_vault_access_policy" "client" {
key_vault_id = azurerm_key_vault.test.id
tenant_id = data.azurerm_client_config.current.tenant_id
object_id = data.azurerm_client_config.current.object_id
key_permissions = ["Get", "Create", "Delete", "List", "Restore", "Recover", "UnwrapKey", "WrapKey", "Purge", "Encrypt", "Decrypt", "Sign", "Verify"]
key_permissions = ["Get", "Create", "Delete", "List", "Restore", "Recover", "UnwrapKey", "WrapKey", "Purge", "Encrypt", "Decrypt", "Sign", "Verify", "GetRotationPolicy"]
secret_permissions = ["Get"]
}

Expand Down