Skip to content

Replace IAM module with IAM member resources #22

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

Merged
merged 2 commits into from
Nov 13, 2019
Merged

Replace IAM module with IAM member resources #22

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
9eb4221
Replace IAM module with IAM member resources
Nov 12, 2019
8c6d9a5
Add entry for 1.1.1 to CHANGELOG
Nov 12, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning][semver-site].

## [Unreleased]

## [1.1.1] - 2019-11-12

### Fixed

- The IAM module was replaced with IAM member resources to support dynamic members in additive mode. [#22]

## [1.1.0] - 2019-11-11

### Changed
Expand Down Expand Up @@ -53,7 +59,8 @@ and this project adheres to [Semantic Versioning][semver-site].

- Initial release

[Unreleased]: https://github.com/terraform-google-modules/terraform-google-scheduled-function/compare/v1.1.0...HEAD
[Unreleased]: https://github.com/terraform-google-modules/terraform-google-scheduled-function/compare/v1.1.1...HEAD
[1.1.1]: https://github.com/terraform-google-modules/terraform-google-scheduled-function/compare/v1.1.0...v1.1.1
[1.1.0]: https://github.com/terraform-google-modules/terraform-google-scheduled-function/compare/v1.0.0...v1.1.0
[1.0.0]: https://github.com/terraform-google-modules/terraform-google-scheduled-function/compare/v0.4.1...v1.0.0
[0.4.1]: https://github.com/terraform-google-modules/terraform-google-scheduled-function/compare/v0.4.0...v0.4.1
Expand All @@ -62,6 +69,7 @@ and this project adheres to [Semantic Versioning][semver-site].
[0.2.0]: https://github.com/terraform-google-modules/terraform-google-scheduled-function/compare/v0.1.0...v0.2.0
[0.1.0]: https://github.com/terraform-google-modules/terraform-google-scheduled-function/releases/tag/v0.1.0

[#22]: https://github.com/terraform-google-modules/terraform-google-scheduled-function/pull/22
[#21]: https://github.com/terraform-google-modules/terraform-google-scheduled-function/pull/21
[#20]: https://github.com/terraform-google-modules/terraform-google-scheduled-function/pull/20
[#13]: https://github.com/terraform-google-modules/terraform-google-scheduled-function/pull/13
Expand Down
17 changes: 6 additions & 11 deletions modules/project_cleanup/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,16 @@ resource "google_service_account" "project_cleaner_function" {
display_name = "Project Cleaner Function"
}

module "sa-organization-roles" {
source = "terraform-google-modules/iam/google//modules/organizations_iam"
version = "4.0.0"
organizations = [var.organization_id]
mode = "additive"
resource "google_organization_iam_member" "main" {
for_each = toset(["projectDeleter", "folderViewer", "lienModifier"])

bindings = {
"roles/resourcemanager.projectDeleter" = ["serviceAccount:${google_service_account.project_cleaner_function.email}"]
"roles/resourcemanager.folderViewer" = ["serviceAccount:${google_service_account.project_cleaner_function.email}"]
"roles/resourcemanager.lienModifier" = ["serviceAccount:${google_service_account.project_cleaner_function.email}"]
}
member = "serviceAccount:${google_service_account.project_cleaner_function.email}"
org_id = var.organization_id
role = "roles/resourcemanager.${each.value}"
}

module "scheduled_project_cleaner" {
source = "../../"
source = "../.."
project_id = var.project_id
job_name = "project-cleaner"
job_schedule = var.job_schedule
Expand Down