Merge pull request #125 from terraform-google-modules/aaron-lane/fix-…

…disable-services-on-destroy Add missing disable_services_on_destroy
terraform-google-modules · Jan 22, 2019 · 7c10cb3 · 7c10cb3
2 parents 8da0d62 + 4bf1b76
commit 7c10cb3
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.0.1
+
+### FIXED
+
+- Replaced missing forward of `var.disable_services_on_destroy` from `root` module to `core_project_factory` module.
+
 ## 1.0.0
 1.0.0 is a major backwards incompatible release. See the [upgrade guide](./docs/upgrading_to_project_factory_v1.0.md) for details.
 

diff --git a/main.tf b/main.tf
@@ -28,25 +28,26 @@ module "gsuite_group" {
 module "project-factory" {
   source = "modules/core_project_factory"
 
-  group_email         = "${module.gsuite_group.email}"
-  group_role          = "${var.group_role}"
-  lien                = "${var.lien}"
-  manage_group        = "${var.group_name != "" ? "true" : "false"}"
-  random_project_id   = "${var.random_project_id}"
-  org_id              = "${var.org_id}"
-  name                = "${var.name}"
-  shared_vpc          = "${var.shared_vpc}"
-  billing_account     = "${var.billing_account}"
-  folder_id           = "${var.folder_id}"
-  sa_role             = "${var.sa_role}"
-  activate_apis       = "${var.activate_apis}"
-  usage_bucket_name   = "${var.usage_bucket_name}"
-  usage_bucket_prefix = "${var.usage_bucket_prefix}"
-  credentials_path    = "${var.credentials_path}"
-  shared_vpc_subnets  = "${var.shared_vpc_subnets}"
-  labels              = "${var.labels}"
-  bucket_project      = "${var.bucket_project}"
-  bucket_name         = "${var.bucket_name}"
-  auto_create_network = "${var.auto_create_network}"
-  app_engine          = "${var.app_engine}"
+  group_email                 = "${module.gsuite_group.email}"
+  group_role                  = "${var.group_role}"
+  lien                        = "${var.lien}"
+  manage_group                = "${var.group_name != "" ? "true" : "false"}"
+  random_project_id           = "${var.random_project_id}"
+  org_id                      = "${var.org_id}"
+  name                        = "${var.name}"
+  shared_vpc                  = "${var.shared_vpc}"
+  billing_account             = "${var.billing_account}"
+  folder_id                   = "${var.folder_id}"
+  sa_role                     = "${var.sa_role}"
+  activate_apis               = "${var.activate_apis}"
+  usage_bucket_name           = "${var.usage_bucket_name}"
+  usage_bucket_prefix         = "${var.usage_bucket_prefix}"
+  credentials_path            = "${var.credentials_path}"
+  shared_vpc_subnets          = "${var.shared_vpc_subnets}"
+  labels                      = "${var.labels}"
+  bucket_project              = "${var.bucket_project}"
+  bucket_name                 = "${var.bucket_name}"
+  auto_create_network         = "${var.auto_create_network}"
+  app_engine                  = "${var.app_engine}"
+  disable_services_on_destroy = "${var.disable_services_on_destroy}"
 }