diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 61b0b0ce..5de7336d 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -32,7 +32,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2 with: - python-version: "3.9" + python-version: "3.10" - name: Set up Terraform uses: hashicorp/setup-terraform@v1 diff --git a/.github/workflows/merge-pr.yml b/.github/workflows/merge-pr.yml index 05946e8d..a01eecd8 100644 --- a/.github/workflows/merge-pr.yml +++ b/.github/workflows/merge-pr.yml @@ -22,7 +22,7 @@ on: - closed env: - PYTHON_VERSION: 3.10 + PYTHON_VERSION: "3.10" jobs: if_merged: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5a8755e7..494aa6b5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -44,7 +44,7 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: 1.16 + go-version: "1.16" - name: "Update all module names" run: | diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 069f4c71..29d419c8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -28,7 +28,7 @@ on: env: GOOGLE_APPLICATION_CREDENTIALS: "/home/runner/credentials.json" PYTEST_ADDOPTS: "--color=yes" - PYTHON_VERSION: 3.9 + PYTHON_VERSION: "3.10" TF_PLUGIN_CACHE_DIR: "/home/runner/.terraform.d/plugin-cache" TF_VERSION: 1.1.8 diff --git a/CHANGELOG.md b/CHANGELOG.md index ec7ed294..be44306f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,6 +56,11 @@ All notable changes to this project will be documented in this file. ### MODULES +- [[#787](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/787)] Support manager role in cloud identity group module ([lcaggio](https://github.com/lcaggio)) +- [[#786](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/786)] Secret manager flag sensitive output ([ddaluka](https://github.com/ddaluka)) +- [[#775](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/775)] net-glb: Added support for regional external HTTP(s) load balancing ([rosmo](https://github.com/rosmo)) +- [[#784](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/784)] fix envoy-traffic-director config for xDS v3 ([drebes](https://github.com/drebes)) +- [[#785](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/785)] nginx-tls module ([drebes](https://github.com/drebes)) - [[#783](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/783)] fix service unit indent on cloud-config-container module ([drebes](https://github.com/drebes)) - [[#782](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/782)] typo fix (max_scale -> min_scale) ([skalolazka](https://github.com/skalolazka)) - [[#778](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/778)] **incompatible change:** instance_termination_action must be set for compute-vm spot instances ([sruffilli](https://github.com/sruffilli)) diff --git a/modules/cloud-identity-group/README.md b/modules/cloud-identity-group/README.md index 01c1289d..03c05407 100644 --- a/modules/cloud-identity-group/README.md +++ b/modules/cloud-identity-group/README.md @@ -7,11 +7,10 @@ To use this module you must either run terraform as a user that has the Groups A Please note that the underlying terraform resources only allow the creation of groups with members that are part of the organization. If you want to create memberships for identities outside your own organization, you have to manually allow members outside your organization in the Cloud Identity admin console. -As of version 3.50 of the GCP Terraform provider two operations are not working: +As of version 4.34 of the GCP Terraform provider one operation is not working: - removing a group that has at least one OWNER managed by terraform ([bug](https://github.com/hashicorp/terraform-provider-google/issues/7617)) -- removing a role from an existing membership ([bug](https://github.com/hashicorp/terraform-provider-google/issues/7616)) -Until those two bugs are fixed, this module will only support the creation of MEMBER memberships. +Until that bug is fixed, this module will only support the creation of MEMBER and MANAGER memberships. ## Examples @@ -31,6 +30,26 @@ module "group" { } # tftest modules=1 resources=4 ``` + +### Group with managers +```hcl +module "group" { + source = "./modules/cloud-identity-group" + customer_id = "customers/C01234567" + name = "mygroup2@example.com" + display_name = "My group name 2" + description = "My group 2 Description" + members = [ + "user1@example.com", + "user2@example.com", + "service-account@my-gcp-project.iam.gserviceaccount.com" + ] + managers = [ + "user3@example.com" + ] +} +# tftest modules=1 resources=5 +``` ## Variables @@ -39,9 +58,10 @@ module "group" { |---|---|:---:|:---:|:---:| | [customer_id](variables.tf#L17) | Directory customer ID in the form customers/C0xxxxxxx. | string | ✓ | | | [display_name](variables.tf#L32) | Group display name. | string | ✓ | | -| [name](variables.tf#L43) | Group ID (usually an email). | string | ✓ | | +| [name](variables.tf#L49) | Group ID (usually an email). | string | ✓ | | | [description](variables.tf#L26) | Group description. | string | | null | -| [members](variables.tf#L37) | List of group members. | list(string) | | [] | +| [managers](variables.tf#L37) | List of group managers. | list(string) | | [] | +| [members](variables.tf#L43) | List of group members. | list(string) | | [] | ## Outputs diff --git a/modules/cloud-identity-group/main.tf b/modules/cloud-identity-group/main.tf index 2bed4435..b71be55f 100644 --- a/modules/cloud-identity-group/main.tf +++ b/modules/cloud-identity-group/main.tf @@ -36,17 +36,18 @@ resource "google_cloud_identity_group" "group" { # roles { name = "MANAGER" } # } -# resource "google_cloud_identity_group_membership" "managers" { -# group = google_cloud_identity_group.group.id -# for_each = toset(var.managers) -# preferred_member_key { id = each.key } -# roles { name = "MEMBER" } -# roles { name = "MANAGER" } -# } +resource "google_cloud_identity_group_membership" "managers" { + group = google_cloud_identity_group.group.id + for_each = toset(var.managers) + preferred_member_key { id = each.key } + roles { name = "MEMBER" } + roles { name = "MANAGER" } +} resource "google_cloud_identity_group_membership" "members" { group = google_cloud_identity_group.group.id for_each = toset(var.members) preferred_member_key { id = each.key } roles { name = "MEMBER" } + depends_on = [google_cloud_identity_group_membership.managers] } diff --git a/modules/cloud-identity-group/variables.tf b/modules/cloud-identity-group/variables.tf index b9590537..221bcb84 100644 --- a/modules/cloud-identity-group/variables.tf +++ b/modules/cloud-identity-group/variables.tf @@ -34,6 +34,12 @@ variable "display_name" { type = string } +variable "managers" { + description = "List of group managers." + type = list(string) + default = [] +} + variable "members" { description = "List of group members." type = list(string) @@ -50,9 +56,3 @@ variable "name" { # type = list(string) # default = [] # } - -# variable "managers" { -# description = "List of group managers." -# type = list(string) -# default = [] -# } diff --git a/tests/modules/cloud_identity_group/fixture/main.tf b/tests/modules/cloud_identity_group/fixture/main.tf index a4058573..98a2a747 100644 --- a/tests/modules/cloud_identity_group/fixture/main.tf +++ b/tests/modules/cloud_identity_group/fixture/main.tf @@ -20,5 +20,6 @@ module "test" { display_name = var.display_name description = var.description customer_id = var.customer_id + managers = var.managers members = var.members } diff --git a/tests/modules/cloud_identity_group/fixture/variables.tf b/tests/modules/cloud_identity_group/fixture/variables.tf index 936282d8..c18b2497 100644 --- a/tests/modules/cloud_identity_group/fixture/variables.tf +++ b/tests/modules/cloud_identity_group/fixture/variables.tf @@ -34,6 +34,11 @@ variable "customer_id" { default = "customers/C01234567" } +variable "managers" { + type = list(string) + default = [] +} + variable "members" { type = list(string) default = []