From 0d7f35b0aeb70340885dd7890b847cb1c5be6a9c Mon Sep 17 00:00:00 2001
From: Lorenzo Caggioni <lcaggioni@google.com>
Date: Mon, 6 Jul 2020 21:58:40 +0200
Subject: [PATCH] Fix variable name based on PR feedback

---
 modules/organization/README.md    | 2 +-
 modules/organization/main.tf      | 6 +++---
 modules/organization/variables.tf | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/organization/README.md b/modules/organization/README.md
index ddb18e226..500c11afd 100644
--- a/modules/organization/README.md
+++ b/modules/organization/README.md
@@ -47,7 +47,7 @@ module "org" {
 | *policy_list* | Map of list org policies, status is true for allow, false for deny, null for restore. Values can only be used for allow or deny. | <code title="map&#40;object&#40;&#123;&#10;inherit_from_parent &#61; bool&#10;suggested_value     &#61; string&#10;status              &#61; bool&#10;values              &#61; list&#40;string&#41;&#10;&#125;&#41;&#41;">map(object({...}))</code> |  | <code title="">{}</code> |
 | *vpc_sc_access_levels_perimeters* | Access Levels -Perimeter mapping. | <code title="map&#40;list&#40;string&#41;&#41;">map(list(string))</code> |  | <code title="">{}</code> |
 | *vpc_sc_perimeters* | Set of Perimeters. | <code title="map&#40;object&#40;&#123;&#10;type &#61; string&#10;dry_run_config  &#61; object&#40;&#123;&#10;access_levels           &#61; list&#40;string&#41;&#10;restricted_services     &#61; list&#40;string&#41;&#10;vpc_accessible_services &#61; list&#40;string&#41;&#10;&#125;&#41;&#10;enforced_config &#61; object&#40;&#123;&#10;access_levels           &#61; list&#40;string&#41;&#10;restricted_services     &#61; list&#40;string&#41;&#10;vpc_accessible_services &#61; list&#40;string&#41;&#10;&#125;&#41;&#10;&#125;&#41;&#41;">map(object({...}))</code> |  | <code title="">{}</code> |
-| *vpc_sc_perimeters_projects* | Perimeter - Project Number mapping in `projects/project_number` format. | <code title="map&#40;list&#40;string&#41;&#41;">map(list(string))</code> |  | <code title="">{}</code> |
+| *vpc_sc_perimeter_projects* | Perimeter - Project Number mapping in `projects/project_number` format. | <code title="map&#40;list&#40;string&#41;&#41;">map(list(string))</code> |  | <code title="">{}</code> |
 
 ## Outputs
 
diff --git a/modules/organization/main.tf b/modules/organization/main.tf
index a7c4be38a..b6dd8f4dd 100644
--- a/modules/organization/main.tf
+++ b/modules/organization/main.tf
@@ -74,7 +74,7 @@ resource "google_access_context_manager_service_perimeter" "standard" {
   title          = each.key
   perimeter_type = each.value.type
   status {
-    resources           = formatlist("projects/%s", lookup(var.vpc_sc_perimeters_projects, each.key, []))
+    resources           = formatlist("projects/%s", lookup(var.vpc_sc_perimeter_projects, each.key, []))
     restricted_services = each.value.enforced_config.restricted_services
     access_levels       = formatlist("accessPolicies/${local.access_policy_name}/accessLevels/%s", lookup(local.perimeters_access_levels, each.key, []))
 
@@ -92,7 +92,7 @@ resource "google_access_context_manager_service_perimeter" "standard" {
     for_each = each.value.dry_run_config != [] ? [""] : []
 
     content {
-      resources           = formatlist("projects/%s", lookup(var.vpc_sc_perimeters_projects, each.key, []))
+      resources           = formatlist("projects/%s", lookup(var.vpc_sc_perimeter_projects, each.key, []))
       restricted_services = try(each.value.dry_run_config.restricted_services, null)
 
       dynamic "vpc_accessible_services" {
@@ -124,7 +124,7 @@ resource "google_access_context_manager_service_perimeter" "bridge" {
   title          = each.key
   perimeter_type = each.value.type
   status {
-    resources           = formatlist("projects/%s", lookup(var.vpc_sc_perimeters_projects, each.key, []))
+    resources           = formatlist("projects/%s", lookup(var.vpc_sc_perimeter_projects, each.key, []))
   }
 
   # Uncomment if used alongside `google_access_context_manager_service_perimeter_resource`, 
diff --git a/modules/organization/variables.tf b/modules/organization/variables.tf
index ac80690f7..8ab1eb524 100644
--- a/modules/organization/variables.tf
+++ b/modules/organization/variables.tf
@@ -108,7 +108,7 @@ variable "vpc_sc_perimeters" {
   default = {}
 }
 
-variable "vpc_sc_perimeters_projects" {
+variable "vpc_sc_perimeter_projects" {
   description = "Perimeter - Project Number mapping in `projects/project_number` format."
   type        = map(list(string))
   default     = {}