From 8ce2d17cac29af814cb41283584cbffa06188432 Mon Sep 17 00:00:00 2001 From: Spencer Tuft Date: Tue, 15 Jun 2021 17:00:07 -0600 Subject: [PATCH 1/4] Update ACS Version --- main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.tf b/main.tf index bde9f3e..c73620b 100644 --- a/main.tf +++ b/main.tf @@ -6,7 +6,7 @@ terraform { } module "acs" { - source = "github.com/byu-oit/terraform-aws-acs-info.git?ref=v3.1.0" + source = "github.com/byu-oit/terraform-aws-acs-info.git?ref=v3.2.0" vpc_vpn_to_campus = var.vpc_vpn_to_campus } From b6fbd270b7ccc4b3c0087cae58ebed168ffb24f5 Mon Sep 17 00:00:00 2001 From: Spencer Tuft Date: Tue, 15 Jun 2021 17:09:47 -0600 Subject: [PATCH 2/4] Update CI --- .github/workflows/ci.yml | 24 +++++++++++++++++--- README.md | 2 +- examples/{ci-12 => ci-0_12}/ci.tf | 0 examples/{ci-13 => ci-0_13}/ci.tf | 0 examples/ci-0_14/ci.tf | 37 +++++++++++++++++++++++++++++++ examples/ci-0_15/ci.tf | 37 +++++++++++++++++++++++++++++++ examples/ci-1_0/ci.tf | 37 +++++++++++++++++++++++++++++++ 7 files changed, 133 insertions(+), 4 deletions(-) rename examples/{ci-12 => ci-0_12}/ci.tf (100%) rename examples/{ci-13 => ci-0_13}/ci.tf (100%) create mode 100644 examples/ci-0_14/ci.tf create mode 100644 examples/ci-0_15/ci.tf create mode 100644 examples/ci-1_0/ci.tf diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e0001cc..5432ff1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,15 +15,33 @@ jobs: run: | matrix='{ "env":[ + { + "tf_version":"0.12.26", + "tf_working_dir":"./examples/ci-0_12", + "aws_key_name":"byu_oit_terraform_dev_key", + "aws_secret_name":"byu_oit_terraform_dev_secret" + }, { "tf_version":"0.13.2", - "tf_working_dir":"./examples/ci-13", + "tf_working_dir":"./examples/ci-0_13", + "aws_key_name":"byu_oit_terraform_dev_key", + "aws_secret_name":"byu_oit_terraform_dev_secret" + } + { + "tf_version":"0.14.11", + "tf_working_dir":"./examples/ci-0_14", "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", + "tf_version":"0.15.5", + "tf_working_dir":"./examples/ci-0_15", + "aws_key_name":"byu_oit_terraform_dev_key", + "aws_secret_name":"byu_oit_terraform_dev_secret" + }, + { + "tf_version":"1.0.0", + "tf_working_dir":"./examples/ci-1_0", "aws_key_name":"byu_oit_terraform_dev_key", "aws_secret_name":"byu_oit_terraform_dev_secret" } diff --git a/README.md b/README.md index ee3997e..f3d89cd 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ provider "aws" { } module "bastion" { - source = "github.com/byu-oit/terraform-aws-bastion.git?ref=v2.0.0" + source = "github.com/byu-oit/terraform-aws-bastion.git?ref=v2.0.1" env = "prd" vpc_vpn_to_campus = true netid = "mynetid" diff --git a/examples/ci-12/ci.tf b/examples/ci-0_12/ci.tf similarity index 100% rename from examples/ci-12/ci.tf rename to examples/ci-0_12/ci.tf diff --git a/examples/ci-13/ci.tf b/examples/ci-0_13/ci.tf similarity index 100% rename from examples/ci-13/ci.tf rename to examples/ci-0_13/ci.tf diff --git a/examples/ci-0_14/ci.tf b/examples/ci-0_14/ci.tf new file mode 100644 index 0000000..1c09c81 --- /dev/null +++ b/examples/ci-0_14/ci.tf @@ -0,0 +1,37 @@ +terraform { + required_version = "0.14.11" + required_providers { + aws = { + source = "hashicorp/aws" + version = "~> 3.0" + } + } +} + +provider "aws" { + 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/ci-0_15/ci.tf b/examples/ci-0_15/ci.tf new file mode 100644 index 0000000..396f03c --- /dev/null +++ b/examples/ci-0_15/ci.tf @@ -0,0 +1,37 @@ +terraform { + required_version = "0.15.5" + required_providers { + aws = { + source = "hashicorp/aws" + version = "~> 3.0" + } + } +} + +provider "aws" { + 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/ci-1_0/ci.tf b/examples/ci-1_0/ci.tf new file mode 100644 index 0000000..1d2f9d1 --- /dev/null +++ b/examples/ci-1_0/ci.tf @@ -0,0 +1,37 @@ +terraform { + required_version = "1.0.0" + required_providers { + aws = { + source = "hashicorp/aws" + version = "~> 3.0" + } + } +} + +provider "aws" { + 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 +} From 7199ede1ddf542a6f5d56e3be4d5f31fb9f49508 Mon Sep 17 00:00:00 2001 From: Spencer Tuft Date: Tue, 15 Jun 2021 17:14:15 -0600 Subject: [PATCH 3/4] Update .github/workflows/ci.yml Co-authored-by: Gary Crye --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5432ff1..3a36203 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: "tf_working_dir":"./examples/ci-0_13", "aws_key_name":"byu_oit_terraform_dev_key", "aws_secret_name":"byu_oit_terraform_dev_secret" - } + }, { "tf_version":"0.14.11", "tf_working_dir":"./examples/ci-0_14", From 83c19cbcf86118c7f2e035cb234917eaa1ac32fc Mon Sep 17 00:00:00 2001 From: Spencer Tuft Date: Tue, 15 Jun 2021 17:15:43 -0600 Subject: [PATCH 4/4] Fix terraform format --- examples/ci-0_14/ci.tf | 4 ++-- examples/ci-0_15/ci.tf | 4 ++-- examples/ci-1_0/ci.tf | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/ci-0_14/ci.tf b/examples/ci-0_14/ci.tf index 1c09c81..156117b 100644 --- a/examples/ci-0_14/ci.tf +++ b/examples/ci-0_14/ci.tf @@ -2,14 +2,14 @@ terraform { required_version = "0.14.11" required_providers { aws = { - source = "hashicorp/aws" + source = "hashicorp/aws" version = "~> 3.0" } } } provider "aws" { - region = "us-west-2" + region = "us-west-2" } module "bastion" { diff --git a/examples/ci-0_15/ci.tf b/examples/ci-0_15/ci.tf index 396f03c..1517d8a 100644 --- a/examples/ci-0_15/ci.tf +++ b/examples/ci-0_15/ci.tf @@ -2,14 +2,14 @@ terraform { required_version = "0.15.5" required_providers { aws = { - source = "hashicorp/aws" + source = "hashicorp/aws" version = "~> 3.0" } } } provider "aws" { - region = "us-west-2" + region = "us-west-2" } module "bastion" { diff --git a/examples/ci-1_0/ci.tf b/examples/ci-1_0/ci.tf index 1d2f9d1..0b985ca 100644 --- a/examples/ci-1_0/ci.tf +++ b/examples/ci-1_0/ci.tf @@ -2,14 +2,14 @@ terraform { required_version = "1.0.0" required_providers { aws = { - source = "hashicorp/aws" + source = "hashicorp/aws" version = "~> 3.0" } } } provider "aws" { - region = "us-west-2" + region = "us-west-2" } module "bastion" {