Merge pull request #6 from byu-oit/update-non-oit

Update for non oit accounts

.gitignore

@@ -27,3 +27,5 @@ override.tf.json
 
 # Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
 # example: *tfplan*
+
+.idea

README.md

@@ -35,7 +35,7 @@ provider "aws" {
 }
 
 module "bastion" {
-  source            = "[email protected]:byu-oit/terraform-aws-bastion.git?ref=v1.1.0"
+  source            = "[email protected]:byu-oit/terraform-aws-bastion.git?ref=v1.1.1"
   env               = "prd"
   vpc_vpn_to_campus = true
   netid             = "mynetid"
@@ -70,6 +70,7 @@ The bastion is really intended to be ephemeral (spin it up, use it, tear it down
 ## Input
 | Name | Description | Default Value |
 | --- | --- | --- |
+| dept_abbr| string | AWS Account department abbreviation (e.g. oit, trn) | oit |
 | env | Environment of the AWS Account (for finding the shared VPC and tagging the bastion) (e.g. dev, prd)|  |
 | vpc_vpn_to_campus | Set to true if the bastion needs to be in the VPC that has VPN access to campus | false |
 | netid | Your Net ID (for naming the bastion) | |

examples/module/example.tf

@@ -4,10 +4,11 @@ provider "aws" {
 }
 
 module "bastion" {
-	#source            = "[email protected]:byu-oit/terraform-aws-bastion.git?ref=v1.1.0"
-	source            = "../../"
-  env               = "prd"
-  vpc_vpn_to_campus = true
+  source            = "[email protected]:byu-oit/terraform-aws-bastion.git?ref=v1.1.1"
+    #source            = "../../"
+  dept_abbr         = "ces"
+  env               = "dev"
+  vpc_vpn_to_campus = false
   netid             = "mynetid"
   public_key        = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwWVPlHpRiXGBmB/VG6PUeJ/Ev+Y39n5PBI4DW3ZMDT1g32nEUjzKtxK6KwVzYFQBhReMO2ry4uSTiNIzuOtHk/OCfcdPc8wbW3RlHBgbqs6p7DfYRJAXJCnWEjovijaVY0lyL4+7/YuprZwBaA2NfUIRN8UwVxZck3ULMnCK6BKog0UAE9NQZ9Z0vAtgLYPo9eVJEuGrxEszN29X+4Fl6u3T8x0XQ9EoMWU4YNwKfzBIof3th9Cbv4+FlEKpOFYuCc5vB2NPotalN8phEUqnvtsDkmCLAop6+MrUlnNNYIzmh2RLeqDF+M/ZnX8xb+V/mT9vARVcdcYCxKYeyXLvT example"
 	#ingress_cidrs     = ["128.187.112.21/32"] # optional (defaults to BYU Campus)

main.tf

@@ -6,7 +6,8 @@ terraform {
 }
 
 module "acs" {
-  source            = "[email protected]:byu-oit/terraform-aws-acs-info.git?ref=v1.1.0"
+  source            = "[email protected]:byu-oit/terraform-aws-acs-info.git?ref=v1.2.2"
+  dept_abbr         = var.dept_abbr
   env               = var.env
   vpc_vpn_to_campus = var.vpc_vpn_to_campus
 }

variables.tf

@@ -1,3 +1,8 @@
+variable "dept_abbr" {
+  type = string
+  default = "oit"
+  description = "Abbreviation of the department type of account (e.g. oit, trn), defaults to oit."
+}
 variable "env" {
   type        = string
   description = "Account environment (for finding the shared VPC and tagging the bastion) (e.g. dev, prd)."