add support for multiple RPCs (#11)

* add support for multiple RPCs

* OCA requirement

Author: snafuz

drg.tf

@@ -44,20 +44,16 @@ resource "oci_core_drg_attachment" "vcns" {
   remove_export_drg_route_distribution_trigger = false # (Optional) (Updatable) boolean
 }
 
-resource "oci_core_remote_peering_connection" "rpc" {
-
+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" ? "rpc_created_from_${var.drg_display_name}" : "${var.label_prefix}_rpc"
+  display_name   = var.label_prefix == "none" ? each.key : "${var.label_prefix}-${each.key}"
 
   freeform_tags = var.freeform_tags
   defined_tags  = var.defined_tags
 
-
-  peer_id          = var.rpc_acceptor_id
-  peer_region_name = var.rpc_acceptor_region
-
-  count = var.create_rpc == true ? 1 : 0
+  peer_id          = can(each.value.rpc_acceptor_id) == false ? null : each.value.rpc_acceptor_id
+  peer_region_name = can(each.value.rpc_acceptor_region) == false ? null : each.value.rpc_acceptor_region
 
 }
-

examples/rpc/main.tf

@@ -85,7 +85,7 @@ module "drg_acceptor" {
   drg_display_name = "drg-rpc-acceptor"
 
   # rpc parameters
-  create_rpc = true
+  remote_peering_connections = { "rpc_acceptor" = {} }
 
   providers = {
     oci = oci.acceptor
@@ -95,7 +95,7 @@ module "drg_acceptor" {
 
 module "vcn_requestor" {
   # this module use the generic vcn module and configure it to act as rpc requestor vcn
-  
+
   source = "github.com/oracle-terraform-modules/terraform-oci-vcn"
   # to use the terraform registry version comment the previous line and uncomment the 2 lines below
   # source  = "oracle-terraform-modules/vcn/oci"
@@ -167,9 +167,12 @@ module "drg_requestor" {
   drg_display_name = "drg-rpc-requestor"
 
   # rpc parameters
-  create_rpc          = true
-  rpc_acceptor_id     = module.drg_acceptor.rpc_id
-  rpc_acceptor_region = var.region_acceptor
+  remote_peering_connections = {
+    "rpc_requestor" = {
+      "rpc_acceptor_id"     = module.drg_acceptor.rpc_all_attributes["rpc_acceptor"].id,
+      "rpc_acceptor_region" = var.region_acceptor
+    }
+  }
 
   providers = {
     oci = oci.requestor

outputs.tf

@@ -31,28 +31,20 @@ output "drg_summary" {
       vcn_attachments = { for k, v in oci_core_drg_attachment.vcns : k => v.network_details[0].id }
 
     }
-    "rpc" = {
-      display_name = join(",", oci_core_remote_peering_connection.rpc[*].display_name)
-      rpc_id       = join(",", oci_core_remote_peering_connection.rpc[*].id)
-    }
   }
 }
 
-
-output "rpc_id" {
-  description = "id of RPC if it is created"
-  value       = join(",", oci_core_remote_peering_connection.rpc[*].id)
-}
-
-output "rpc_display_name" {
-  description = "display name of RPC if it is created"
-  value       = join(",", oci_core_remote_peering_connection.rpc[*].display_name)
+# RPCS
+output "rpc_ids" {
+  description = "IDs of created RPCs"
+  value = values(oci_core_remote_peering_connection.rpcs)[*].id
 }
 
 output "rpc_all_attributes" {
-  description = "all attributes of created RPC"
-  value       = { for k, v in oci_core_remote_peering_connection.rpc : k => v }
+  description = "all attributes of created RPCs"
+  value       = { for k, v in oci_core_remote_peering_connection.rpcs : k => v }
 }
 
 
 
+

terraform.tfvars.example

@@ -35,9 +35,13 @@ drg_vcn_attachments = null
 
 
 # rpc parameters
-
-create_rpc = false
-rpc_acceptor_id = null
-rpc_acceptor_region = null
-
+remote_peering_connections = null 
+
+#remote_peering_connections = {
+#    "rpc1" : {}
+#    "rpc2" : {
+#        "rpc_acceptor_id" : "ocid1.remotepeeringconnection.oc1.aaaaaa" # <-- edit this OCID
+#        "rpc_acceptor_region" : "us-ashburn-1" <-- replace the region
+#    }
+#}
 

variables.tf

@@ -57,23 +57,12 @@ variable "drg_id" {
 }
 
 # rpc parameters
-variable "create_rpc" {
-  description = "Whether to create Remote Peering Connection. If set to true, creates an RPC"
-  type        = bool
-  default     = false
-}
-
-variable "rpc_acceptor_id" {
-  description = "the ID of the remote RPC"
-  type        = string
-  default     = null
-}
-variable "rpc_acceptor_region" {
-  # List of regions: https://docs.cloud.oracle.com/iaas/Content/General/Concepts/regions.htm#ServiceAvailabilityAcrossRegions
-  description = "the OCI region where the Remote Peering Connection will be established with"
-  type        = string
+variable "remote_peering_connections" {
+  description = "List of parameters to add and optionally peer remote peering connections"
+  type        = map(any)
   default     = null
 }
 
 
 
+