Merge branch 'main' of https://github.com/GoogleCloudPlatform/magic-modules

Author: actions-user

.ci/infra/terraform/main.tf

@@ -236,6 +236,7 @@ module "project-services" {
     "blockchainnodeengine.googleapis.com",
     "certificatemanager.googleapis.com",
     "ces.googleapis.com",
+    "chromepolicy.googleapis.com",
     "chronicle.googleapis.com",
     "cloudaicompanion.googleapis.com",
     "cloudapis.googleapis.com",
@@ -390,55 +391,55 @@ module "project-services" {
 }
 
 resource "google_project_service_identity" "bigtable_sa" {
-  provider = google-beta
+  provider   = google-beta
   depends_on = [module.project-services]
 
   project = google_project.proj.project_id
   service = "bigtableadmin.googleapis.com"
 }
 
 resource "google_project_service_identity" "secretmanager_sa" {
-  provider = google-beta
+  provider   = google-beta
   depends_on = [module.project-services]
 
   project = google_project.proj.project_id
   service = "secretmanager.googleapis.com"
 }
 
 resource "google_project_service_identity" "sqladmin_sa" {
-  provider = google-beta
+  provider   = google-beta
   depends_on = [module.project-services]
 
   project = google_project.proj.project_id
   service = "sqladmin.googleapis.com"
 }
 
 resource "google_project_service_identity" "osconfig_sa" {
-  provider = google-beta
+  provider   = google-beta
   depends_on = [module.project-services]
 
   project = google_project.proj.project_id
   service = "osconfig.googleapis.com"
 }
 
 resource "google_project_service_identity" "progressiverollout_sa" {
-  provider = google-beta
+  provider   = google-beta
   depends_on = [module.project-services]
 
   project = google_project.proj.project_id
   service = "progressiverollout.googleapis.com"
 }
 
 resource "google_project_service_identity" "parametermanager_sa" {
-  provider = google-beta
+  provider   = google-beta
   depends_on = [module.project-services]
 
   project = google_project.proj.project_id
   service = "parametermanager.googleapis.com"
 }
 
 resource "google_project_service_identity" "dlp_sa" {
-  provider = google-beta
+  provider   = google-beta
   depends_on = [module.project-services]
 
   project = google_project.proj.project_id

mmv1/products/dialogflow/ConversationProfile.yaml

@@ -51,7 +51,7 @@ examples:
       topic_name: 'recognition-result-notification'
   - name: 'dialogflow_conversation_profile_beta_bidi'
     primary_resource_id: 'bidi_profile'
-    version: beta
+    min_version: beta
     vars:
       profile_name: 'dialogflow-profile-bidi'
       app_id: 'app-id'

mmv1/templates/terraform/examples/dialogflow_conversation_profile_beta_bidi.tf.tmpl

@@ -1,4 +1,5 @@
 resource "google_dialogflow_conversation_profile" "bidi_profile" {
+  provider = google-beta
   display_name = "{{index $.Vars "profile_name"}}"
   location     = "global"
   language_code = "en-US"
@@ -9,6 +10,7 @@ resource "google_dialogflow_conversation_profile" "bidi_profile" {
 }
 
 resource "google_ces_app" "ces_app_for_agent" {
+  provider = google-beta
   app_id = "{{index $.Vars "app_id"}}"
   location = "us"
   display_name = "my-app"

mmv1/templates/terraform/examples/dialogflow_environment_basic.tf.tmpl

@@ -15,11 +15,6 @@ resource "time_sleep" "wait_enable_service_api" {
   ]
   create_duration = "30s"
 }
-resource "google_project_service_identity" "gcp_sa" {
-  service    = "dialogflow.googleapis.com"
-  project    = google_project.project.project_id
-  depends_on = [time_sleep.wait_enable_service_api]
-}
 resource "google_dialogflow_agent" "basic_agent" {
   display_name = "example_agent"
   default_language_code = "en-us"

mmv1/templates/terraform/examples/dialogflow_version_full.tf.tmpl

@@ -15,11 +15,6 @@ resource "time_sleep" "wait_enable_service_api" {
   ]
   create_duration = "30s"
 }
-resource "google_project_service_identity" "gcp_sa" {
-  service    = "dialogflow.googleapis.com"
-  project    = google_project.project.project_id
-  depends_on = [time_sleep.wait_enable_service_api]
-}
 resource "google_dialogflow_agent" "basic_agent" {
   display_name = "example_agent"
   default_language_code = "en"

mmv1/third_party/terraform/services/lustre/resource_lustre_instance_test.go

@@ -295,7 +295,7 @@ func TestAccLustreInstance_withKmsKey(t *testing.T) {
 				ResourceName:            "google_lustre_instance.instance",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"instance_id", "labels", "gke_support_enabled", "location", "terraform_labels"},
+				ImportStateVerifyIgnore: []string{"instance_id", "labels", "gke_support_enabled", "location", "terraform_labels", "update_time"},
 			},
 		},
 	})