-
Notifications
You must be signed in to change notification settings - Fork 910
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added iam_bindings and iam_bindings_additive to apigee module
- Loading branch information
Showing
6 changed files
with
129 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,6 +15,7 @@ This module simplifies the creation of a Apigee resources (organization, environ | |
| - [New environment](#new-environment) | ||
| - [New instance (VPC Peering Provisioning Mode)](#new-instance-vpc-peering-provisioning-mode) | ||
| - [New instance (Non VPC Peering Provisioning Mode)](#new-instance-non-vpc-peering-provisioning-mode) | ||
| - [IAM](#iam) | ||
| - [New endpoint attachment](#new-endpoint-attachment) | ||
| - [Apigee add-ons](#apigee-add-ons) | ||
| - [Variables](#variables) | ||
|
|
@@ -87,7 +88,6 @@ module "apigee" { | |
|
|
||
| When a new Apigee organization is created, it is automatically peered to the authorized network. You can prevent this from happening by using the `disable_vpc_peering` key in the `organization` variable, as shown below: | ||
|
|
||
|
|
||
| ```hcl | ||
| module "apigee" { | ||
| source = "./fabric/modules/apigee" | ||
|
|
@@ -117,7 +117,6 @@ module "apigee" { | |
| # tftest modules=1 resources=6 inventory=no-peering.yaml | ||
| ``` | ||
|
|
||
|
|
||
| ### All resources (CLOUD) | ||
|
|
||
| ```hcl | ||
|
|
@@ -147,9 +146,6 @@ module "apigee" { | |
| display_name = "APIs prod" | ||
| description = "APIs prod" | ||
| envgroups = ["prod"] | ||
| iam = { | ||
| "roles/viewer" = ["group:[email protected]"] | ||
| } | ||
| } | ||
| } | ||
| instances = { | ||
|
|
@@ -176,7 +172,7 @@ module "apigee" { | |
| } | ||
| } | ||
| } | ||
| # tftest modules=1 resources=15 | ||
| # tftest modules=1 resources=14 | ||
| ``` | ||
|
|
||
| ### All resources (HYBRID control plane) | ||
|
|
@@ -205,13 +201,10 @@ module "apigee" { | |
| display_name = "APIs prod" | ||
| description = "APIs prod" | ||
| envgroups = ["prod"] | ||
| iam = { | ||
| "roles/viewer" = ["group:[email protected]"] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| # tftest modules=1 resources=8 | ||
| # tftest modules=1 resources=7 | ||
| ``` | ||
|
|
||
| ### New environment group | ||
|
|
@@ -281,6 +274,56 @@ module "apigee" { | |
| # tftest modules=1 resources=2 | ||
| ``` | ||
|
|
||
| ### IAM | ||
|
|
||
| ```hcl | ||
| module "apigee" { | ||
| source = "./fabric/modules/apigee" | ||
| project_id = "my-project" | ||
| organization = { | ||
| display_name = "My Organization" | ||
| description = "My Organization" | ||
| authorized_network = "my-vpc" | ||
| runtime_type = "CLOUD" | ||
| billing_type = "PAYG" | ||
| database_encryption_key = "123456789" | ||
| analytics_region = "europe-west1" | ||
| } | ||
| envgroups = { | ||
| test = ["test.example.com"] | ||
| prod = ["prod.example.com"] | ||
| } | ||
| environments = { | ||
| apis-test = { | ||
| display_name = "APIs test" | ||
| description = "APIs Test" | ||
| envgroups = ["test"] | ||
| iam = { | ||
| "roles/apigee.environmentAdmin" = ["group:[email protected]"] | ||
| } | ||
| iam_bindings_additive = { | ||
| viewer = { | ||
| role = "roles/viewer" | ||
| member = "user:[email protected]" | ||
| } | ||
| } | ||
| } | ||
| apis-prod = { | ||
| display_name = "APIs prod" | ||
| description = "APIs prod" | ||
| envgroups = ["prod"] | ||
| iam_bindings = { | ||
| apigee-env-admin = { | ||
| role = "roles/apigee.environmentAdmin" | ||
| members = ["group:[email protected]"] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| # tftest modules=1 resources=10 | ||
| ``` | ||
|
|
||
| ### New endpoint attachment | ||
|
|
||
| Endpoint attachments allow to implement [Apigee southbound network patterns](https://cloud.google.com/apigee/docs/api-platform/architecture/southbound-networking-patterns-endpoints#create-the-psc-attachments). | ||
|
|
@@ -316,13 +359,13 @@ module "apigee" { | |
|
|
||
| | name | description | type | required | default | | ||
| |---|---|:---:|:---:|:---:| | ||
| | [project_id](variables.tf#L117) | Project ID. | <code>string</code> | ✓ | | | ||
| | [project_id](variables.tf#L125) | Project ID. | <code>string</code> | ✓ | | | ||
| | [addons_config](variables.tf#L17) | Addons configuration. | <code title="object({ advanced_api_ops = optional(bool, false) api_security = optional(bool, false) connectors_platform = optional(bool, false) integration = optional(bool, false) monetization = optional(bool, false) })">object({…})</code> | | <code>null</code> | | ||
| | [endpoint_attachments](variables.tf#L29) | Endpoint attachments. | <code title="map(object({ region = string service_attachment = string }))">map(object({…}))</code> | | <code>{}</code> | | ||
| | [envgroups](variables.tf#L39) | Environment groups (NAME => [HOSTNAMES]). | <code>map(list(string))</code> | | <code>{}</code> | | ||
| | [environments](variables.tf#L46) | Environments. | <code title="map(object({ display_name = optional(string) description = optional(string, "Terraform-managed") deployment_type = optional(string) api_proxy_type = optional(string) node_config = optional(object({ min_node_count = optional(number) max_node_count = optional(number) })) iam = optional(map(list(string))) envgroups = optional(list(string)) }))">map(object({…}))</code> | | <code>{}</code> | | ||
| | [instances](variables.tf#L64) | Instances ([REGION] => [INSTANCE]). | <code title="map(object({ name = optional(string) display_name = optional(string) description = optional(string, "Terraform-managed") runtime_ip_cidr_range = optional(string) troubleshooting_ip_cidr_range = optional(string) disk_encryption_key = optional(string) consumer_accept_list = optional(list(string)) enable_nat = optional(bool, false) environments = optional(list(string)) }))">map(object({…}))</code> | | <code>{}</code> | | ||
| | [organization](variables.tf#L89) | Apigee organization. If set to null the organization must already exist. | <code title="object({ display_name = optional(string) description = optional(string, "Terraform-managed") authorized_network = optional(string) runtime_type = optional(string, "CLOUD") billing_type = optional(string) database_encryption_key = optional(string) analytics_region = optional(string, "europe-west1") retention = optional(string) disable_vpc_peering = optional(bool, false) })">object({…})</code> | | <code>null</code> | | ||
| | [environments](variables.tf#L46) | Environments. | <code title="map(object({ display_name = optional(string) description = optional(string, "Terraform-managed") deployment_type = optional(string) api_proxy_type = optional(string) node_config = optional(object({ min_node_count = optional(number) max_node_count = optional(number) })) iam = optional(map(list(string)), {}) iam_bindings = optional(map(object({ role = string members = list(string) })), {}) iam_bindings_additive = optional(map(object({ role = string member = string })), {}) envgroups = optional(list(string), []) }))">map(object({…}))</code> | | <code>{}</code> | | ||
| | [instances](variables.tf#L72) | Instances ([REGION] => [INSTANCE]). | <code title="map(object({ name = optional(string) display_name = optional(string) description = optional(string, "Terraform-managed") runtime_ip_cidr_range = optional(string) troubleshooting_ip_cidr_range = optional(string) disk_encryption_key = optional(string) consumer_accept_list = optional(list(string)) enable_nat = optional(bool, false) environments = optional(list(string), []) }))">map(object({…}))</code> | | <code>{}</code> | | ||
| | [organization](variables.tf#L97) | Apigee organization. If set to null the organization must already exist. | <code title="object({ display_name = optional(string) description = optional(string, "Terraform-managed") authorized_network = optional(string) runtime_type = optional(string, "CLOUD") billing_type = optional(string) database_encryption_key = optional(string) analytics_region = optional(string, "europe-west1") retention = optional(string) disable_vpc_peering = optional(bool, false) })">object({…})</code> | | <code>null</code> | | ||
|
|
||
| ## Outputs | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /** | ||
| * Copyright 2023 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| resource "google_apigee_environment_iam_binding" "authoritative" { | ||
| for_each = merge(concat([for k1, v1 in var.environments : { | ||
| for k2, v2 in v1.iam : "${k1}-${k2}" => { | ||
| environment = "${k1}" | ||
| role = k2 | ||
| members = v2 | ||
| } | ||
| }])...) | ||
| org_id = local.org_id | ||
| env_id = google_apigee_environment.environments[each.value.environment].name | ||
| role = each.value.role | ||
| members = each.value.members | ||
| } | ||
|
|
||
| resource "google_apigee_environment_iam_binding" "bindings" { | ||
| for_each = merge(concat([for k1, v1 in var.environments : { | ||
| for k2, v2 in coalesce(v1.iam_bindings, {}) : "${k1}-${k2}" => { | ||
| environment = "${k1}" | ||
| role = v2.role | ||
| members = v2.members | ||
| } | ||
| }])...) | ||
| org_id = local.org_id | ||
| env_id = google_apigee_environment.environments[each.value.environment].name | ||
| role = each.value.role | ||
| members = each.value.members | ||
| } | ||
|
|
||
| resource "google_apigee_environment_iam_member" "bindings" { | ||
| for_each = merge(concat([for k1, v1 in var.environments : { | ||
| for k2, v2 in coalesce(v1.iam_bindings_additive, {}) : "${k1}-${k2}" => { | ||
| environment = "${k1}" | ||
| role = v2.role | ||
| member = v2.member | ||
| } | ||
| }])...) | ||
| org_id = local.org_id | ||
| env_id = google_apigee_environment.environments[each.value.environment].name | ||
| role = each.value.role | ||
| member = each.value.member | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters