From 626404ed9a6dfdbdf52957d0a411f10f0174ebec Mon Sep 17 00:00:00 2001
From: Shotaro Kohama <khmshtr28@gmail.com>
Date: Sat, 3 Sep 2022 16:30:19 -0600
Subject: [PATCH 01/12] feat: promote vertex ai feature store resources (ga
 only)

---
 mmv1/products/vertexai/api.yaml                             | 6 ++----
 .../terraform/examples/vertex_ai_featurestore.tf.erb        | 1 -
 .../examples/vertex_ai_featurestore_entitytype.tf.erb       | 2 --
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/mmv1/products/vertexai/api.yaml b/mmv1/products/vertexai/api.yaml
index a68d7b29b864..355b29356818 100644
--- a/mmv1/products/vertexai/api.yaml
+++ b/mmv1/products/vertexai/api.yaml
@@ -109,14 +109,13 @@ objects:
     base_url: projects/{{project}}/locations/{{region}}/featurestores
     create_url: projects/{{project}}/locations/{{region}}/featurestores?featurestoreId={{name}}
     self_link: 'projects/{{project}}/locations/{{region}}/featurestores/{{name}}'
-    min_version: beta
     update_verb: :PATCH
     update_mask: true
     references: !ruby/object:Api::Resource::ReferenceLinks
       guides:
         'Official Documentation':
           'https://cloud.google.com/vertex-ai/docs'
-      api: 'https://cloud.google.com/vertex-ai/docs/reference/rest/v1beta1/projects.locations.featurestores'
+      api: 'https://cloud.google.com/vertex-ai/docs/reference/rest/v1/projects.locations.featurestores'
     async: !ruby/object:Api::OpAsync
       operation: !ruby/object:Api::OpAsync::Operation
         path: 'name'
@@ -194,14 +193,13 @@ objects:
     base_url: '{{featurestore}}/entityTypes'
     create_url: '{{featurestore}}/entityTypes?entityTypeId={{name}}'
     self_link: '{{featurestore}}/entityTypes/{{name}}'
-    min_version: beta
     update_verb: :PATCH
     update_mask: true
     references: !ruby/object:Api::Resource::ReferenceLinks
       guides:
         'Official Documentation':
           'https://cloud.google.com/vertex-ai/docs'
-      api: 'https://cloud.google.com/vertex-ai/docs/reference/rest/v1beta1/projects.locations.featurestores.entityTypes'
+      api: 'https://cloud.google.com/vertex-ai/docs/reference/rest/v1/projects.locations.featurestores.entityTypes'
     async: !ruby/object:Api::OpAsync
       operation: !ruby/object:Api::OpAsync::Operation
         path: 'name'
