From 5a0d4a3294bf8392d440f93a19330389e1dc54ed Mon Sep 17 00:00:00 2001 From: anaik91 Date: Wed, 20 Sep 2023 00:01:16 +0530 Subject: [PATCH] feat: bumped cff module version for apigee & kms to v26.0.0 --- modules/apigee-x-core/README.md | 10 ++++------ modules/apigee-x-core/main.tf | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/modules/apigee-x-core/README.md b/modules/apigee-x-core/README.md index 9195fc9..3840a20 100644 --- a/modules/apigee-x-core/README.md +++ b/modules/apigee-x-core/README.md @@ -1,6 +1,5 @@ # Apigee Core Setup - ## Providers | Name | Version | @@ -11,9 +10,9 @@ | Name | Source | Version | |------|--------|---------| -| [apigee](#module\_apigee) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/apigee | v19.0.0 | -| [kms-inst-disk](#module\_kms-inst-disk) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/kms | v19.0.0 | -| [kms-org-db](#module\_kms-org-db) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/kms | v19.0.0 | +| [apigee](#module\_apigee) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/apigee | v26.0.0 | +| [kms-inst-disk](#module\_kms-inst-disk) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/kms | v26.0.0 | +| [kms-org-db](#module\_kms-org-db) | github.com/terraform-google-modules/cloud-foundation-fabric//modules/kms | v26.0.0 | ## Resources @@ -27,7 +26,7 @@ |------|-------------|------|---------|:--------:| | [apigee\_envgroups](#input\_apigee\_envgroups) | Apigee Environment Groups. | 
map(object({
    hostnames = list(string)
  }))
| `{}` | no | | [apigee\_environments](#input\_apigee\_environments) | Apigee Environments. | 
map(object({
    display_name = optional(string)
    description  = optional(string, "Terraform-managed")
    node_config = optional(object({
      min_node_count = optional(number)
      max_node_count = optional(number)
    }))
    iam       = optional(map(list(string)))
    envgroups = list(string)
  }))
| `null` | no | -| [apigee\_instances](#input\_apigee\_instances) | Apigee Instances (only one instance for EVAL). | 
map(object({
    region              = string
    ip_range            = string
    environments        = list(string)
    keyring_create      = optional(bool, true)
    keyring_name        = optional(string, null)
    keyring_location    = optional(string, null)
    key_name            = optional(string, "inst-disk")
    key_rotation_period = optional(string, "2592000s")
    key_labels          = optional(map(string), null)
    consumer_accept_list          = optional(list(string), null)
  }))
| `{}` | no | +| [apigee\_instances](#input\_apigee\_instances) | Apigee Instances (only one instance for EVAL). | 
map(object({
    region               = string
    ip_range             = string
    environments         = list(string)
    keyring_create       = optional(bool, true)
    keyring_name         = optional(string, null)
    keyring_location     = optional(string, null)
    key_name             = optional(string, "inst-disk")
    key_rotation_period  = optional(string, "2592000s")
    key_labels           = optional(map(string), null)
    consumer_accept_list = optional(list(string), null)
  }))
| `{}` | no | | [ax\_region](#input\_ax\_region) | GCP region for storing Apigee analytics data (see https://cloud.google.com/apigee/docs/api-platform/get-started/install-cli). | `string` | n/a | yes | | [billing\_type](#input\_billing\_type) | Billing type of the Apigee organization. | `string` | `null` | no | | [network](#input\_network) | Network (self-link) to peer with the Apigee tennant project. | `string` | n/a | yes | @@ -50,4 +49,3 @@ | [instance\_service\_attachments](#output\_instance\_service\_attachments) | Map of instance region -> instance PSC service attachment | | [org\_id](#output\_org\_id) | Apigee Organization ID in the format of 'organizations/' | | [organization](#output\_organization) | Apigee Organization. | - diff --git a/modules/apigee-x-core/main.tf b/modules/apigee-x-core/main.tf index 4afa4d0..f9c6e6e 100644 --- a/modules/apigee-x-core/main.tf +++ b/modules/apigee-x-core/main.tf @@ -32,7 +32,7 @@ resource "google_project_service_identity" "apigee_sa" { } module "kms-org-db" { - source = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/kms?ref=v19.0.0" + source = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/kms?ref=v26.0.0" project_id = var.project_id key_iam = { org-db = { @@ -51,7 +51,7 @@ module "kms-org-db" { module "kms-inst-disk" { for_each = var.apigee_instances - source = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/kms?ref=v19.0.0" + source = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/kms?ref=v26.0.0" project_id = var.project_id key_iam = { (each.value.key_name) = { @@ -72,7 +72,7 @@ module "kms-inst-disk" { } module "apigee" { - source = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/apigee?ref=v19.0.0" + source = "github.com/terraform-google-modules/cloud-foundation-fabric//modules/apigee?ref=v26.0.0" project_id = var.project_id organization = { display_name = var.org_display_name