refactor: update folder hierarchy and top level folder (#14)

Author: ericyz

3-projects/single-project-example.tf renamed to 3-projects/example_single_project.tf

@@ -14,20 +14,15 @@
  * limitations under the License.
  */
 
-resource "google_folder" "single_project_folder" {
-  parent       = google_folder.app.id
-  display_name = "single-project-app"
-}
-
-module "single_project_app" {
+module "example_single_project" {
   source = "./modules/single_project"
 
   org_id                      = var.org_id
   billing_account             = var.billing_account
   impersonate_service_account = var.terraform_service_account
   environment                 = "prod"
 
-  folder_id = google_folder.single_project_folder.id
+  folder_id = module.example_team_folders.prod_folder_id
 
   # Metadata
   project_prefix   = "sample-single"

3-projects/single-project-example-optional.tf renamed to 3-projects/example_single_project_optional.tf

@@ -14,18 +14,13 @@
  * limitations under the License.
  */
 
-# resource "google_folder" "single_project_folder_optional" {
-#   parent       = google_folder.app.id
-#   display_name = "single-project-app-optional"
-# }
-
-# module "single_project_app_optional" {
+# module "example_single_project_optional" {
 #   source = "./modules/single_project"
 
-#   org_id                      = var.organization_id
+#   org_id                      = var.org_id
 #   billing_account             = var.billing_account
 #   impersonate_service_account = var.terraform_service_account
-#   folder_id = google_folder.single_project_folder_optional.id
+#   folder_id = module.example_team_folders.prod_folder_id
 #   environment = "prod"
 
 #   # Metadata

3-projects/standard-project-example-optional.tf renamed to 3-projects/example_standard_project_optional.tf

@@ -14,21 +14,15 @@
  * limitations under the License.
  */
 
-# module "standard_project_folders_optional" {
-#   source              = "./modules/folder_environments"
-#   parent_folder_id    = google_folder.app.id
-#   folder_display_name = "standard_app_example_optional"
-# }
-
-# module "standard_project_app_optional" {
+# module "example_standard_projects_optional" {
 #   source = "./modules/standard_projects"
 
-#   org_id                      = var.organization_id
+#   org_id                      = var.org_id
 #   billing_account             = var.billing_account
 #   impersonate_service_account = var.terraform_service_account
 
-#   nonprod_folder_id = module.standard_project_folders_optional.nonprod_folder_id
-#   prod_folder_id    = module.standard_project_folders_optional.prod_folder_id
+#   nonprod_folder_id = module.example_team_folders.nonprod_folder_id
+#   prod_folder_id    = module.example_team_folders.prod_folder_id
 
 #   # Metadata
 #   project_prefix   = "standard-optional"

3-projects/standard-project-example.tf renamed to 3-projects/example_standard_projects.tf

@@ -14,21 +14,15 @@
  * limitations under the License.
  */
 
-module "standard_project_folders" {
-  source              = "./modules/folder_environments"
-  parent_folder_id    = google_folder.app.id
-  folder_display_name = "standard_app_example"
-}
-
-module "standard_project_app" {
+module "example_standard_projects" {
   source = "./modules/standard_projects"
 
   org_id                      = var.org_id
   billing_account             = var.billing_account
   impersonate_service_account = var.terraform_service_account
 
-  nonprod_folder_id = module.standard_project_folders.nonprod_folder_id
-  prod_folder_id    = module.standard_project_folders.prod_folder_id
+  nonprod_folder_id = module.example_team_folders.nonprod_folder_id
+  prod_folder_id    = module.example_team_folders.prod_folder_id
 
   # Metadata
   project_prefix   = "sample-standard"

3-projects/main.tf renamed to 3-projects/folders.tf

@@ -14,7 +14,19 @@
  * limitations under the License.
  */
 
-resource "google_folder" "app" {
+/******************************************
+  Business Unit Folders
+ *****************************************/
+resource "google_folder" "example_business_unit" {
+  display_name = "example-business-unit"
   parent       = "organizations/${var.org_id}"
-  display_name = "app"
+}
+
+/******************************************
+  Team Folders
+ *****************************************/
+module "example_team_folders" {
+  source              = "./modules/folder_environments"
+  parent_folder_id    = google_folder.example_business_unit.name
+  folder_display_name = "example-team"
 }

3-projects/modules/single_project/variables.tf

@@ -66,7 +66,7 @@ variable "environment" {
 # variable "enable_networking" {
 #   description = "The flag to create subnets in shared VPC"
 #   type        = bool
-#   default     = true
+#   default     = false
 # }
 
 # variable "subnet_ip_cidr_range" {
@@ -90,10 +90,11 @@ variable "environment" {
 # variable "enable_private_dns" {
 #   type        = bool
 #   description = "The flag to create private dns zone in shared VPC"
-#   default     = true
+#   default     = false
 # }
 
 # variable "domain" {
 #   type        = string
 #   description = "The top level domain name for the organization"
+#   default     = ""
 # }

3-projects/modules/standard_projects/variables.tf

@@ -105,7 +105,7 @@ variable "activate_apis" {
 # variable "enable_private_dns" {
 #   type        = bool
 #   description = "The flag to create private dns zone in shared VPC"
-#   default     = true
+#   default     = false
 # }
 
 # variable "domain" {