Eventarc update (#4611) (#3149)

* Update eventarc trigger yaml, markdown to allow setting transport

* Update test, add handwritten utils

* Update handwritten

* Updating eventarc test

* Update markdown file

* Updating trigger

* Update trigger, seems to work

* Add GA

* Move tests to successful region,

* Add more updates

* Markdown

* Markdown

* Update from master'

* Move utils back for conversion lib

* Fix compile

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

Author: modular-magician

.changelog/4611.txt

@@ -0,0 +1,6 @@
+```release-note:enhancement
+eventarc: added `transport.pubsub.topic` to `google_eventarc_trigger` (beta only)
+```
+```release-note:new-resource
+google_eventarc_trigger (GA only)
+```

google-beta/resource_dataproc_cluster_test.go

@@ -13,8 +13,9 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 
-	dataproc "google.golang.org/api/dataproc/v1beta2"
 	"google.golang.org/api/googleapi"
+
+	dataproc "google.golang.org/api/dataproc/v1beta2"
 )
 
 func TestDataprocExtractInitTimeout(t *testing.T) {

google-beta/resource_eventarc_trigger.go

@@ -73,12 +73,20 @@ func resourceEventarcTrigger() *schema.Resource {
 				Description: ``,
 			},
 
-			"project": {
-				Type:        schema.TypeString,
-				Computed:    true,
+			"labels": {
+				Type:        schema.TypeMap,
 				Optional:    true,
-				ForceNew:    true,
 				Description: ``,
+				Elem:        &schema.Schema{Type: schema.TypeString},
+			},
+
+			"project": {
+				Type:             schema.TypeString,
+				Computed:         true,
+				Optional:         true,
+				ForceNew:         true,
+				DiffSuppressFunc: compareSelfLinkOrResourceName,
+				Description:      ``,
 			},
 
 			"service_account": {
@@ -88,23 +96,26 @@ func resourceEventarcTrigger() *schema.Resource {
 				Description:      ``,
 			},
 
-			"create_time": {
-				Type:        schema.TypeString,
+			"transport": {
+				Type:        schema.TypeList,
 				Computed:    true,
+				Optional:    true,
+				ForceNew:    true,
 				Description: ``,
+				MaxItems:    1,
+				Elem:        EventarcTriggerTransportSchema(),
 			},
 
-			"etag": {
+			"create_time": {
 				Type:        schema.TypeString,
 				Computed:    true,
 				Description: ``,
 			},
 
-			"transport": {
-				Type:        schema.TypeList,
+			"etag": {
+				Type:        schema.TypeString,
 				Computed:    true,
 				Description: ``,
-				Elem:        EventarcTriggerTransportSchema(),
 			},
 
 			"update_time": {
@@ -122,7 +133,6 @@ func EventarcTriggerDestinationSchema() *schema.Resource {
 			"cloud_run_service": {
 				Type:        schema.TypeList,
 				Optional:    true,
-				ForceNew:    true,
 				Description: ``,
 				MaxItems:    1,
 				Elem:        EventarcTriggerDestinationCloudRunServiceSchema(),
@@ -137,23 +147,20 @@ func EventarcTriggerDestinationCloudRunServiceSchema() *schema.Resource {
 			"service": {
 				Type:             schema.TypeString,
 				Required:         true,
-				ForceNew:         true,
 				DiffSuppressFunc: compareSelfLinkOrResourceName,
 				Description:      ``,
 			},
 
 			"path": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				ForceNew:    true,
 				Description: ``,
 			},
 
 			"region": {
 				Type:        schema.TypeString,
 				Computed:    true,
 				Optional:    true,
-				ForceNew:    true,
 				Description: ``,
 			},
 		},
@@ -166,14 +173,12 @@ func EventarcTriggerMatchingCriteriaSchema() *schema.Resource {
 			"attribute": {
 				Type:        schema.TypeString,
 				Required:    true,
-				ForceNew:    true,
 				Description: ``,
 			},
 
 			"value": {
 				Type:        schema.TypeString,
 				Required:    true,
-				ForceNew:    true,
 				Description: ``,
 			},
 		},
@@ -185,8 +190,10 @@ func EventarcTriggerTransportSchema() *schema.Resource {
 		Schema: map[string]*schema.Schema{
 			"pubsub": {
 				Type:        schema.TypeList,
-				Computed:    true,
+				Optional:    true,
+				ForceNew:    true,
 				Description: ``,
+				MaxItems:    1,
 				Elem:        EventarcTriggerTransportPubsubSchema(),
 			},
 		},
@@ -196,13 +203,14 @@ func EventarcTriggerTransportSchema() *schema.Resource {
 func EventarcTriggerTransportPubsubSchema() *schema.Resource {
 	return &schema.Resource{
 		Schema: map[string]*schema.Schema{
-			"subscription": {
+			"topic": {
 				Type:        schema.TypeString,
-				Computed:    true,
+				Optional:    true,
+				ForceNew:    true,
 				Description: ``,
 			},
 
-			"topic": {
+			"subscription": {
 				Type:        schema.TypeString,
 				Computed:    true,
 				Description: ``,
@@ -223,8 +231,10 @@ func resourceEventarcTriggerCreate(d *schema.ResourceData, meta interface{}) err
 		Location:         dcl.StringOrNil(d.Get("location").(string)),
 		MatchingCriteria: expandEventarcTriggerMatchingCriteriaArray(d.Get("matching_criteria")),
 		Name:             dcl.StringOrNil(d.Get("name").(string)),
+		Labels:           checkStringMap(d.Get("labels")),
 		Project:          dcl.String(project),
 		ServiceAccount:   dcl.StringOrNil(d.Get("service_account").(string)),
+		Transport:        expandEventarcTriggerTransport(d.Get("transport")),
 	}
 
 	id, err := replaceVarsForId(d, config, "projects/{{project}}/locations/{{location}}/triggers/{{name}}")
@@ -257,8 +267,10 @@ func resourceEventarcTriggerRead(d *schema.ResourceData, meta interface{}) error
 		Location:         dcl.StringOrNil(d.Get("location").(string)),
 		MatchingCriteria: expandEventarcTriggerMatchingCriteriaArray(d.Get("matching_criteria")),
 		Name:             dcl.StringOrNil(d.Get("name").(string)),
+		Labels:           checkStringMap(d.Get("labels")),
 		Project:          dcl.String(project),
 		ServiceAccount:   dcl.StringOrNil(d.Get("service_account").(string)),
+		Transport:        expandEventarcTriggerTransport(d.Get("transport")),
 	}
 
 	res, err := config.clientEventarcDCL.GetTrigger(context.Background(), obj)
@@ -280,21 +292,24 @@ func resourceEventarcTriggerRead(d *schema.ResourceData, meta interface{}) error
 	if err = d.Set("name", res.Name); err != nil {
 		return fmt.Errorf("error setting name in state: %s", err)
 	}
+	if err = d.Set("labels", res.Labels); err != nil {
+		return fmt.Errorf("error setting labels in state: %s", err)
+	}
 	if err = d.Set("project", res.Project); err != nil {
 		return fmt.Errorf("error setting project in state: %s", err)
 	}
 	if err = d.Set("service_account", res.ServiceAccount); err != nil {
 		return fmt.Errorf("error setting service_account in state: %s", err)
 	}
+	if err = d.Set("transport", flattenEventarcTriggerTransport(res.Transport)); err != nil {
+		return fmt.Errorf("error setting transport in state: %s", err)
+	}
 	if err = d.Set("create_time", res.CreateTime); err != nil {
 		return fmt.Errorf("error setting create_time in state: %s", err)
 	}
 	if err = d.Set("etag", res.Etag); err != nil {
 		return fmt.Errorf("error setting etag in state: %s", err)
 	}
-	if err = d.Set("transport", flattenEventarcTriggerTransport(res.Transport)); err != nil {
-		return fmt.Errorf("error setting transport in state: %s", err)
-	}
 	if err = d.Set("update_time", res.UpdateTime); err != nil {
 		return fmt.Errorf("error setting update_time in state: %s", err)
 	}
@@ -313,8 +328,10 @@ func resourceEventarcTriggerUpdate(d *schema.ResourceData, meta interface{}) err
 		Location:         dcl.StringOrNil(d.Get("location").(string)),
 		MatchingCriteria: expandEventarcTriggerMatchingCriteriaArray(d.Get("matching_criteria")),
 		Name:             dcl.StringOrNil(d.Get("name").(string)),
+		Labels:           checkStringMap(d.Get("labels")),
 		Project:          dcl.String(project),
 		ServiceAccount:   dcl.StringOrNil(d.Get("service_account").(string)),
+		Transport:        expandEventarcTriggerTransport(d.Get("transport")),
 	}
 	directive := UpdateDirective
 	res, err := config.clientEventarcDCL.ApplyTrigger(context.Background(), obj, directive...)
@@ -339,8 +356,10 @@ func resourceEventarcTriggerDelete(d *schema.ResourceData, meta interface{}) err
 		Location:         dcl.StringOrNil(d.Get("location").(string)),
 		MatchingCriteria: expandEventarcTriggerMatchingCriteriaArray(d.Get("matching_criteria")),
 		Name:             dcl.StringOrNil(d.Get("name").(string)),
+		Labels:           checkStringMap(d.Get("labels")),
 		Project:          dcl.String(project),
 		ServiceAccount:   dcl.StringOrNil(d.Get("service_account").(string)),
+		Transport:        expandEventarcTriggerTransport(d.Get("transport")),
 	}
 
 	log.Printf("[DEBUG] Deleting Trigger %q", d.Id())
@@ -487,6 +506,20 @@ func flattenEventarcTriggerMatchingCriteria(obj *eventarc.TriggerMatchingCriteri
 
 }
 
+func expandEventarcTriggerTransport(o interface{}) *eventarc.TriggerTransport {
+	if o == nil {
+		return nil
+	}
+	objArr := o.([]interface{})
+	if len(objArr) == 0 {
+		return nil
+	}
+	obj := objArr[0].(map[string]interface{})
+	return &eventarc.TriggerTransport{
+		Pubsub: expandEventarcTriggerTransportPubsub(obj["pubsub"]),
+	}
+}
+
 func flattenEventarcTriggerTransport(obj *eventarc.TriggerTransport) interface{} {
 	if obj == nil {
 		return nil
@@ -499,13 +532,27 @@ func flattenEventarcTriggerTransport(obj *eventarc.TriggerTransport) interface{}
 
 }
 
+func expandEventarcTriggerTransportPubsub(o interface{}) *eventarc.TriggerTransportPubsub {
+	if o == nil {
+		return nil
+	}
+	objArr := o.([]interface{})
+	if len(objArr) == 0 {
+		return nil
+	}
+	obj := objArr[0].(map[string]interface{})
+	return &eventarc.TriggerTransportPubsub{
+		Topic: dcl.StringOrNil(obj["topic"].(string)),
+	}
+}
+
 func flattenEventarcTriggerTransportPubsub(obj *eventarc.TriggerTransportPubsub) interface{} {
 	if obj == nil {
 		return nil
 	}
 	transformed := map[string]interface{}{
-		"subscription": obj.Subscription,
 		"topic":        obj.Topic,
+		"subscription": obj.Subscription,
 	}
 
 	return []interface{}{transformed}