fix: make org id optional (#838)

Co-authored-by: Andrew Peabody <[email protected]>

README.md

@@ -150,7 +150,7 @@ determining that location is as follows:
 | language\_tag | Language code to be used for essential contacts notifications | `string` | `"en-US"` | no |
 | lien | Add a lien on the project to prevent accidental deletion | `bool` | `false` | no |
 | name | The name for the project | `string` | n/a | yes |
-| org\_id | The organization ID. | `string` | n/a | yes |
+| org\_id | The organization ID. | `string` | `null` | no |
 | project\_id | The ID to give the project. If not provided, the `name` will be used. | `string` | `""` | no |
 | project\_sa\_name | Default service account name for the project. | `string` | `"project-service-account"` | no |
 | random\_project\_id | Adds a suffix of 4 random characters to the `project_id`. | `bool` | `false` | no |

main.tf

@@ -34,7 +34,7 @@ module "project-factory" {
   manage_group                       = var.group_name != "" ? true : false
   random_project_id                  = var.random_project_id
   random_project_id_length           = var.random_project_id_length
-  org_id                             = var.org_id
+  org_id                             = var.folder_id != "" ? null : var.org_id
   name                               = var.name
   project_id                         = var.project_id
   shared_vpc                         = var.svpc_host_project_id

modules/core_project_factory/variables.tf

@@ -59,6 +59,7 @@ variable "random_project_id_length" {
 variable "org_id" {
   description = "The organization ID."
   type        = string
+  default     = null
 }
 
 variable "name" {

variables.tf

@@ -29,6 +29,7 @@ variable "random_project_id_length" {
 variable "org_id" {
   description = "The organization ID."
   type        = string
+  default     = null
 }
 
 variable "domain" {