Fixes after review.

GoogleCloudPlatform · Jan 13, 2023 · a61354f · a61354f
1 parent 3674b7e
commit a61354f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 20 deletions.
diff --git a/mmv1/products/compute/api.yaml b/mmv1/products/compute/api.yaml
@@ -8928,6 +8928,7 @@ objects:
             properties:
             - !ruby/object:Api::Type::String
               name: 'projectId'
+              required: true
               description: |
                 The project id/number should be the same as the key of this project config in the project map.
   - !ruby/object:Api::Resource

diff --git a/mmv1/products/compute/terraform.yaml b/mmv1/products/compute/terraform.yaml
@@ -1782,6 +1782,10 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         vars:
           group_name: "soletenant-group"
           template_name: "soletenant-tmpl"
+          guest_project_id: "project-id"
+          guest_project_name: "project-name"
+        test_env_vars:
+          org_id: :ORG_ID
     properties:
       zone: !ruby/object:Overrides::Terraform::PropertyOverride
         required: false
@@ -1804,15 +1808,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         default_from_api: true
       shareSettings: !ruby/object:Overrides::Terraform::PropertyOverride
         default_from_api: true
-        ignore_read: true
-      shareSettings.shareType: !ruby/object:Overrides::Terraform::PropertyOverride
-        default_from_api: true
-      shareSettings.projectMap: !ruby/object:Overrides::Terraform::PropertyOverride
-        key_description: |
-          The project ID.
-      shareSettings.projectMap.projectId: !ruby/object:Overrides::Terraform::PropertyOverride
-        description: |
-          The project id/number, should be same as the key of this project config in the project map.
     custom_code: !ruby/object:Provider::Terraform::CustomCode
       pre_create: templates/terraform/pre_create/compute_node_group_url_replace.go.erb
   NodeTemplate: !ruby/object:Overrides::Terraform::ResourceOverride

diff --git a/mmv1/templates/terraform/examples/node_group_share_settings.tf.erb b/mmv1/templates/terraform/examples/node_group_share_settings.tf.erb
@@ -1,25 +1,16 @@
-resource "google_project" "owner_project" {
-  project_id      = "tf-test%{random_suffix}"
-  name            = "tf-test%{random_suffix}"
-  org_id          = "<%= ctx[:test_env_vars]['org_id'] %>"
-  billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>"
-}
-
 resource "google_project" "guest_project" {
-  project_id      = "tf-test-2%{random_suffix}"
-  name            = "tf-test-2%{random_suffix}"
+  project_id      = "<%= ctx[:vars]['guest_project_id'] %>"
+  name            = "<%= ctx[:vars]['guest_project_name'] %>"
   org_id          = "<%= ctx[:test_env_vars]['org_id'] %>"
 }
 
 resource "google_compute_node_template" "soletenant-tmpl" {
-  project = google_project.owner_project.project_id
   name      = "<%= ctx[:vars]['template_name'] %>"
   region    = "us-central1"
   node_type = "n1-node-96-624"
 }
 
 resource "google_compute_node_group" "<%= ctx[:primary_resource_id] %>" {
-  project = google_project.owner_project.project_id
   name        = "<%= ctx[:vars]['group_name'] %>"
   zone        = "us-central1-f"
   description = "example google_compute_node_group for Terraform Google Provider"