Promote DRG to top level module (#92)

* WIP - feat: add support for private DNS

* WIP - feat promote DRG to top-level module

* drg submoduled exported to a new top level module

Author: snafuz

CHANGELOG.adoc

@@ -14,8 +14,16 @@ Given a version number MAJOR.MINOR.PATCH:
 - MINOR version when adding functionality in a backwards compatible manner,
 - PATCH version when making backwards compatible bug fixes.
 
-== 3.3.0 (unreleased)
+== 4.0.0 (not released)
+* removed DRG submodule, now promoted to terraform-oci-drg module (feat: )
+* updated examples to use GitHub repo as source ()
+
+== 3.4.0 (March 27, 2022)
+* Replaced required provider hashicorp/oci --> oracle/oci 
+
+== 3.3.0 (March 18, 2022)
 * Added support for Defined Tags (fixes #73)
+* Fixed route tables with drg destination (fixes #80)
 
 == v3.2.0 (January 19, 2022)
 

CONTRIBUTORS.adoc

@@ -5,7 +5,7 @@
 _maintainers have admin access and can merge code to main_
 
 - https://github.com/hyder[@hyder]
-- https://github.com/markxnelson[@markxnelson]
+- https://github.com/snafuz[@snafuz]
 
 === CONTRIBUTORS
 

README.adoc

@@ -40,8 +40,6 @@ It creates the following resources:
 * An optional internet gateway and a route table
 * An optional NAT gateway and a route table
 * An optional service gateway
-* An optional dynamic routing gateway _[Deprecated; use the [drg submodule](modules/drg/README.md) instead]_
-* An optional remote peering connection _[Deprecated; use the [drg submodule](modules/drg/README.md) instead]_
 * One or more optional Local Peering Gateways in requestor or acceptor mode, and possibilities to associate a Route Table
 
 It also controls the Default Security List, with a *Lockdown mode* that can be enabled or disabled

README.md

@@ -8,8 +8,6 @@ It creates the following resources:
 * An optional internet gateway and a route table
 * An optional NAT gateway
 * An optional service gateway
-* An optional dynamic routing gateway _[Deprecated; use [drg submodule](modules/drg/README.md) instead]_
-* An optional remote peering connection _[Deprecated; use [drg submodule](modules/drg/README.md) instead]_
 * One or more optional Local Peering Gateways in requestor or acceptor mode, and possibilities to associate a Route Table
 
 It also controls the Default Security List, with a *Lockdown mode* that can be enabled or disabled.

docs/quickstart.adoc

@@ -100,6 +100,7 @@ variable "user_id" {
 * `create_nat_gateway`
 * `create_service_gateway`
 * `freeform_tags`
+* `attached_drg_id`
 
 . Run Terraform:
 
@@ -164,11 +165,12 @@ cp terraform.tfvars.example terraform.tfvars
 
 . Optional parameters to override:
 
-* `create_drg`
+* `attached_drg_id`
 * `create_internet_gateway`
 * `create_nat_gateway`
 * `create_service_gateway`
 * `freeform_tags`
+* `defined_tags`
 
 . Run Terraform:
 +

docs/routing_rules.adoc

@@ -82,7 +82,7 @@ They share the same schema but each Input Variable controls the associated route
 
 For routing rules targeting a Gateway created by the module, `network_entity_id` accepts some special strings to automatically retrieve the gateway ocid.
 
-- `internet_gateway_route_rules` and `nat_gateway_route_rules` recognise the `"drg"` string and resolve it to the DRG ocid created by the module,
+- `internet_gateway_route_rules` and `nat_gateway_route_rules` recognise the `"drg"` string and resolve it to the DRG ocid attached to the module (if available),
 - `internet_gateway_route_rules` recognise the `"internet_gateway"` string and resolve it to the Internet Gateway ocid created by the module,
 - `nat_gateway_route_rules` recognise the `"nat_gateway"` string and resolve it to the NAT Gateway ocid created by the module.
 

docs/terraformoptions.adoc

@@ -88,10 +88,10 @@ defined_tags = {
 |Type
 |Default
 
-|`create_drg`
-|Deprecated: Use drg sub-module instead. whether to create Dynamic Routing Gateway. If set to true, creates a Dynamic Routing Gateway.
-|`boolean`
-|false
+|`attached_drg_id`
+|DRG OCID to be attached to the VCN.
+|`string`
+|null
 
 |`create_internet_gateway`
 |Whether to create an internet gateway.
@@ -108,11 +108,6 @@ defined_tags = {
 |`boolean`
 |false
 
-|`drg_display_name`
-|Deprecated: Use drg sub-module instead. (Updatable) Name of Dynamic Routing Gateway. Does not have to be unique.
-|`string`
-|"drg"
-
 |`enable_ipv6`
 |(Updatable) Whether IPv6 is enabled for the VCN. If enabled, Oracle will assign the VCN a IPv6 /56 CIDR block.
 |`boolean`

examples/custom_route_rules/.terraform.lock.hcl

@@ -17,7 +17,7 @@ terraform {
 
 module "vcn" {
 
-  source = "../../"
+  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"
   # version = "specify_version_number"
@@ -29,7 +29,6 @@ module "vcn" {
   defined_tags = var.defined_tags
 
   # vcn parameters
-  create_drg               = var.create_drg               # boolean: true or false
   create_internet_gateway  = var.create_internet_gateway  # boolean: true or false
   lockdown_default_seclist = var.lockdown_default_seclist # boolean: true or false
   create_nat_gateway       = var.create_nat_gateway       # boolean: true or false
@@ -40,10 +39,10 @@ module "vcn" {
   vcn_name                 = var.vcn_name
 
   # gateways parameters
-  drg_display_name              = var.drg_display_name
   internet_gateway_display_name = var.internet_gateway_display_name
   nat_gateway_display_name      = var.nat_gateway_display_name
   service_gateway_display_name  = var.service_gateway_display_name
+  attached_drg_id               = var.attached_drg_id
 
   # routing rules
 
@@ -63,7 +62,6 @@ resource "oci_core_local_peering_gateway" "lpg" {
 output "module_vcn" {
   description = "vcn and gateways information"
   value = {
-    drg_id              = module.vcn.drg_id
     internet_gateway_id = module.vcn.internet_gateway_id
     nat_gateway_id      = module.vcn.nat_gateway_id
     service_gateway_id  = module.vcn.service_gateway_id

examples/custom_route_rules/main.tf

@@ -21,7 +21,6 @@ label_prefix = "dev"
 
 # vcn parameters
 
-create_drg = false
 
 create_internet_gateway = false
 
@@ -37,6 +36,8 @@ vcn_dns_label = "vcn"
 
 vcn_name = "vcn"
 
+attached_drg_id = "ocid1.drg.oc1.aaaaaa" # edit this OCID
+
 freeform_tags = {
   environment = "dev"
   lob         = "finance"
@@ -53,13 +54,13 @@ internet_gateway_route_rules = [ # this module input shows how to pass routing i
     destination       = "192.168.0.0/16" # Route Rule Destination CIDR
     destination_type  = "CIDR_BLOCK"     # only CIDR_BLOCK is supported at the moment
     network_entity_id = "drg"            # for internet_gateway_route_rules input variable, you can use special strings "drg", "internet_gateway" or pass a valid OCID using string or any Named Values
-    description       = "Terraformed - User added Routing Rule: To drg created by this module. drg_id is automatically retrieved with keyword drg"
+    description       = "Terraformed - User added Routing Rule: To drg provided to this module. drg_id, if available, is automatically retrieved with keyword drg"
   },
   {
     destination       = "172.16.0.0/16"
     destination_type  = "CIDR_BLOCK"
     network_entity_id = "drg"
-    description       = "Terraformed - User added Routing Rule: To drg created by this module. drg_id is automatically retrieved with keyword drg"
+    description       = "Terraformed - User added Routing Rule: To drg provided to this module. drg_id, if available, is automatically retrieved with keyword drg"
   },
   {
     destination       = "203.0.113.0/24" # rfc5737 (TEST-NET-3)