kovagoadi/hunfabric
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove iam_roles from service accounts, folder and organization modules

Browse Source
This commit is contained in:
Julio Castillo
2020-10-21 09:37:05 +02:00
parent 66942cc5c6
commit 85fda5b1fe
18 changed files with 15 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/modules/folders/fixture/main.tf
View File

@@ -19,7 +19,6 @@ module "test" {
parent = "organizations/12345678"
name = "folder-a"
iam_members = var.iam_members
iam_roles = var.iam_roles
policy_boolean = var.policy_boolean
policy_list = var.policy_list
}

5
tests/modules/folders/fixture/variables.tf
View File

@@ -19,11 +19,6 @@ variable "iam_members" {
default = {}
}
variable "iam_roles" {
type = list(string)
default = []
}
variable "policy_boolean" {
type = map(bool)
default = {}

13
tests/modules/folders/test_plan.py
View File

@@ -30,34 +30,22 @@ def test_folder(plan_runner):
assert resource['values']['parent'] == 'organizations/12345678'
def test_iam_roles_only(plan_runner):
"Test folder resources with only iam roles passed."
_, resources = plan_runner(FIXTURES_DIR,
iam_roles='["roles/owner"]')
assert len(resources) == 2
def test_iam(plan_runner):
"Test folder resources with iam roles and members."
iam_roles = '["roles/owner"]'
iam_members = '{"roles/owner" = ["user:a@b.com"] }'
_, resources = plan_runner(FIXTURES_DIR,
iam_roles=iam_roles,
iam_members=iam_members)
assert len(resources) == 2
def test_iam_multiple_members(plan_runner):
"Test folder resources with multiple iam members."
iam_roles = '["roles/owner"]'
iam_members = '{"roles/owner" = ["user:a@b.com", "user:c@d.com"] }'
_, resources = plan_runner(FIXTURES_DIR,
iam_roles=iam_roles,
iam_members=iam_members)
assert len(resources) == 2
def test_iam_multiple_roles(plan_runner):
"Test folder resources with multiple iam roles."
iam_roles = '["roles/owner", "roles/viewer"]'
iam_members = (
'{ '
'"roles/owner" = ["user:a@b.com"], '
@@ -65,6 +53,5 @@ def test_iam_multiple_roles(plan_runner):
'} '
)
_, resources = plan_runner(FIXTURES_DIR,
iam_roles=iam_roles,
iam_members=iam_members)
assert len(resources) == 3

1
tests/modules/iam_service_account/fixture/main.tf
View File

@@ -21,7 +21,6 @@ module "test" {
prefix = var.prefix
generate_key = var.generate_key
iam_members = var.iam_members
iam_roles = var.iam_roles
iam_billing_roles = var.iam_billing_roles
iam_folder_roles = var.iam_folder_roles
iam_organization_roles = var.iam_organization_roles

5
tests/modules/iam_service_account/fixture/variables.tf
View File

@@ -24,11 +24,6 @@ variable "iam_members" {
default = {}
}
variable "iam_roles" {
type = list(string)
default = []
}
variable "iam_billing_roles" {
type = map(list(string))
default = {}

1
tests/modules/iam_service_account/test_plan.py
View File

@@ -37,7 +37,6 @@ def test_resources(plan_runner):
def test_iam_roles(plan_runner):
"Test iam roles with one member."
variables = dict(
iam_roles='["roles/iam.serviceAccountUser"]',
iam_members=(
'{'
'"roles/iam.serviceAccountUser" = ["user:a@b.com"] '

17
tests/modules/organization/fixture/main.tf
View File

@@ -15,13 +15,12 @@
*/
module "test" {
source = "../../../../modules/organization"
org_id = 1234567890
custom_roles = var.custom_roles
iam_members = var.iam_members
iam_roles = var.iam_roles
iam_additive_bindings= var.iam_additive_bindings
iam_audit_config = var.iam_audit_config
policy_boolean = var.policy_boolean
policy_list = var.policy_list
source = "../../../../modules/organization"
org_id = 1234567890
custom_roles = var.custom_roles
iam_members = var.iam_members
iam_additive_bindings = var.iam_additive_bindings
iam_audit_config = var.iam_audit_config
policy_boolean = var.policy_boolean
policy_list = var.policy_list
}

6
tests/modules/organization/fixture/variables.tf
View File

@@ -24,17 +24,11 @@ variable "iam_members" {
default = {}
}
variable "iam_roles" {
type = list(string)
default = []
}
variable "iam_additive_bindings" {
type = map(list(string))
default = {}
}
variable "iam_audit_config" {
type = map(map(list(string)))
default = {}