feat: Add Pub/Sub Subscription support for push payload unwrapping (no wrapper) (#8464) (#15334)

* feat: Add Pub/Sub Subscription support for payload unwrapping (no_wrapper)

* Add no_wrapper test/example

* Update Subscription.yaml

* Update Subscription.yaml

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

Author: modular-magician

.changelog/8464.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+pubsub: added `no_wrapper` field to `google_pubsub_subscription` resource
+```

google/resource_pubsub_subscription_test.go

@@ -120,6 +120,31 @@ func TestAccPubsubSubscription_push(t *testing.T) {
 	})
 }
 
+func TestAccPubsubSubscription_pushNoWrapper(t *testing.T) {
+	t.Parallel()
+
+	topicFoo := fmt.Sprintf("tf-test-topic-foo-%s", acctest.RandString(t, 10))
+	subscription := fmt.Sprintf("tf-test-sub-foo-%s", acctest.RandString(t, 10))
+	saAccount := fmt.Sprintf("tf-test-pubsub-%s", acctest.RandString(t, 10))
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckPubsubSubscriptionDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccPubsubSubscription_pushNoWrapper(topicFoo, saAccount, subscription),
+			},
+			{
+				ResourceName:      "google_pubsub_subscription.foo",
+				ImportStateId:     subscription,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
 // Context: hashicorp/terraform-provider-google#4993
 // This test makes a call to GET an subscription before it is actually created.
 // The PubSub API negative-caches responses so this tests we are
@@ -215,6 +240,45 @@ resource "google_pubsub_subscription" "foo" {
 `, saAccount, topicFoo, subscription)
 }
 