diff --git a/mmv1/templates/terraform/examples/vertex_ai_featurestore.tf.erb b/mmv1/templates/terraform/examples/vertex_ai_featurestore.tf.erb
index 0eaefed1e142..db6057a6f5fc 100644
--- a/mmv1/templates/terraform/examples/vertex_ai_featurestore.tf.erb
+++ b/mmv1/templates/terraform/examples/vertex_ai_featurestore.tf.erb
@@ -1,5 +1,4 @@
 resource "google_vertex_ai_featurestore" "featurestore" {
-  provider = google-beta
   name     = "<%= ctx[:vars]['name'] %>"
   labels = {
     foo = "bar"
diff --git a/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype.tf.erb b/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype.tf.erb
index c676aab0201c..669bc7523b38 100644
--- a/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype.tf.erb
+++ b/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype.tf.erb
@@ -1,5 +1,4 @@
 resource "google_vertex_ai_featurestore" "featurestore" {
-  provider = google-beta
   name     = "<%= ctx[:vars]['name'] %>"
   labels = {
     foo = "bar"
@@ -14,7 +13,6 @@ resource "google_vertex_ai_featurestore" "featurestore" {
 }
 
 resource "google_vertex_ai_featurestore_entitytype" "entity" {
-  provider = google-beta
   name     = "<%= ctx[:vars]['name'] %>"
   labels = {
     foo = "bar"

From 89d66724c71544ca544f2fb9f6d58471490aac0f Mon Sep 17 00:00:00 2001
From: Shotaro Kohama <khmshtr28@gmail.com>
Date: Wed, 28 Sep 2022 06:53:56 +0900
Subject: [PATCH 02/12] feat: deprecate the field:       monitoring_interval

---
 mmv1/products/vertexai/api.yaml                             | 6 ------
 .../examples/vertex_ai_featurestore_entitytype.tf.erb       | 1 -
 2 files changed, 7 deletions(-)

diff --git a/mmv1/products/vertexai/api.yaml b/mmv1/products/vertexai/api.yaml
index 355b29356818..3bd0e88846ce 100644
--- a/mmv1/products/vertexai/api.yaml
+++ b/mmv1/products/vertexai/api.yaml
@@ -269,12 +269,6 @@ objects:
                 default_value: false
                 description: |
                   The monitoring schedule for snapshot analysis. For EntityType-level config: unset / disabled = true indicates disabled by default for Features under it; otherwise by default enable snapshot analysis monitoring with monitoringInterval for Features under it.
-              - !ruby/object:Api::Type::String
-                name: 'monitoringInterval'
-                description: |
-                  Configuration of the snapshot analysis based monitoring pipeline running interval. The value is rolled up to full day.
-
-                  A duration in seconds with up to nine fractional digits, terminated by 's'. Example: "3.5s".
 # Vertex ML Metadata
   - !ruby/object:Api::Resource
     name: MetadataStore
diff --git a/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype.tf.erb b/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype.tf.erb
index 669bc7523b38..0a0f3a8a0fd5 100644
--- a/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype.tf.erb
+++ b/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype.tf.erb
@@ -21,7 +21,6 @@ resource "google_vertex_ai_featurestore_entitytype" "entity" {
   monitoring_config {
     snapshot_analysis {
       disabled = false
-      monitoring_interval = "86400s"
     }
   }
 }

From 3e76e59f08607b7d7cc9e305e0067211a6d24939 Mon Sep 17 00:00:00 2001
From: Shotaro Kohama <khmshtr28@gmail.com>
Date: Wed, 28 Sep 2022 21:25:58 +0900
Subject: [PATCH 03/12] Revert "feat: deprecate the field:      
 monitoring_interval"

This reverts commit 89d66724c71544ca544f2fb9f6d58471490aac0f.
---
 mmv1/products/vertexai/api.yaml                             | 6 ++++++
 .../examples/vertex_ai_featurestore_entitytype.tf.erb       | 1 +
 2 files changed, 7 insertions(+)

diff --git a/mmv1/products/vertexai/api.yaml b/mmv1/products/vertexai/api.yaml
index 3bd0e88846ce..355b29356818 100644
--- a/mmv1/products/vertexai/api.yaml
+++ b/mmv1/products/vertexai/api.yaml
@@ -269,6 +269,12 @@ objects:
                 default_value: false
                 description: |
                   The monitoring schedule for snapshot analysis. For EntityType-level config: unset / disabled = true indicates disabled by default for Features under it; otherwise by default enable snapshot analysis monitoring with monitoringInterval for Features under it.
+              - !ruby/object:Api::Type::String
+                name: 'monitoringInterval'
+                description: |
+                  Configuration of the snapshot analysis based monitoring pipeline running interval. The value is rolled up to full day.
+
+                  A duration in seconds with up to nine fractional digits, terminated by 's'. Example: "3.5s".
 # Vertex ML Metadata
   - !ruby/object:Api::Resource
     name: MetadataStore
diff --git a/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype.tf.erb b/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype.tf.erb
index 0a0f3a8a0fd5..669bc7523b38 100644
--- a/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype.tf.erb
+++ b/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype.tf.erb
@@ -21,6 +21,7 @@ resource "google_vertex_ai_featurestore_entitytype" "entity" {
   monitoring_config {
     snapshot_analysis {
       disabled = false
+      monitoring_interval = "86400s"
     }
   }
 }

From b600ab9b7181432895c9e62f07c58115d6eeb8a8 Mon Sep 17 00:00:00 2001
From: Shotaro Kohama <khmshtr28@gmail.com>
Date: Thu, 29 Sep 2022 07:07:40 +0900
Subject: [PATCH 04/12] feat: update the example to use only the GA fields

---
 mmv1/products/vertexai/api.yaml                                | 3 +++
 .../examples/vertex_ai_featurestore_entitytype.tf.erb          | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mmv1/products/vertexai/api.yaml b/mmv1/products/vertexai/api.yaml
index 355b29356818..8d6828a574d1 100644
--- a/mmv1/products/vertexai/api.yaml
+++ b/mmv1/products/vertexai/api.yaml
@@ -271,7 +271,10 @@ objects:
                   The monitoring schedule for snapshot analysis. For EntityType-level config: unset / disabled = true indicates disabled by default for Features under it; otherwise by default enable snapshot analysis monitoring with monitoringInterval for Features under it.
               - !ruby/object:Api::Type::String
                 name: 'monitoringInterval'
+                min_version: beta
                 description: |
+                  This item is deprecated!
+
                   Configuration of the snapshot analysis based monitoring pipeline running interval. The value is rolled up to full day.
 
                   A duration in seconds with up to nine fractional digits, terminated by 's'. Example: "3.5s".
diff --git a/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype.tf.erb b/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype.tf.erb
index 669bc7523b38..0a0f3a8a0fd5 100644
--- a/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype.tf.erb
+++ b/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype.tf.erb
@@ -21,7 +21,6 @@ resource "google_vertex_ai_featurestore_entitytype" "entity" {
   monitoring_config {
     snapshot_analysis {
       disabled = false
-      monitoring_interval = "86400s"
     }
   }
 }

From c37fbcde3217c1b2b983320ec2f863101868014f Mon Sep 17 00:00:00 2001
From: Shotaro Kohama <khmshtr28@gmail.com>
Date: Fri, 30 Sep 2022 09:55:22 +0900
Subject: [PATCH 05/12] fix: diable monitoring_config.snapshot_analysis in the
 example

---
 .../terraform/examples/vertex_ai_featurestore_entitytype.tf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype.tf.erb b/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype.tf.erb
index 0a0f3a8a0fd5..bb6603f42608 100644
--- a/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype.tf.erb
+++ b/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype.tf.erb
@@ -20,7 +20,7 @@ resource "google_vertex_ai_featurestore_entitytype" "entity" {
   featurestore = google_vertex_ai_featurestore.featurestore.id
   monitoring_config {
     snapshot_analysis {
-      disabled = false
+      disabled = true
     }
   }
 }

From bc1954a17e4591c6ad2fceb54a637b7616330e2b Mon Sep 17 00:00:00 2001
From: Shotaro Kohama <khmshtr28@gmail.com>
Date: Fri, 30 Sep 2022 09:57:17 +0900
Subject: [PATCH 06/12] feat: promote the featurestore entity feature resource
 to GA

---
 mmv1/products/vertexai/api.yaml                             | 1 -
 .../vertex_ai_featurestore_entitytype_feature.tf.erb        | 6 +-----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/mmv1/products/vertexai/api.yaml b/mmv1/products/vertexai/api.yaml
index e50e72efe8f1..e4cfa99d13b1 100644
--- a/mmv1/products/vertexai/api.yaml
+++ b/mmv1/products/vertexai/api.yaml
@@ -285,7 +285,6 @@ objects:
     base_url: '{{entitytype}}/features'
     create_url: '{{entitytype}}/features?featureId={{name}}'
     self_link: '{{entitytype}}/features/{{name}}'
-    min_version: beta
     update_verb: :PATCH
     update_mask: true
     references: !ruby/object:Api::Resource::ReferenceLinks
diff --git a/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype_feature.tf.erb b/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype_feature.tf.erb
index e3b6fad54842..3855f0cf52bb 100644
--- a/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype_feature.tf.erb
+++ b/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype_feature.tf.erb
@@ -1,5 +1,4 @@
 resource "google_vertex_ai_featurestore" "featurestore" {
-  provider = google-beta
   name     = "<%= ctx[:vars]['name'] %>"
   labels = {
     foo = "bar"
@@ -11,7 +10,6 @@ resource "google_vertex_ai_featurestore" "featurestore" {
 }
 
 resource "google_vertex_ai_featurestore_entitytype" "entity" {
-  provider = google-beta
   name     = "<%= ctx[:vars]['name'] %>"
   labels = {
     foo = "bar"
@@ -19,14 +17,12 @@ resource "google_vertex_ai_featurestore_entitytype" "entity" {
   featurestore = google_vertex_ai_featurestore.featurestore.id
   monitoring_config {
     snapshot_analysis {
-      disabled = false
-      monitoring_interval = "86400s"
+      disabled = true
     }
   }
 }
 
 resource "google_vertex_ai_featurestore_entitytype_feature" "feature" {
-  provider = google-beta
   name     = "<%= ctx[:vars]['name'] %>"
   labels = {
     foo = "bar"

From d3b509033e2a8c3f5ed239867daa4623859dcf42 Mon Sep 17 00:00:00 2001
From: Shotaro Kohama <khmshtr28@gmail.com>
Date: Sat, 1 Oct 2022 22:44:12 +0900
Subject: [PATCH 07/12] fix: add default_value to fix the unintentional diff

---
 mmv1/products/vertexai/api.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mmv1/products/vertexai/api.yaml b/mmv1/products/vertexai/api.yaml
index e4cfa99d13b1..165ccf38d434 100644
--- a/mmv1/products/vertexai/api.yaml
+++ b/mmv1/products/vertexai/api.yaml
@@ -271,6 +271,7 @@ objects:
                   The monitoring schedule for snapshot analysis. For EntityType-level config: unset / disabled = true indicates disabled by default for Features under it; otherwise by default enable snapshot analysis monitoring with monitoringInterval for Features under it.
               - !ruby/object:Api::Type::String
                 name: 'monitoringInterval'
+                default_value: "0s"
                 min_version: beta
                 description: |
                   This item is deprecated!

From 2b0982d5b557e95639c918bd761052706f28054a Mon Sep 17 00:00:00 2001
From: Shotaro Kohama <khmshtr28@gmail.com>
Date: Sat, 1 Oct 2022 22:44:40 +0900
Subject: [PATCH 08/12] feat: update the link to the api doc

---
 mmv1/products/vertexai/api.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mmv1/products/vertexai/api.yaml b/mmv1/products/vertexai/api.yaml
index 165ccf38d434..89f4362b8847 100644
--- a/mmv1/products/vertexai/api.yaml
+++ b/mmv1/products/vertexai/api.yaml
@@ -292,7 +292,7 @@ objects:
       guides:
         'Official Documentation':
           'https://cloud.google.com/vertex-ai/docs'
-      api: 'https://cloud.google.com/vertex-ai/docs/reference/rest/v1beta1/projects.locations.featurestores.entityTypes.features'
+      api: 'https://cloud.google.com/vertex-ai/docs/reference/rest/v1/projects.locations.featurestores.entityTypes.features'
     async: !ruby/object:Api::OpAsync
       operation: !ruby/object:Api::OpAsync::Operation
         path: 'name'

From acc9fb1b3d1fece23b01ad4779bcd7952479bda4 Mon Sep 17 00:00:00 2001
From: Shotaro Kohama <khmshtr28@gmail.com>
Date: Sat, 8 Oct 2022 13:32:44 +0900
Subject: [PATCH 09/12] Revert "fix: add default_value to fix the unintentional
 diff"

This reverts commit d3b509033e2a8c3f5ed239867daa4623859dcf42.
---
 mmv1/products/vertexai/api.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mmv1/products/vertexai/api.yaml b/mmv1/products/vertexai/api.yaml
index 89f4362b8847..fa573f1635ba 100644
--- a/mmv1/products/vertexai/api.yaml
+++ b/mmv1/products/vertexai/api.yaml
@@ -271,7 +271,6 @@ objects:
                   The monitoring schedule for snapshot analysis. For EntityType-level config: unset / disabled = true indicates disabled by default for Features under it; otherwise by default enable snapshot analysis monitoring with monitoringInterval for Features under it.
               - !ruby/object:Api::Type::String
                 name: 'monitoringInterval'
-                default_value: "0s"
                 min_version: beta
                 description: |
                   This item is deprecated!

From c87fbf604c11c54c223a15f1c241d1ab3a4e37a6 Mon Sep 17 00:00:00 2001
From: Shotaro Kohama <khmshtr28@gmail.com>
Date: Sat, 8 Oct 2022 13:38:30 +0900
Subject: [PATCH 10/12] refactor: use deprecation_message to clarify the
 deprecated field

---
 mmv1/products/vertexai/api.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mmv1/products/vertexai/api.yaml b/mmv1/products/vertexai/api.yaml
index fa573f1635ba..c1ca03cad874 100644
--- a/mmv1/products/vertexai/api.yaml
+++ b/mmv1/products/vertexai/api.yaml
@@ -272,9 +272,8 @@ objects:
               - !ruby/object:Api::Type::String
                 name: 'monitoringInterval'
                 min_version: beta
+                deprecation_message: This field is unavailable in the GA provider and will be removed from the beta provider in a future release.
                 description: |
-                  This item is deprecated!
-
                   Configuration of the snapshot analysis based monitoring pipeline running interval. The value is rolled up to full day.
 
                   A duration in seconds with up to nine fractional digits, terminated by 's'. Example: "3.5s".

From 9662dd4fa108e8deb2c078b2276c0614b93f741f Mon Sep 17 00:00:00 2001
From: Shotaro Kohama <khmshtr28@gmail.com>
Date: Wed, 12 Oct 2022 10:21:21 -0700
Subject: [PATCH 11/12] feat: add a new example to test beta fields

---
 mmv1/products/vertexai/terraform.yaml         | 25 +++++++++++--
 .../vertex_ai_featurestore_entitytype.tf.erb  |  5 ---
 ..._ai_featurestore_entitytype_feature.tf.erb |  5 ---
 ...entitytype_feature_with_beta_fields.tf.erb | 37 +++++++++++++++++++
 ...restore_entitytype_with_beta_fields.tf.erb | 29 +++++++++++++++
 5 files changed, 87 insertions(+), 14 deletions(-)
 create mode 100644 mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype_feature_with_beta_fields.tf.erb
 create mode 100644 mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype_with_beta_fields.tf.erb

diff --git a/mmv1/products/vertexai/terraform.yaml b/mmv1/products/vertexai/terraform.yaml
index a8edc29f1d2e..f6e75ecfa091 100644
--- a/mmv1/products/vertexai/terraform.yaml
+++ b/mmv1/products/vertexai/terraform.yaml
@@ -79,6 +79,19 @@ overrides: !ruby/object:Overrides::ResourceOverrides
           billing_account: :BILLING_ACCT
         test_vars_overrides:
           kms_key_name: 'BootstrapKMSKeyInLocation(t, "us-central1").CryptoKey.Name'
+      - !ruby/object:Provider::Terraform::Examples
+        name: "vertex_ai_featurestore_entitytype_with_beta_fields"
+        primary_resource_id: "entity"
+        vars:
+          name: "terraform"
+          project: "vertex-ai"
+          kms_key_name: "kms-name"
+        test_env_vars:
+          org_id: :ORG_ID
+          billing_account: :BILLING_ACCT
+        test_vars_overrides:
+          kms_key_name: 'BootstrapKMSKeyInLocation(t, "us-central1").CryptoKey.Name'
+        min_version: beta
     properties:
       etag: !ruby/object:Overrides::Terraform::PropertyOverride
         ignore_read: true
@@ -99,10 +112,14 @@ overrides: !ruby/object:Overrides::ResourceOverrides
           name: "terraform"
           project: "vertex-ai"
           kms_key_name: "kms-name"
-        test_env_vars:
-          org_id: :ORG_ID
-          billing_account: :BILLING_ACCT
-        test_vars_overrides:
+      - !ruby/object:Provider::Terraform::Examples
+        name: "vertex_ai_featurestore_entitytype_feature_with_beta_fields"
+        primary_resource_id: "feature"
+        vars:
+          name: "terraform2"
+          project: "vertex-ai"
+          kms_key_name: "kms-name"
+        min_version: beta
     properties:
       etag: !ruby/object:Overrides::Terraform::PropertyOverride
         ignore_read: true
diff --git a/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype.tf.erb b/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype.tf.erb
index bb6603f42608..a6bb99e0894b 100644
--- a/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype.tf.erb
+++ b/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype.tf.erb
@@ -18,9 +18,4 @@ resource "google_vertex_ai_featurestore_entitytype" "entity" {
     foo = "bar"
   }
   featurestore = google_vertex_ai_featurestore.featurestore.id
-  monitoring_config {
-    snapshot_analysis {
-      disabled = true
-    }
-  }
 }
diff --git a/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype_feature.tf.erb b/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype_feature.tf.erb
index 3855f0cf52bb..dd296cb57741 100644
--- a/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype_feature.tf.erb
+++ b/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype_feature.tf.erb
@@ -15,11 +15,6 @@ resource "google_vertex_ai_featurestore_entitytype" "entity" {
     foo = "bar"
   }
   featurestore = google_vertex_ai_featurestore.featurestore.id
-  monitoring_config {
-    snapshot_analysis {
-      disabled = true
-    }
-  }
 }
 
 resource "google_vertex_ai_featurestore_entitytype_feature" "feature" {
diff --git a/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype_feature_with_beta_fields.tf.erb b/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype_feature_with_beta_fields.tf.erb
new file mode 100644
index 000000000000..e3b6fad54842
--- /dev/null
+++ b/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype_feature_with_beta_fields.tf.erb
@@ -0,0 +1,37 @@
+resource "google_vertex_ai_featurestore" "featurestore" {
+  provider = google-beta
+  name     = "<%= ctx[:vars]['name'] %>"
+  labels = {
+    foo = "bar"
+  }
+  region   = "us-central1"
+  online_serving_config {
+    fixed_node_count = 2
+  }
+}
+
+resource "google_vertex_ai_featurestore_entitytype" "entity" {
+  provider = google-beta
+  name     = "<%= ctx[:vars]['name'] %>"
+  labels = {
+    foo = "bar"
+  }
+  featurestore = google_vertex_ai_featurestore.featurestore.id
+  monitoring_config {
+    snapshot_analysis {
+      disabled = false
+      monitoring_interval = "86400s"
+    }
+  }
+}
+
+resource "google_vertex_ai_featurestore_entitytype_feature" "feature" {
+  provider = google-beta
+  name     = "<%= ctx[:vars]['name'] %>"
+  labels = {
+    foo = "bar"
+  }
+  entitytype = google_vertex_ai_featurestore_entitytype.entity.id
+
+  value_type = "INT64_ARRAY"
+}
diff --git a/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype_with_beta_fields.tf.erb b/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype_with_beta_fields.tf.erb
new file mode 100644
index 000000000000..c676aab0201c
--- /dev/null
+++ b/mmv1/templates/terraform/examples/vertex_ai_featurestore_entitytype_with_beta_fields.tf.erb
@@ -0,0 +1,29 @@
+resource "google_vertex_ai_featurestore" "featurestore" {
+  provider = google-beta
+  name     = "<%= ctx[:vars]['name'] %>"
+  labels = {
+    foo = "bar"
+  }
+  region   = "us-central1"
+  online_serving_config {
+    fixed_node_count = 2
+  }
+  encryption_spec {
+    kms_key_name = "<%= ctx[:vars]['kms_key_name'] %>"
+  }
+}
+
+resource "google_vertex_ai_featurestore_entitytype" "entity" {
+  provider = google-beta
+  name     = "<%= ctx[:vars]['name'] %>"
+  labels = {
+    foo = "bar"
+  }
+  featurestore = google_vertex_ai_featurestore.featurestore.id
+  monitoring_config {
+    snapshot_analysis {
+      disabled = false
+      monitoring_interval = "86400s"
+    }
+  }
+}

From 6d8c54814624304e6888543957a050a31bb68f91 Mon Sep 17 00:00:00 2001
From: Shotaro Kohama <khmshtr28@gmail.com>
Date: Wed, 12 Oct 2022 10:23:19 -0700
Subject: [PATCH 12/12] fix: use a different resource name to run tests in
 parallel

---
 mmv1/products/vertexai/terraform.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mmv1/products/vertexai/terraform.yaml b/mmv1/products/vertexai/terraform.yaml
index f6e75ecfa091..2fb8639cada6 100644
--- a/mmv1/products/vertexai/terraform.yaml
+++ b/mmv1/products/vertexai/terraform.yaml
@@ -83,7 +83,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         name: "vertex_ai_featurestore_entitytype_with_beta_fields"
         primary_resource_id: "entity"
         vars:
-          name: "terraform"
+          name: "terraform2"
           project: "vertex-ai"
           kms_key_name: "kms-name"
         test_env_vars: