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_automation_account: update encryption with user identity logic #24977

Merged
merged 2 commits into from
Feb 22, 2024
Merged

azurerm_automation_account: update encryption with user identity logic #24977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0636c6c
update automation account encryption with user identity
wuxu92 Feb 22, 2024
6f6e798
terrafmt
wuxu92 Feb 22, 2024
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
9 changes: 6 additions & 3 deletions internal/services/automation/automation_account_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,11 +388,14 @@ func expandEncryption(input []interface{}) (*automationaccount.EncryptionPropert
return nil, fmt.Errorf("read encryption user identity id error")
}
prop := &automationaccount.EncryptionProperties{
Identity: &automationaccount.EncryptionPropertiesIdentity{
UserAssignedIdentity: &id,
},
KeySource: pointer.To(automationaccount.EncryptionKeySourceTypeMicrosoftPointKeyvault),
}
if id != "" {
prop.Identity = &automationaccount.EncryptionPropertiesIdentity{
UserAssignedIdentity: &id,
}
}

if keyIdStr := v["key_vault_key_id"].(string); keyIdStr != "" {
keyId, err := keyVaultParse.ParseOptionallyVersionedNestedItemID(keyIdStr)
if err != nil {
Expand Down
172 changes: 120 additions & 52 deletions internal/services/automation/automation_account_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,31 @@ func TestAccAutomationAccount_encryption(t *testing.T) {

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.encryption(data),
Config: r.encryption_none(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
{
Config: r.encryption_basic(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
})
}

func TestAccAutomationAccount_encryptionWithUserIdentity(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_automation_account", "test")
r := AutomationAccountResource{}

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.encryption_userIdentity(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
check.That(data.ResourceName).Key("sku_name").HasValue("Basic"),
check.That(data.ResourceName).Key("local_authentication_enabled").HasValue("false"),
),
},
data.ImportStep(),
Expand Down Expand Up @@ -307,7 +327,7 @@ resource "azurerm_automation_account" "test" {
`, data.RandomInteger, data.Locations.Primary)
}

func (AutomationAccountResource) encryption(data acceptance.TestData) string {
func (AutomationAccountResource) encryption_template(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
features {
Expand All @@ -326,12 +346,6 @@ resource "azurerm_resource_group" "test" {
location = "%[2]s"
}

resource "azurerm_user_assigned_identity" "test" {
name = "acctestUAI-%[1]d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
}

resource "azurerm_key_vault" "test" {
name = "vault%[1]d"
location = azurerm_resource_group.test.location
Expand All @@ -340,45 +354,13 @@ resource "azurerm_key_vault" "test" {
sku_name = "standard"
soft_delete_retention_days = 7
purge_protection_enabled = true
enable_rbac_authorization = true
}

access_policy {
tenant_id = data.azurerm_client_config.current.tenant_id
object_id = data.azurerm_client_config.current.object_id

certificate_permissions = [
"ManageContacts",
]

key_permissions = [
"Create",
"Get",
"List",
"Delete",
"Purge",
"GetRotationPolicy",
]

secret_permissions = [
"Set",
]
}

access_policy {
tenant_id = azurerm_user_assigned_identity.test.tenant_id
object_id = azurerm_user_assigned_identity.test.principal_id

certificate_permissions = []

key_permissions = [
"Get",
"Recover",
"WrapKey",
"UnwrapKey",
"GetRotationPolicy",
]

secret_permissions = []
}
resource "azurerm_role_assignment" "current" {
scope = azurerm_key_vault.test.id
principal_id = data.azurerm_client_config.current.object_id
role_definition_name = "Key Vault Crypto Officer"
}

data "azurerm_key_vault" "test" {
Expand All @@ -400,10 +382,95 @@ resource "azurerm_key_vault_key" "test" {
"verify",
"wrapKey",
]

depends_on = [azurerm_role_assignment.current]

}
`, data.RandomInteger, data.Locations.Primary)
}

func (a AutomationAccountResource) encryption_none(data acceptance.TestData) string {

return fmt.Sprintf(`

%s

resource "azurerm_automation_account" "test" {
name = "acctest-%[1]d"
name = "acctest-%d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
sku_name = "Basic"

identity {
type = "SystemAssigned"
}

local_authentication_enabled = false
}

resource "azurerm_role_assignment" "test" {
scope = azurerm_key_vault_key.test.resource_versionless_id
principal_id = azurerm_automation_account.test.identity[0].principal_id
role_definition_name = "Key Vault Crypto Service Encryption User"
}
`, a.encryption_template(data), data.RandomInteger)
}

func (a AutomationAccountResource) encryption_basic(data acceptance.TestData) string {

return fmt.Sprintf(`


%s

resource "azurerm_role_assignment" "test" {
scope = azurerm_key_vault_key.test.resource_versionless_id
principal_id = azurerm_automation_account.test.identity[0].principal_id
role_definition_name = "Key Vault Crypto Service Encryption User"
}

resource "azurerm_automation_account" "test" {
name = "acctest-%d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
sku_name = "Basic"

identity {
type = "SystemAssigned"
}

encryption {
key_vault_key_id = azurerm_key_vault_key.test.id
}

local_authentication_enabled = false
}
`, a.encryption_template(data), data.RandomInteger)
}

func (a AutomationAccountResource) encryption_userIdentity(data acceptance.TestData) string {

return fmt.Sprintf(`




%s

resource "azurerm_user_assigned_identity" "test" {
name = "acctestUAI-%[2]d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
}

resource "azurerm_role_assignment" "test2" {
scope = azurerm_key_vault_key.test.resource_versionless_id
principal_id = azurerm_user_assigned_identity.test.principal_id
role_definition_name = "Key Vault Crypto Service Encryption User"
}

resource "azurerm_automation_account" "test" {
name = "acctest-%[2]d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
sku_name = "Basic"
Expand All @@ -415,14 +482,15 @@ resource "azurerm_automation_account" "test" {
]
}

local_authentication_enabled = false

encryption {
user_assigned_identity_id = azurerm_user_assigned_identity.test.id
key_vault_key_id = azurerm_key_vault_key.test.id
}

local_authentication_enabled = false
depends_on = [azurerm_role_assignment.test2]
}
`, data.RandomInteger, data.Locations.Primary)
`, a.encryption_template(data), data.RandomInteger)
}

func (AutomationAccountResource) userAssignedIdentity(data acceptance.TestData) string {
Expand Down
Loading