+func testAccPubsubSubscription_pushNoWrapper(topicFoo, saAccount, subscription string) string {
+	return fmt.Sprintf(`
+data "google_project" "project" { }
+
+resource "google_service_account" "pub_sub_service_account" {
+  account_id = "%s"
+}
+
+data "google_iam_policy" "admin" {
+  binding {
+    role = "roles/projects.topics.publish"
+
+    members = [
+      "serviceAccount:${google_service_account.pub_sub_service_account.email}",
+    ]
+  }
+}
+
+resource "google_pubsub_topic" "foo" {
+  name = "%s"
+}
+
+resource "google_pubsub_subscription" "foo" {
+  name                 = "%s"
+  topic                = google_pubsub_topic.foo.name
+  ack_deadline_seconds = 10
+  push_config {
+    push_endpoint = "https://${data.google_project.project.project_id}.appspot.com"
+    oidc_token {
+      service_account_email = google_service_account.pub_sub_service_account.email
+    }
+    no_wrapper {
+      write_metadata = true
+    }
+  }
+}
+`, saAccount, topicFoo, subscription)
+}
+
 func testAccPubsubSubscription_basic(topic, subscription, label string, deadline int, exactlyOnceDelivery bool) string {
 	return fmt.Sprintf(`
 resource "google_pubsub_topic" "foo" {

google/services/pubsub/resource_pubsub_subscription.go

@@ -302,6 +302,24 @@ The possible values for this attribute are:
 - v1 or v1beta2: uses the push format defined in the v1 Pub/Sub API.`,
 							Elem: &schema.Schema{Type: schema.TypeString},
 						},
+						"no_wrapper": {
+							Type:     schema.TypeList,
+							Optional: true,
+							Description: `When set, the payload to the push endpoint is not wrapped.Sets the
+'data' field as the HTTP body for delivery.`,
+							MaxItems: 1,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"write_metadata": {
+										Type:     schema.TypeBool,
+										Required: true,
+										Description: `When true, writes the Pub/Sub message metadata to
+'x-goog-pubsub-<KEY>:<VAL>' headers of the HTTP request. Writes the
+Pub/Sub message attributes to '<KEY>:<VAL>' headers of the HTTP request.`,
+									},
+								},
+							},
+						},
 						"oidc_token": {
 							Type:     schema.TypeList,
 							Optional: true,
@@ -950,6 +968,8 @@ func flattenPubsubSubscriptionPushConfig(v interface{}, d *schema.ResourceData,
 		flattenPubsubSubscriptionPushConfigPushEndpoint(original["pushEndpoint"], d, config)
 	transformed["attributes"] =
 		flattenPubsubSubscriptionPushConfigAttributes(original["attributes"], d, config)
+	transformed["no_wrapper"] =
+		flattenPubsubSubscriptionPushConfigNoWrapper(original["noWrapper"], d, config)
 	return []interface{}{transformed}
 }
 func flattenPubsubSubscriptionPushConfigOidcToken(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
@@ -983,6 +1003,23 @@ func flattenPubsubSubscriptionPushConfigAttributes(v interface{}, d *schema.Reso
 	return v
 }
 
+func flattenPubsubSubscriptionPushConfigNoWrapper(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	if v == nil {
+		return nil
+	}
+	original := v.(map[string]interface{})
+	if len(original) == 0 {
+		return nil
+	}
+	transformed := make(map[string]interface{})
+	transformed["write_metadata"] =
+		flattenPubsubSubscriptionPushConfigNoWrapperWriteMetadata(original["writeMetadata"], d, config)
+	return []interface{}{transformed}
+}
+func flattenPubsubSubscriptionPushConfigNoWrapperWriteMetadata(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenPubsubSubscriptionAckDeadlineSeconds(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	// Handles the string fixed64 format
 	if strVal, ok := v.(string); ok {
@@ -1216,6 +1253,13 @@ func expandPubsubSubscriptionPushConfig(v interface{}, d tpgresource.TerraformRe
 		transformed["attributes"] = transformedAttributes
 	}
 
+	transformedNoWrapper, err := expandPubsubSubscriptionPushConfigNoWrapper(original["no_wrapper"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedNoWrapper); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["noWrapper"] = transformedNoWrapper
+	}
+
 	return transformed, nil
 }
 
@@ -1268,6 +1312,29 @@ func expandPubsubSubscriptionPushConfigAttributes(v interface{}, d tpgresource.T
 	return m, nil
 }
 
+func expandPubsubSubscriptionPushConfigNoWrapper(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	l := v.([]interface{})
+	if len(l) == 0 || l[0] == nil {
+		return nil, nil
+	}
+	raw := l[0]
+	original := raw.(map[string]interface{})
+	transformed := make(map[string]interface{})
+
+	transformedWriteMetadata, err := expandPubsubSubscriptionPushConfigNoWrapperWriteMetadata(original["write_metadata"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedWriteMetadata); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["writeMetadata"] = transformedWriteMetadata
+	}
+
+	return transformed, nil
+}
+
+func expandPubsubSubscriptionPushConfigNoWrapperWriteMetadata(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandPubsubSubscriptionAckDeadlineSeconds(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }

website/docs/r/pubsub_subscription.html.markdown

@@ -386,6 +386,12 @@ The following arguments are supported:
   - v1beta1: uses the push format defined in the v1beta1 Pub/Sub API.
   - v1 or v1beta2: uses the push format defined in the v1 Pub/Sub API.
 
+* `no_wrapper` -
+  (Optional)
+  When set, the payload to the push endpoint is not wrapped.Sets the
+  `data` field as the HTTP body for delivery.
+  Structure is [documented below](#nested_no_wrapper).
+
 
 <a name="nested_oidc_token"></a>The `oidc_token` block supports:
 
@@ -405,6 +411,14 @@ The following arguments are supported:
   token audience here: https://tools.ietf.org/html/rfc7519#section-4.1.3
   Note: if not specified, the Push endpoint URL will be used.
 
+<a name="nested_no_wrapper"></a>The `no_wrapper` block supports:
+
+* `write_metadata` -
+  (Required)
+  When true, writes the Pub/Sub message metadata to
+  `x-goog-pubsub-<KEY>:<VAL>` headers of the HTTP request. Writes the
+  Pub/Sub message attributes to `<KEY>:<VAL>` headers of the HTTP request.
+
 <a name="nested_expiration_policy"></a>The `expiration_policy` block supports:
 
 * `ttl` -