Add session affinity v2 (#7648) (#14367)

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/7648.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+cloudrunv2: added support for `session_affinity` to `google_cloud_run_v2_service`
+```

google/resource_cloud_run_v2_service.go

@@ -507,6 +507,11 @@ If not specified, defaults to the same value as container.ports[0].containerPort
 							Optional:    true,
 							Description: `Email address of the IAM service account associated with the revision of the service. The service account represents the identity of the running revision, and determines what permissions the revision has. If not provided, the revision will use the project's default service account.`,
 						},
+						"session_affinity": {
+							Type:        schema.TypeBool,
+							Optional:    true,
+							Description: `Enables session affinity. For more information, go to https://cloud.google.com/run/docs/configuring/session-affinity`,
+						},
 						"timeout": {
 							Type:     schema.TypeString,
 							Computed: true,
@@ -1396,6 +1401,8 @@ func flattenCloudRunV2ServiceTemplate(v interface{}, d *schema.ResourceData, con
 		flattenCloudRunV2ServiceTemplateEncryptionKey(original["encryptionKey"], d, config)
 	transformed["max_instance_request_concurrency"] =
 		flattenCloudRunV2ServiceTemplateMaxInstanceRequestConcurrency(original["maxInstanceRequestConcurrency"], d, config)
+	transformed["session_affinity"] =
+		flattenCloudRunV2ServiceTemplateSessionAffinity(original["sessionAffinity"], d, config)
 	return []interface{}{transformed}
 }
 func flattenCloudRunV2ServiceTemplateRevision(v interface{}, d *schema.ResourceData, config *Config) interface{} {
@@ -2271,6 +2278,10 @@ func flattenCloudRunV2ServiceTemplateMaxInstanceRequestConcurrency(v interface{}
 	return v // let terraform core handle it otherwise
 }
 
+func flattenCloudRunV2ServiceTemplateSessionAffinity(v interface{}, d *schema.ResourceData, config *Config) interface{} {
+	return v
+}
+
 func flattenCloudRunV2ServiceTraffic(v interface{}, d *schema.ResourceData, config *Config) interface{} {
 	if v == nil {
 		return v
@@ -2685,6 +2696,13 @@ func expandCloudRunV2ServiceTemplate(v interface{}, d TerraformResourceData, con
 		transformed["maxInstanceRequestConcurrency"] = transformedMaxInstanceRequestConcurrency
 	}
 
+	transformedSessionAffinity, err := expandCloudRunV2ServiceTemplateSessionAffinity(original["session_affinity"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedSessionAffinity); val.IsValid() && !isEmptyValue(val) {
+		transformed["sessionAffinity"] = transformedSessionAffinity
+	}
+
 	return transformed, nil
 }
 
@@ -3732,6 +3750,10 @@ func expandCloudRunV2ServiceTemplateMaxInstanceRequestConcurrency(v interface{},
 	return v, nil
 }
 
+func expandCloudRunV2ServiceTemplateSessionAffinity(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandCloudRunV2ServiceTraffic(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
 	l := v.([]interface{})
 	req := make([]interface{}, 0, len(l))

google/resource_cloud_run_v2_service_test.go

@@ -95,6 +95,7 @@ resource "google_cloud_run_v2_service" "default" {
         }
       }
     }
+    session_affinity = false
   }
 }
 
@@ -166,6 +167,7 @@ resource "google_cloud_run_v2_service" "default" {
       connector = google_vpc_access_connector.connector.id
       egress = "ALL_TRAFFIC"
     }
+    session_affinity = true
   }
   traffic {
     type = "TRAFFIC_TARGET_ALLOCATION_TYPE_LATEST"

website/docs/r/cloud_run_v2_service.html.markdown

@@ -349,6 +349,10 @@ The following arguments are supported:
   (Optional)
   Sets the maximum number of requests that each serving instance can receive.
 
+* `session_affinity` -
+  (Optional)
+  Enables session affinity. For more information, go to https://cloud.google.com/run/docs/configuring/session-affinity
+
 
 <a name="nested_scaling"></a>The `scaling` block supports: