dialogflow: support non-global endpoints for google_dialogflow_conversation_profile (#15037)

Author: ramonvermeulen

mmv1/products/dialogflow/ConversationProfile.yaml

@@ -32,8 +32,12 @@ timeouts:
   update_minutes: 40
   delete_minutes: 20
 custom_code:
+  pre_create: 'templates/terraform/pre_create/dialogflow_set_endpoint.go.tmpl'
+  pre_read: 'templates/terraform/pre_create/dialogflow_set_endpoint.go.tmpl'
+  pre_update: 'templates/terraform/pre_create/dialogflow_set_endpoint.go.tmpl'
+  pre_delete: 'templates/terraform/pre_create/dialogflow_set_endpoint.go.tmpl'
   post_create: 'templates/terraform/post_create/set_computed_name.tmpl'
-  custom_import: 'templates/terraform/custom_import/self_link_as_name_set_project.go.tmpl'
+  custom_import: 'templates/terraform/custom_import/self_link_as_name_set_project_and_location.go.tmpl'
 exclude_sweeper: true
 examples:
   - name: 'dialogflow_conversation_profile_basic'

mmv1/templates/terraform/custom_import/self_link_as_name_set_project_and_location.go.tmpl

@@ -0,0 +1,35 @@
+
+    config := meta.(*transport_tpg.Config)
+
+    // current import_formats can't import fields with forward slashes in their value
+    if err := tpgresource.ParseImportId([]string{"(?P<name>.+)"}, d, config); err != nil {
+        return nil, err
+    }
+
+    stringParts := strings.Split(d.Get("name").(string), "/")
+    if len(stringParts) < 2 {
+        return nil, fmt.Errorf(
+            "Could not split project from name: %s",
+            d.Get("name"),
+        )
+    }
+
+    if err := d.Set("project", stringParts[1]); err != nil {
+        return nil, fmt.Errorf("Error setting project: %s", err)
+    }
+
+    var location string
+    for i, part := range stringParts {
+        if part == "locations" && i+1 < len(stringParts) {
+            location = stringParts[i+1]
+            break
+        }
+    }
+    if location == "" {
+        return nil, fmt.Errorf("Could not extract location from name: %s", d.Get("name"))
+    }
+    if err := d.Set("location", location); err != nil {
+        return nil, fmt.Errorf("Error setting location: %s", err)
+    }
+
+    return []*schema.ResourceData{d}, nil

mmv1/templates/terraform/pre_create/dialogflow_set_endpoint.go.tmpl

@@ -1,6 +1,12 @@
 location := d.Get("location").(string)
+universeDomain := config.UniverseDomain
 
-// insert location into url for a different endpoint.
-if strings.HasPrefix(url, "https://dialogflow.googleapis.com/v2/") {
-	url = strings.Replace(url, "https://dialogflow", fmt.Sprintf("https://%s-dialogflow", location), 1)
+if universeDomain != "" && universeDomain != "googleapis.com" {
+  url = strings.Replace(url, "googleapis.com", universeDomain, 1)
+}
+
+if strings.HasPrefix(url, "https://dialogflow") {
+    if location != "" && location != "global" {
+        url = strings.Replace(url, "https://dialogflow", fmt.Sprintf("https://%s-dialogflow", location), 1)
+    }
 }

mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_conversation_profile_test.go

@@ -63,6 +63,35 @@ func TestAccDialogflowConversationProfile_update(t *testing.T) {
 	})
 }
 
+func TestAccDialogflowConversationProfile_regional(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"org_id":          envvar.GetTestOrgFromEnv(t),
+		"billing_account": envvar.GetTestBillingAccountFromEnv(t),
+		"random_suffix":   acctest.RandString(t, 10),
+	}
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		ExternalProviders: map[string]resource.ExternalProvider{
+			"time": {},
+		},
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDialogflowConversationProfile_dialogflowRegional(context),
+			},
+			{
+				ResourceName:            "google_dialogflow_conversation_profile.profile",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"location", "logging_config", "logging_config.0", "logging_config.0.enable_stackdriver_logging"},
+			},
+		},
+	})
+}
+
 func testAccDialogflowConversationProfile_dialogflowAgentFull1(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 	resource "google_project" "agent_project" {
@@ -246,6 +275,7 @@ func testAccDialogflowConversationProfile_dialogflowAgentFull1(context map[strin
 	}
 `, context)
 }
+
 func testAccDialogflowConversationProfile_dialogflowAgentFull2(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 	resource "google_project" "agent_project" {
@@ -409,3 +439,63 @@ func testAccDialogflowConversationProfile_dialogflowAgentFull2(context map[strin
 	}
 `, context)
 }
+
+func testAccDialogflowConversationProfile_dialogflowRegional(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+	resource "google_project" "agent_project" {
+		name = "tf-test-dialogflow-%{random_suffix}"
+		project_id = "tf-test-dialogflow-%{random_suffix}"
+		org_id     = "%{org_id}"
+		billing_account = "%{billing_account}"
+		deletion_policy = "DELETE"
+	}
+	resource "google_project_service" "agent_project" {
+		project = "${google_project.agent_project.id}"
+		service = "dialogflow.googleapis.com"
+		disable_dependent_services = false
+	}
+
+	resource "google_service_account" "dialogflow_service_account" {
+		account_id = "tf-test-dialogflow-%{random_suffix}"
+	}
+
+	resource "google_project_iam_member" "agent_create" {
+		project = "${google_project.agent_project.id}"
+		role    = "roles/dialogflow.admin"
+		member  = "serviceAccount:${google_service_account.dialogflow_service_account.email}"
+	}
+
+	resource "google_dialogflow_agent" "agent" {
+		display_name = "tf-test-agent-%{random_suffix}"
+		default_language_code = "en-us"
+		time_zone = "America/New_York"
+		project = google_project.agent_project.name
+	}
+
+	resource "google_pubsub_topic" "topic_diff" {
+		name = "tf-test-topic-%{random_suffix}-diff"
+		project = google_project.agent_project.project_id
+		depends_on = [google_project.agent_project, time_sleep.wait_120_seconds]
+		message_retention_duration = "8000s"
+	}
+	resource "google_dialogflow_cx_security_settings" "security_setting_diff" {
+		display_name          = "tf-test-setting-%{random_suffix}-diff"
+		location              = "us-central1"
+		purge_data_types      = []
+		retention_window_days = 7
+		project = google_project.agent_project.project_id
+		depends_on = [time_sleep.wait_120_seconds]
+	}
+	resource "time_sleep" "wait_120_seconds" {
+		create_duration = "120s"
+		depends_on = [google_dialogflow_agent.agent]
+	}
+	resource "google_dialogflow_conversation_profile" "profile" {
+		depends_on    = [google_dialogflow_agent.agent, google_dialogflow_cx_security_settings.security_setting_diff, time_sleep.wait_120_seconds]
+		project = "${google_project.agent_project.name}"
+		display_name  = "tf-test-conversation-profile-%{random_suffix}-new"
+		location = "us-central1"
+		language_code = "en-US"
+	}
+`, context)
+}