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 +}