Skip to content

Commit adadee1

Browse files
authored
Merge pull request #40 from meshcloud/feature/remove-perm-keyvault
chore: remove user permissions from key-vault
2 parents fa1ac39 + fddd6e1 commit adadee1

File tree

3 files changed

+0
-49
lines changed

3 files changed

+0
-49
lines changed

modules/azure/key-vault/buildingblock/README.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,8 @@ provider "azurerm" {
3838
| Name | Version |
3939
|------|---------|
4040
| <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) | 3.1.0 |
41-
| <a name="requirement_azuread"></a> [azuread](#requirement\_azuread) | 3.1.0 |
42-
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | 4.18.0 |
4341
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | 4.18.0 |
4442
| <a name="requirement_random"></a> [random](#requirement\_random) | 3.6.3 |
45-
| <a name="requirement_random"></a> [random](#requirement\_random) | 3.6.3 |
4643

4744
## Modules
4845

@@ -54,11 +51,8 @@ No modules.
5451
|------|------|
5552
| [azurerm_key_vault.key_vault](https://registry.terraform.io/providers/hashicorp/azurerm/4.18.0/docs/resources/key_vault) | resource |
5653
| [azurerm_resource_group.key_vault](https://registry.terraform.io/providers/hashicorp/azurerm/4.18.0/docs/resources/resource_group) | resource |
57-
| [azurerm_role_assignment.cloudfoundation_tfdeploy](https://registry.terraform.io/providers/hashicorp/azurerm/4.18.0/docs/resources/role_assignment) | resource |
5854
| [random_string.resource_code](https://registry.terraform.io/providers/hashicorp/random/3.6.3/docs/resources/string) | resource |
59-
| [azuread_user.users](https://registry.terraform.io/providers/hashicorp/azuread/3.1.0/docs/data-sources/user) | data source |
6055
| [azurerm_client_config.current](https://registry.terraform.io/providers/hashicorp/azurerm/4.18.0/docs/data-sources/client_config) | data source |
61-
| [azurerm_role_definition.keyvault](https://registry.terraform.io/providers/hashicorp/azurerm/4.18.0/docs/data-sources/role_definition) | data source |
6256
| [azurerm_subscription.current](https://registry.terraform.io/providers/hashicorp/azurerm/4.18.0/docs/data-sources/subscription) | data source |
6357

6458
## Inputs
@@ -69,8 +63,6 @@ No modules.
6963
| <a name="input_key_vault_resource_group_name"></a> [key\_vault\_resource\_group\_name](#input\_key\_vault\_resource\_group\_name) | The name of the resource group containing the key vault. | `string` | n/a | yes |
7064
| <a name="input_location"></a> [location](#input\_location) | The location/region where the key vault is created. | `string` | n/a | yes |
7165
| <a name="input_public_network_access_enabled"></a> [public\_network\_access\_enabled](#input\_public\_network\_access\_enabled) | n/a | `bool` | `false` | no |
72-
| <a name="input_subscription_id"></a> [subscription\_id](#input\_subscription\_id) | n/a | `string` | n/a | yes |
73-
| <a name="input_users"></a> [users](#input\_users) | Users and their roles provided by meshStack (Note that users must exist in stackit) | <pre>list(object(<br> {<br> meshIdentifier = string<br> username = string<br> firstName = string<br> lastName = string<br> email = string<br> euid = string<br> roles = list(string)<br> }<br> ))</pre> | n/a | yes |
7466

7567
## Outputs
7668

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
locals {
2-
admins = { for user in var.users : user.username => user if contains(user["roles"], "admin") }
3-
editors = { for user in var.users : user.username => user if contains(user["roles"], "user") }
4-
readers = { for user in var.users : user.username => user if contains(user["roles"], "reader") }
5-
}
6-
71
data "azurerm_subscription" "current" {}
82

93
data "azurerm_client_config" "current" {}
@@ -14,11 +8,6 @@ resource "random_string" "resource_code" {
148
upper = false
159
}
1610

17-
data "azuread_user" "users" {
18-
for_each = merge(local.admins, local.readers)
19-
mail = each.value.username
20-
}
21-
2211
resource "azurerm_resource_group" "key_vault" {
2312
name = var.key_vault_resource_group_name
2413
location = var.location
@@ -35,14 +24,3 @@ resource "azurerm_key_vault" "key_vault" {
3524
enable_rbac_authorization = true
3625
public_network_access_enabled = var.public_network_access_enabled
3726
}
38-
39-
data "azurerm_role_definition" "keyvault" {
40-
name = "Key Vault Administrator"
41-
}
42-
43-
resource "azurerm_role_assignment" "cloudfoundation_tfdeploy" {
44-
for_each = data.azuread_user.users
45-
principal_id = each.value.object_id
46-
scope = azurerm_key_vault.key_vault.id
47-
role_definition_name = data.azurerm_role_definition.keyvault.name
48-
}

modules/azure/key-vault/buildingblock/variables.tf

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,6 @@ variable "location" {
1515
description = "The location/region where the key vault is created."
1616
}
1717

18-
variable "subscription_id" {
19-
type = string
20-
}
21-
22-
variable "users" {
23-
type = list(object(
24-
{
25-
meshIdentifier = string
26-
username = string
27-
firstName = string
28-
lastName = string
29-
email = string
30-
euid = string
31-
roles = list(string)
32-
}
33-
))
34-
description = "Users and their roles provided by meshStack (Note that users must exist in stackit)"
35-
}
36-
3718
variable "public_network_access_enabled" {
3819
type = bool
3920
default = false

0 commit comments

Comments
 (0)