feat!: add project_id as explicit input to compute_instance module (#554)

Co-authored-by: UMM KULSUM <kulsumeumm@google.com>

Author: Umm-E-Kulsum

examples/compute_instance/disk_snapshot/main.tf

@@ -61,6 +61,7 @@ module "compute_instance" {
   source  = "terraform-google-modules/vm/google//modules/compute_instance"
   version = "~> 13.0"
 
+  project_id        = var.project_id
   region            = var.region
   subnetwork        = var.subnetwork
   num_instances     = 1

examples/compute_instance/simple/main.tf

@@ -29,6 +29,7 @@ module "compute_instance" {
   source  = "terraform-google-modules/vm/google//modules/compute_instance"
   version = "~> 13.0"
 
+  project_id          = var.project_id
   region              = var.region
   zone                = var.zone
   subnetwork          = var.subnetwork

examples/confidential_computing/main.tf

@@ -91,6 +91,7 @@ module "compute_instance" {
   source  = "terraform-google-modules/vm/google//modules/compute_instance"
   version = "~> 13.0"
 
+  project_id          = var.project_id
   region              = var.region
   subnetwork          = var.subnetwork
   hostname            = "confidential-encrypted-instance"

examples/confidential_computing_intel/main.tf

@@ -91,6 +91,7 @@ module "compute_instance" {
   source  = "terraform-google-modules/vm/google//modules/compute_instance"
   version = "~> 13.0"
 
+  project_id          = var.project_id
   region              = var.region
   subnetwork          = var.subnetwork
   hostname            = "confidential-intel-encrypted"

modules/compute_instance/README.md

@@ -26,6 +26,7 @@ See the [simple](https://github.com/terraform-google-modules/terraform-google-vm
 | labels | (Optional) Labels to override those from the template, provided as a map | `map(string)` | `null` | no |
 | network | Network to deploy to. Only one of network or subnetwork should be specified. | `string` | `""` | no |
 | num\_instances | Number of instances to create. This value is ignored if static\_ips is provided. | `number` | `"1"` | no |
+| project\_id | The ID of the project in which the compute instance will be created. | `string` | n/a | yes |
 | region | Region where the instances should be created. | `string` | `null` | no |
 | resource\_manager\_tags | (Optional) A tag is a key-value pair that can be attached to a Google Cloud resource. You can use tags to conditionally allow or deny policies based on whether a resource has a specific tag. This value is not returned by the API. In Terraform, this value cannot be updated and changing it will recreate the resource. | `map(string)` | `null` | no |
 | resource\_policies | (Optional) A list of short names or self\_links of resource policies to attach to the instance. Modifying this list will cause the instance to recreate. Currently a max of 1 resource policy is supported. | `list(string)` | `[]` | no |

modules/compute_instance/main.tf

@@ -22,7 +22,6 @@ locals {
   # at the end of the list to work around "list does not have any elements so cannot
   # determine type" error when var.static_ips is empty
   static_ips = concat(var.static_ips, ["NOT_AN_IP"])
-  project_id = length(regexall("/projects/([^/]*)", var.instance_template)) > 0 ? flatten(regexall("/projects/([^/]*)", var.instance_template))[0] : null
 
   # When no network or subnetwork has been defined, we want to use the settings from
   # the template instead.
@@ -34,7 +33,7 @@ locals {
 ###############
 
 data "google_compute_zones" "available" {
-  project = local.project_id
+  project = var.project_id
   region  = var.region
 }
 
@@ -46,7 +45,7 @@ resource "google_compute_instance_from_template" "compute_instance" {
   provider            = google
   count               = local.num_instances
   name                = var.add_hostname_suffix ? format("%s%s%s", local.hostname, var.hostname_suffix_separator, format("%03d", count.index + 1)) : local.hostname
-  project             = local.project_id
+  project             = var.project_id
   zone                = var.zone == null ? data.google_compute_zones.available.names[count.index % length(data.google_compute_zones.available.names)] : var.zone
   deletion_protection = var.deletion_protection
   resource_policies   = var.resource_policies

modules/compute_instance/metadata.display.yaml

@@ -63,6 +63,9 @@ spec:
           name: num_instances
           title: Num Instances
           level: 1
+        project_id:
+          name: project_id
+          title: Project Id
         region:
           name: region
           title: Region

modules/compute_instance/metadata.yaml

@@ -82,6 +82,10 @@ spec:
         location: examples/compute_instance/tags
   interfaces:
     variables:
+      - name: project_id
+        description: The ID of the project in which the compute instance will be created.
+        varType: string
+        required: true
       - name: network
         description: Network to deploy to. Only one of network or subnetwork should be specified.
         varType: string

modules/compute_instance/variables.tf

@@ -14,6 +14,11 @@
  * limitations under the License.
  */
 
+variable "project_id" {
+  description = "The ID of the project in which the compute instance will be created."
+  type        = string
+}
+
 variable "network" {
   description = "Network to deploy to. Only one of network or subnetwork should be specified."
   type        = string