Merge pull request #14 from byu-oit/v2

v2.0.0 using acs v3.1.0
byu-oit · Oct 6, 2020 · d753713 · d753713
2 parents c5b907b + 88004bb
commit d753713
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,8 +4,6 @@ on:
   pull_request:
     branches: [master]
     types: [opened, reopened, synchronize, edited]
-env:
-  tf_version: "0.12.26" # must match value in examples/ci/ci.tf
 
 jobs:
   env:
@@ -18,7 +16,14 @@ jobs:
           matrix='{
             "env":[
               {
-                "tf_working_dir":"./examples/ci",
+                "tf_version":"0.13.2",
+                "tf_working_dir":"./examples/ci-13",
+                "aws_key_name":"byu_oit_terraform_dev_key",
+                "aws_secret_name":"byu_oit_terraform_dev_secret"
+              },
+              {
+                "tf_version":"0.12.26",
+                "tf_working_dir":"./examples/ci-12",
                 "aws_key_name":"byu_oit_terraform_dev_key",
                 "aws_secret_name":"byu_oit_terraform_dev_secret"
               }
@@ -41,7 +46,7 @@ jobs:
       - name: Terraform Setup
         uses: hashicorp/setup-terraform@v1
         with:
-          terraform_version: ${{ env.tf_version }}
+          terraform_version: ${{ matrix.env.tf_version }}
 
       - name: Terraform Format
         working-directory: "./"
@@ -66,7 +71,7 @@ jobs:
       - name: Terraform Setup
         uses: hashicorp/setup-terraform@v1
         with:
-          terraform_version: ${{ env.tf_version }}
+          terraform_version: ${{ matrix.env.tf_version }}
 
       - name: Terraform Init
         working-directory: ${{ matrix.env.tf_working_dir }}

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ provider "aws" {
 }
 
 module "bastion" {
-  source            = "github.com/byu-oit/terraform-aws-bastion.git?ref=v1.2.1"
+  source            = "github.com/byu-oit/terraform-aws-bastion.git?ref=v2.0.0"
   env               = "prd"
   vpc_vpn_to_campus = true
   netid             = "mynetid"

diff --git a/examples/ci/ci.tf → examples/ci-12/ci.tf b/examples/ci/ci.tf → examples/ci-12/ci.tf
@@ -3,7 +3,7 @@ terraform {
 }
 
 provider "aws" {
-  version = "~> 2.42"
+  version = "~> 3.0"
   region  = "us-west-2"
 }
 

diff --git a/examples/ci-13/ci.tf b/examples/ci-13/ci.tf
@@ -0,0 +1,32 @@
+terraform {
+  required_version = "0.13.2"
+}
+
+provider "aws" {
+  version = "~> 3.0"
+  region  = "us-west-2"
+}
+
+module "bastion" {
+  source            = "../../"
+  env               = "dev"
+  vpc_vpn_to_campus = false
+  netid             = "githubac"
+  public_key        = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwWVPlHpRiXGBmB/VG6PUeJ/Ev+Y39n5PBI4DW3ZMDT1g32nEUjzKtxK6KwVzYFQBhReMO2ry4uSTiNIzuOtHk/OCfcdPc8wbW3RlHBgbqs6p7DfYRJAXJCnWEjovijaVY0lyL4+7/YuprZwBaA2NfUIRN8UwVxZck3ULMnCK6BKog0UAE9NQZ9Z0vAtgLYPo9eVJEuGrxEszN29X+4Fl6u3T8x0XQ9EoMWU4YNwKfzBIof3th9Cbv4+FlEKpOFYuCc5vB2NPotalN8phEUqnvtsDkmCLAop6+MrUlnNNYIzmh2RLeqDF+M/ZnX8xb+V/mT9vARVcdcYCxKYeyXLvT example"
+}
+
+output "connect" {
+  value = module.bastion.connect
+}
+
+output "ec2_instance" {
+  value = module.bastion.ec2_instance
+}
+
+output "security_group" {
+  value = module.bastion.security_group
+}
+
+output "key_pair" {
+  value = module.bastion.key_pair
+}
diff --git a/examples/double_hop/double_hop.tf b/examples/double_hop/double_hop.tf
@@ -12,7 +12,7 @@ locals {
 }
 
 module "public_bastion" {
-  source            = "github.com/byu-oit/terraform-aws-bastion.git?ref=v1.2.1"
+  source            = "github.com/byu-oit/terraform-aws-bastion.git?ref=v2.0.0"
   env               = local.env
   vpc_vpn_to_campus = true
   netid             = "${local.netid}-public"
@@ -23,7 +23,7 @@ module "public_bastion" {
 
 
 module "private_bastion" {
-  source            = "[email protected]:byu-oit/terraform-aws-bastion.git?ref=v1.2.1"
+  source            = "[email protected]:byu-oit/terraform-aws-bastion.git?ref=v2.0.0"
   env               = local.env
   vpc_vpn_to_campus = true
   netid             = "${local.netid}-private"

diff --git a/examples/module/example.tf b/examples/module/example.tf
@@ -5,7 +5,7 @@ provider "aws" {
 
 module "bastion" {
   #source            = "../../"
-  source            = "github.com/byu-oit/terraform-aws-bastion.git?ref=v1.2.1"
+  source            = "github.com/byu-oit/terraform-aws-bastion.git?ref=v2.0.0"
   env               = "dev"
   vpc_vpn_to_campus = false
   netid             = "jgubler"

diff --git a/main.tf b/main.tf
@@ -6,7 +6,7 @@ terraform {
 }
 
 module "acs" {
-  source            = "github.com/byu-oit/terraform-aws-acs-info.git?ref=v2.1.0"
+  source            = "github.com/byu-oit/terraform-aws-acs-info.git?ref=v3.1.0"
   vpc_vpn_to_campus = var.vpc_vpn_to_campus
 }