From 8a3c07b5bba48fe354f93708c4f5d61e70e7f55e Mon Sep 17 00:00:00 2001 From: rs1986x Date: Thu, 25 Jan 2024 14:40:00 +0100 Subject: [PATCH] feat: adding target server to sb-psc-attachment module --- modules/sb-psc-attachment/README.md | 4 ++- modules/sb-psc-attachment/main.tf | 34 ++++++++++++++++++++++++++ modules/sb-psc-attachment/variables.tf | 28 ++++++++++++++++++++- modules/sb-psc-attachment/versions.tf | 4 +-- samples/x-iac-pipeline/infra/main.tf | 6 ++--- 5 files changed, 69 insertions(+), 7 deletions(-) diff --git a/modules/sb-psc-attachment/README.md b/modules/sb-psc-attachment/README.md index 5b4071f..0e5165d 100644 --- a/modules/sb-psc-attachment/README.md +++ b/modules/sb-psc-attachment/README.md @@ -3,7 +3,7 @@ | Name | Version | |------|---------| -| [google](#provider\_google) | >= 4.20.0 | +| [google](#provider\_google) | >= 5, <6 | ## Modules @@ -14,6 +14,7 @@ No modules. | Name | Type | |------|------| | [google_apigee_endpoint_attachment.endpoint_attachment](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/apigee_endpoint_attachment) | resource | +| [google_apigee_target_server.target_server](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/apigee_target_server) | resource | | [google_compute_service_attachment.psc_service_attachment](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_service_attachment) | resource | ## Inputs @@ -25,6 +26,7 @@ No modules. | [nat\_subnets](#input\_nat\_subnets) | One or more NAT subnets to be used for PSC. | `list(string)` | n/a | yes | | [project\_id](#input\_project\_id) | Project id. | `string` | n/a | yes | | [region](#input\_region) | GCP region where the service attachment should be created. | `string` | n/a | yes | +| [target\_servers](#input\_target\_servers) | Map of target servers to be created and associated with the endpoint attachment. | 
map(object({
    environment_id = string
    name           = string
    protocol       = optional(string, "HTTP")
    port           = optional(number, 80)
    enabled        = optional(bool, true)
    s_sl_info = optional(object({
      enabled                  = bool
      client_auth_enabled      = optional(bool, null)
      key_store                = optional(string, null)
      key_alias                = optional(string, null)
      trust_store              = optional(string, null)
      ignore_validation_errors = optional(bool, null)
      protocols                = optional(list(string), null)
      ciphers                  = optional(list(string), null)
      common_name = optional(object({
        value          = optional(string, null)
        wildcard_match = optional(bool, null)
      }))
    }))
  }))
| `{}` | no | | [target\_service](#input\_target\_service) | Target Service for the service attachment e.g. a forwarding rule. | `string` | n/a | yes | ## Outputs diff --git a/modules/sb-psc-attachment/main.tf b/modules/sb-psc-attachment/main.tf index cbbde38..76be1b1 100644 --- a/modules/sb-psc-attachment/main.tf +++ b/modules/sb-psc-attachment/main.tf @@ -32,3 +32,37 @@ resource "google_apigee_endpoint_attachment" "endpoint_attachment" { location = var.region service_attachment = google_compute_service_attachment.psc_service_attachment.id } + + +resource "google_apigee_target_server" "target_server" { + for_each = var.target_servers + + name = each.value.name + description = "Target server for ${var.name} endpoint attachment" + env_id = each.value.environment_id + protocol = each.value.protocol + host = google_apigee_endpoint_attachment.endpoint_attachment.host + port = each.value.port + is_enabled = each.value.enabled + + dynamic "s_sl_info" { + for_each = each.value.s_sl_info != null ? [1] : [] + content { + enabled = each.value.s_sl_info.enabled + client_auth_enabled = each.value.s_sl_info.client_auth_enabled + key_store = each.value.s_sl_info.key_store + key_alias = each.value.s_sl_info.key_alias + trust_store = each.value.s_sl_info.trust_store + ignore_validation_errors = each.value.s_sl_info.ignore_validation_errors + protocols = each.value.s_sl_info.protocols + ciphers = each.value.s_sl_info.ciphers + dynamic "common_name" { + for_each = each.value.s_sl_info.common_name != null ? [1] : [] + content { + value = each.value.s_sl_info.common_name.value + wildcard_match = each.value.s_sl_info.common_name.wildcard_match + } + } + } + } +} \ No newline at end of file diff --git a/modules/sb-psc-attachment/variables.tf b/modules/sb-psc-attachment/variables.tf index 0d21034..19a6424 100644 --- a/modules/sb-psc-attachment/variables.tf +++ b/modules/sb-psc-attachment/variables.tf @@ -46,4 +46,30 @@ variable "apigee_organization" { condition = can(regex("^(organizations/[a-zA-Z0-9-_]+)$", var.apigee_organization)) error_message = "Invalid Apigee Organization ID. Please use the format \"organizations/[a-zA-Z0-9-_]+\"." } -} \ No newline at end of file +} + +variable "target_servers" { + description = "Map of target servers to be created and associated with the endpoint attachment." + default = {} + type = map(object({ + environment_id = string + name = string + protocol = optional(string, "HTTP") + port = optional(number, 80) + enabled = optional(bool, true) + s_sl_info = optional(object({ + enabled = bool + client_auth_enabled = optional(bool, null) + key_store = optional(string, null) + key_alias = optional(string, null) + trust_store = optional(string, null) + ignore_validation_errors = optional(bool, null) + protocols = optional(list(string), null) + ciphers = optional(list(string), null) + common_name = optional(object({ + value = optional(string, null) + wildcard_match = optional(bool, null) + })) + })) + })) +} diff --git a/modules/sb-psc-attachment/versions.tf b/modules/sb-psc-attachment/versions.tf index 1238916..4e7c5b7 100644 --- a/modules/sb-psc-attachment/versions.tf +++ b/modules/sb-psc-attachment/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.20.0" + version = ">= 5, <6" } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.20.0" + version = ">= 5, <6" } } } \ No newline at end of file diff --git a/samples/x-iac-pipeline/infra/main.tf b/samples/x-iac-pipeline/infra/main.tf index 656eec8..3304c1d 100644 --- a/samples/x-iac-pipeline/infra/main.tf +++ b/samples/x-iac-pipeline/infra/main.tf @@ -79,10 +79,10 @@ module "shared-vpc" { subnets = [ for subnet in var.exposure_subnets : { - "name" = subnet.name - "region" = subnet.region + "name" = subnet.name + "region" = subnet.region "secondary_ip_ranges" = subnet.secondary_ip_range - "ip_cidr_range" = subnet.ip_cidr_range + "ip_cidr_range" = subnet.ip_cidr_range "iam" = { "roles/compute.networkUser" = [ "serviceAccount:${module.service-project.service_accounts.cloud_services}"