Add path_template_match and path_template_rewrite support to internal…

… load balancers
GoogleCloudPlatform · Dec 9, 2024 · 3f86056 · 3f86056
1 parent c27da29
commit 3f86056
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 19 deletions.
diff --git a/modules/net-lb-app-ext-regional/README.md b/modules/net-lb-app-ext-regional/README.md
diff --git a/modules/net-lb-app-ext-regional/variables-urlmap.tf b/modules/net-lb-app-ext-regional/variables-urlmap.tf
@@ -204,7 +204,7 @@ variable "urlmap_config" {
           headers = optional(list(object({
             name         = string
             invert_match = optional(bool, false)
-            type         = optional(string, "present") # exact, prefix, suffix, regex, present, range
+            type         = optional(string, "present") # exact, prefix, suffix, regex, present, range, template
             value        = optional(string)
             range_value = optional(object({
               end   = string

diff --git a/modules/net-lb-app-ext/README.md b/modules/net-lb-app-ext/README.md
diff --git a/modules/net-lb-app-ext/variables-urlmap.tf b/modules/net-lb-app-ext/variables-urlmap.tf
@@ -143,9 +143,8 @@ variable "urlmap_config" {
           nanos   = optional(number)
         }))
         url_rewrite = optional(object({
-          host          = optional(string)
-          path_prefix   = optional(string)
-          path_template = optional(string)
+          host        = optional(string)
+          path_prefix = optional(string)
         }))
         weighted_backend_services = optional(map(object({
           weight = number
@@ -273,7 +272,7 @@ variable "urlmap_config" {
           headers = optional(list(object({
             name         = string
             invert_match = optional(bool, false)
-            type         = optional(string, "present") # exact, prefix, suffix, regex, present, range
+            type         = optional(string, "present") # exact, prefix, suffix, regex, present, range, template
             value        = optional(string)
             range_value = optional(object({
               end   = string

diff --git a/modules/net-lb-app-int-cross-region/README.md b/modules/net-lb-app-int-cross-region/README.md
diff --git a/modules/net-lb-app-int-cross-region/urlmap.tf b/modules/net-lb-app-int-cross-region/urlmap.tf
@@ -326,6 +326,11 @@ resource "google_compute_url_map" "default" {
                 ? match_rules.value.path.value
                 : null
               )
+              path_template_match = (
+                try(match_rules.value.path.type, null) == "template"
+                ? match_rules.value.path.value
+                : null
+              )
               dynamic "header_matches" {
                 for_each = toset(coalesce(match_rules.value.headers, []))
                 iterator = h
@@ -496,8 +501,9 @@ resource "google_compute_url_map" "default" {
                   : [route_action.value.url_rewrite]
                 )
                 content {
-                  host_rewrite        = url_rewrite.value.host
-                  path_prefix_rewrite = url_rewrite.value.path_prefix
+                  host_rewrite          = url_rewrite.value.host
+                  path_prefix_rewrite   = url_rewrite.value.path_prefix
+                  path_template_rewrite = url_rewrite.value.path_template
                 }
               }
               dynamic "weighted_backend_services" {

diff --git a/modules/net-lb-app-int-cross-region/variables-urlmap.tf b/modules/net-lb-app-int-cross-region/variables-urlmap.tf
@@ -133,7 +133,7 @@ variable "urlmap_config" {
           headers = optional(list(object({
             name         = string
             invert_match = optional(bool, false)
-            type         = optional(string, "present") # exact, prefix, suffix, regex, present, range
+            type         = optional(string, "present") # exact, prefix, suffix, regex, present, range, template
             value        = optional(string)
             range_value = optional(object({
               end   = string
@@ -192,8 +192,9 @@ variable "urlmap_config" {
             nanos   = optional(number)
           }))
           url_rewrite = optional(object({
-            host        = optional(string)
-            path_prefix = optional(string)
+            host          = optional(string)
+            path_prefix   = optional(string)
+            path_template = optional(string)
           }))
           weighted_backend_services = optional(map(object({
             weight = number

diff --git a/modules/net-lb-app-int/README.md b/modules/net-lb-app-int/README.md
diff --git a/modules/net-lb-app-int/urlmap.tf b/modules/net-lb-app-int/urlmap.tf
@@ -327,6 +327,11 @@ resource "google_compute_region_url_map" "default" {
                 ? match_rules.value.path.value
                 : null
               )
+              path_template_match = (
+                try(match_rules.value.path.type, null) == "template"
+                ? match_rules.value.path.value
+                : null
+              )
               dynamic "header_matches" {
                 for_each = toset(coalesce(match_rules.value.headers, []))
                 iterator = h
@@ -497,8 +502,9 @@ resource "google_compute_region_url_map" "default" {
                   : [route_action.value.url_rewrite]
                 )
                 content {
-                  host_rewrite        = url_rewrite.value.host
-                  path_prefix_rewrite = url_rewrite.value.path_prefix
+                  host_rewrite          = url_rewrite.value.host
+                  path_prefix_rewrite   = url_rewrite.value.path_prefix
+                  path_template_rewrite = url_rewrite.value.path_template
                 }
               }
               dynamic "weighted_backend_services" {

diff --git a/modules/net-lb-app-int/variables-urlmap.tf b/modules/net-lb-app-int/variables-urlmap.tf
@@ -133,7 +133,7 @@ variable "urlmap_config" {
           headers = optional(list(object({
             name         = string
             invert_match = optional(bool, false)
-            type         = optional(string, "present") # exact, prefix, suffix, regex, present, range
+            type         = optional(string, "present") # exact, prefix, suffix, regex, present, range, template
             value        = optional(string)
             range_value = optional(object({
               end   = string
@@ -192,8 +192,9 @@ variable "urlmap_config" {
             nanos   = optional(number)
           }))
           url_rewrite = optional(object({
-            host        = optional(string)
-            path_prefix = optional(string)
+            host          = optional(string)
+            path_prefix   = optional(string)
+            path_template = optional(string)
           }))
           weighted_backend_services = optional(map(object({
             weight = number