removed sub-module. Added in core_projectfactory

Author: imrannayer

README.md

@@ -29,7 +29,7 @@ There are multiple examples included in the [examples](./examples/) folder but s
 ```hcl
 module "project-factory" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 15.0"
+  version = "~> 16.0"
 
   name                 = "pf-test-1"
   random_project_id    = true
@@ -132,7 +132,6 @@ determining that location is as follows:
 | budget\_display\_name | The display name of the budget. If not set defaults to `Budget For <projects[0]|All Projects>` | `string` | `null` | no |
 | budget\_labels | A single label and value pair specifying that usage from only this set of labeled resources should be included in the budget. | `map(string)` | `{}` | no |
 | budget\_monitoring\_notification\_channels | A list of monitoring notification channels in the form `[projects/{project_id}/notificationChannels/{channel_id}]`. A maximum of 5 channels are allowed. | `list(string)` | `[]` | no |
-| cloud\_armor\_tier | Managed protection tier to be set. Possible values are: CA\_STANDARD, CA\_ENTERPRISE\_PAYGO. If not set, then project will be set to default Standard protection | `string` | `null` | no |
 | consumer\_quotas | The quotas configuration you want to override for the project. | <pre>list(object({<br>    service    = string,<br>    metric     = string,<br>    dimensions = map(string),<br>    limit      = string,<br>    value      = string,<br>  }))</pre> | `[]` | no |
 | create\_project\_sa | Whether the default service account for the project shall be created | `bool` | `true` | no |
 | default\_network\_tier | Default Network Service Tier for resources created in this project. If unset, the value will not be modified. See https://cloud.google.com/network-tiers/docs/using-network-service-tiers and https://cloud.google.com/network-tiers. | `string` | `""` | no |
@@ -174,7 +173,6 @@ determining that location is as follows:
 | api\_s\_account | API service account email |
 | api\_s\_account\_fmt | API service account email formatted for terraform use |
 | budget\_name | The name of the budget if created |
-| cloud\_armor\_tier | Managed protection tier to be set. If not set, then project will be set to default Standard protection |
 | domain | The organization's domain |
 | enabled\_api\_identities | Enabled API identities in the project |
 | enabled\_apis | Enabled APIs in the project |

main.tf

@@ -129,13 +129,3 @@ module "essential_contacts" {
   essential_contacts = var.essential_contacts
   language_tag       = var.language_tag
 }
-
-/******************************************
-  Cloud Armor tier of the project
- *****************************************/
-module "cloud_armor_tier" {
-  source = "./modules/cloud_armor_tier"
-
-  project_id       = module.project-factory.project_id
-  cloud_armor_tier = var.cloud_armor_tier
-}

modules/cloud_armor_tier/README.md

@@ -388,3 +388,14 @@ resource "google_tags_tag_binding" "bindings" {
   parent    = "//cloudresourcemanager.googleapis.com/projects/${google_project.main.number}"
   tag_value = "tagValues/${each.value}"
 }
+
+/******************************************
+  Cloud Armor tier of the project
+ *****************************************/
+
+resource "google_compute_project_cloud_armor_tier" "cloud_armor_tier_config" {
+  count = var.cloud_armor_tier == null ? 0 : 1
+
+  project          = var.project_id
+  cloud_armor_tier = var.cloud_armor_tier
+}

modules/cloud_armor_tier/main.tf

@@ -105,3 +105,8 @@ output "usage_report_export_bucket" {
   description = "GCE usage reports bucket"
   value       = try(google_project_usage_export_bucket.usage_report_export[0], null)
 }
+
+output "cloud_armor_tier" {
+  description = "Cloud Armor tier for the project"
+  value       = var.cloud_armor_tier
+}

modules/cloud_armor_tier/outputs.tf

@@ -270,3 +270,9 @@ variable "tag_binding_values" {
   type        = list(string)
   default     = []
 }
+
+variable "cloud_armor_tier" {
+  description = "Managed protection tier to be set. Possible values are: CA_STANDARD, CA_ENTERPRISE_PAYGO"
+  type        = string
+  default     = null
+}

modules/cloud_armor_tier/variables.tf

@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.22, < 6"
+      version = ">= 5.33, < 6"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.22, < 6"
+      version = ">= 5.33, < 6"
     }
     null = {
       source  = "hashicorp/null"

modules/cloud_armor_tier/versions.tf

@@ -108,8 +108,3 @@ output "usage_report_export_bucket" {
   description = "GCE usage reports bucket"
   value       = module.project-factory.usage_report_export_bucket
 }
-
-output "cloud_armor_tier" {
-  description = "Managed protection tier to be set. If not set, then project will be set to default Standard protection"
-  value       = var.cloud_armor_tier
-}

modules/core_project_factory/main.tf

@@ -359,9 +359,3 @@ variable "tag_binding_values" {
   type        = list(string)
   default     = []
 }
-
-variable "cloud_armor_tier" {
-  description = "Managed protection tier to be set. Possible values are: CA_STANDARD, CA_ENTERPRISE_PAYGO. If not set, then project will be set to default Standard protection"
-  type        = string
-  default     = null
-}