improve naming for RPCs (#13)

Author: snafuz

drg.tf

@@ -48,7 +48,7 @@ resource "oci_core_remote_peering_connection" "rpcs" {
   for_each       = var.remote_peering_connections != null ? var.remote_peering_connections : {}
   compartment_id = var.compartment_id
   drg_id         = var.drg_id == null ? oci_core_drg.drg[0].id : var.drg_id
-  display_name   = var.label_prefix == "none" ? each.key : "${var.label_prefix}-${each.key}"
+  display_name   = each.key
 
   freeform_tags = var.freeform_tags
   defined_tags  = var.defined_tags

examples/rpc/main.tf

@@ -85,7 +85,7 @@ module "drg_acceptor" {
   drg_display_name = "drg-rpc-acceptor"
 
   # rpc parameters
-  remote_peering_connections = { "rpc_acceptor" = {} }
+  remote_peering_connections = { "${var.rpc_name_acceptor}"  = {} }
 
   providers = {
     oci = oci.acceptor
@@ -168,8 +168,8 @@ module "drg_requestor" {
 
   # rpc parameters
   remote_peering_connections = {
-    "rpc_requestor" = {
-      "rpc_acceptor_id"     = module.drg_acceptor.rpc_all_attributes["rpc_acceptor"].id,
+   "${var.rpc_name_requestor}" = {
+      "rpc_acceptor_id"     = module.drg_acceptor.rpc_all_attributes["${var.rpc_name_acceptor}"].id,
       "rpc_acceptor_region" = var.region_acceptor
     }
   }

examples/rpc/variables.tf

@@ -56,7 +56,11 @@ variable "defined_tags" {
 }
 
 # acceptor parameters
-
+variable "rpc_name_acceptor" {
+  description = "Name for RPC acceptor"
+  type = string
+  default     = "rpc_acceptor"
+}
 variable "region_acceptor" {
   description = "the oci region where RPC acceptor resources will be created"
   type        = string
@@ -71,6 +75,11 @@ variable "vcn_cidrs_acceptor" {
 }
 
 # requestor parameter
+variable "rpc_name_requestor" {
+  description = "Name for RPC requestor"
+  type = string
+  default     = "rpc_requestor"
+}
 
 variable "region_requestor" {
   description = "OCI region where RPC requstor resources will be created"

terraform.tfvars.example

@@ -36,10 +36,13 @@ drg_vcn_attachments = null
 
 # rpc parameters
 remote_peering_connections = null 
-
+#
+# map of remote peering connections
+# - key-only items represent represent local acceptors with no info about the remote peer
+# - items containing key and values represent local requestor and must have the OCID and region of the remote acceptor
 #remote_peering_connections = {
-#    "rpc1" : {}
-#    "rpc2" : {
+#    "rpc_name_1" : {}
+#    "rpc_name_2" : {
 #        "rpc_acceptor_id" : "ocid1.remotepeeringconnection.oc1.aaaaaa" # <-- edit this OCID
 #        "rpc_acceptor_region" : "us-ashburn-1" <-- replace the region
 #    }

variables.tf

@@ -57,8 +57,11 @@ variable "drg_id" {
 }
 
 # rpc parameters
+# map of remote peering connections
+# - key-only items represent represent local acceptors with no info about the remote peer
+# - items containing key and values represent local requestor and must have the OCID and region of the remote acceptor
 variable "remote_peering_connections" {
-  description = "List of parameters to add and optionally peer remote peering connections"
+  description = "List of parameters to add and optionally peer to remote peering connections"
   type        = map(any)
   default     = null
 }