cosmetic renaming, reordering of bastion and admin variables to a more standard naming and ordering convention

Signed-off-by: Ali Mukadam <[email protected]>

Author: hyder

locals.tf

@@ -18,7 +18,7 @@ locals {
     region       = var.oci_base_general.region
   }
 
-  oci_bastion_infra = {
+  oci_bastion_network = {
     ad_names             = data.template_file.ad_names.*.rendered
     availability_domains = var.oci_base_bastion.availability_domains
     ig_route_id          = module.vcn.ig_route_id

main.tf

@@ -10,7 +10,7 @@ module "bastion" {
   source                   = "./modules/bastion"
   oci_base_identity        = var.oci_base_identity
   oci_bastion_general      = local.oci_bastion_general
-  oci_bastion_infra        = local.oci_bastion_infra
+  oci_bastion_network        = local.oci_bastion_network
   oci_bastion              = local.oci_bastion
   oci_bastion_notification = local.oci_bastion_notification
 }

modules/bastion/compute.tf

@@ -2,7 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 resource "oci_core_instance" "bastion" {
-  availability_domain = element(var.oci_bastion_infra.ad_names, (var.oci_bastion_infra.availability_domains - 1))
+  availability_domain = element(var.oci_bastion_network.ad_names, (var.oci_bastion_network.availability_domains - 1))
   compartment_id      = var.oci_base_identity.compartment_id
 
   create_vnic_details {

modules/bastion/datasources.tf

@@ -82,7 +82,7 @@ data "template_cloudinit_config" "bastion" {
 
 # Gets a list of VNIC attachments on the bastion instance
 data "oci_core_vnic_attachments" "bastion_vnics_attachments" {
-  availability_domain = element(var.oci_bastion_infra.ad_names, (var.oci_bastion_infra.availability_domains - 1))
+  availability_domain = element(var.oci_bastion_network.ad_names, (var.oci_bastion_network.availability_domains - 1))
   compartment_id      = var.oci_base_identity.compartment_id
   instance_id         = oci_core_instance.bastion[0].id
   depends_on          = [oci_core_instance.bastion]

modules/bastion/security.tf

@@ -4,7 +4,7 @@
 resource "oci_core_security_list" "bastion" {
   compartment_id = var.oci_base_identity.compartment_id
   display_name   = "${var.oci_bastion_general.label_prefix}-bastion"
-  vcn_id         = var.oci_bastion_infra.vcn_id
+  vcn_id         = var.oci_bastion_network.vcn_id
 
   egress_security_rules {
     protocol    = local.all_protocols

modules/bastion/subnets.tf

@@ -3,13 +3,13 @@
 
 resource "oci_core_subnet" "bastion" {
   compartment_id             = var.oci_base_identity.compartment_id
-  cidr_block                 = cidrsubnet(var.oci_bastion_infra.vcn_cidr, var.oci_bastion_infra.newbits, var.oci_bastion_infra.netnum)
+  cidr_block                 = cidrsubnet(var.oci_bastion_network.vcn_cidr, var.oci_bastion_network.newbits, var.oci_bastion_network.netnum)
   display_name               = "${var.oci_bastion_general.label_prefix}-bastion"
   dns_label                  = "bastion"
   prohibit_public_ip_on_vnic = false
-  route_table_id             = var.oci_bastion_infra.ig_route_id
+  route_table_id             = var.oci_bastion_network.ig_route_id
   security_list_ids          = [oci_core_security_list.bastion[0].id]
-  vcn_id                     = var.oci_bastion_infra.vcn_id
+  vcn_id                     = var.oci_bastion_network.vcn_id
 
   count = var.oci_bastion.bastion_enabled == true ? 1 : 0
 }

modules/bastion/variables.tf

@@ -25,7 +25,7 @@ variable "oci_bastion_general" {
 
 # bastion
 
-variable "oci_bastion_infra" {
+variable "oci_bastion_network" {
   type = object({
     ad_names             = list(string)
     availability_domains = number