Skip to content

Commit

Permalink
Merge pull request #31 from byu-oit/allow-tf-12
Browse files Browse the repository at this point in the history
allow tf 12
  • Loading branch information
joshgubler authored Sep 3, 2020
2 parents 46ab813 + 6dcdc36 commit 9657b2e
Show file tree
Hide file tree
Showing 6 changed files with 82 additions and 10 deletions.
15 changes: 10 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on:
pull_request:
branches: [master]
types: [opened, reopened, synchronize, edited]
env:
tf_version: "0.13.1" # must match value in examples/ci/main.tf

jobs:
env:
Expand All @@ -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.29",
"tf_working_dir":"./examples/ci-12",
"aws_key_name":"byu_oit_terraform_dev_key",
"aws_secret_name":"byu_oit_terraform_dev_secret"
}
Expand All @@ -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: "./"
Expand All @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This module retrieves some basic [ACS](https://github.com/byu-oit/aws-acs) infor

```hcl
module "acs" {
source = "github.com/byu-oit/terraform-aws-acs-info.git?ref=v3.0.0"
source = "github.com/byu-oit/terraform-aws-acs-info.git?ref=v3.1.0"
}
```
After defining the module you can then retrieve the information you need (see available [outputs](#output) below) using the interpolation syntax:
Expand All @@ -21,7 +21,7 @@ After defining the module you can then retrieve the information you need (see av
```

## Requirements
* Terraform version 0.13.0 or greater
* Terraform version 0.12.17 or greater

## Input

Expand Down
67 changes: 67 additions & 0 deletions examples/ci-12/ci.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
terraform {
required_version = "0.12.29"
}

provider "aws" {
version = "~> 3.0"
region = "us-west-2"
}

module "acs" {
source = "../../"
}

output "power_user_role" {
value = module.acs.power_user_role
}
output "power_builder_role" {
value = module.acs.power_builder_role
}
output "role_permissions_boundary" {
value = module.acs.role_permissions_boundary
}
output "user_permissions_boundary" {
value = module.acs.user_permissions_boundary
}
output "vpc" {
value = module.acs.vpc
}
output "private_subnet_ids" {
value = module.acs.private_subnet_ids
}
output "public_subnet_ids" {
value = module.acs.public_subnet_ids
}
output "data_subnet_ids" {
value = module.acs.data_subnet_ids
}
output "private_subnets" {
value = module.acs.private_subnets
}
output "public_subnets" {
value = module.acs.public_subnets
}
output "data_subnets" {
value = module.acs.data_subnets
}
output "route53_zone" {
value = module.acs.route53_zone
}
output "certificate" {
value = module.acs.certificate
}
output "certificate_virginia" {
value = module.acs.certificate_virginia
}
output "db_subnet_group_name" {
value = module.acs.db_subnet_group_name
}
output "ssh_rdp_security_group" {
value = module.acs.ssh_rdp_security_group
}
output "oracle_security_group" {
value = module.acs.oracle_security_group
}
output "github_token" {
value = module.acs.github_token
}
2 changes: 1 addition & 1 deletion examples/ci/ci.tf → examples/ci-13/ci.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = "0.13.1"
required_version = "0.13.2"
}

provider "aws" {
Expand Down
2 changes: 1 addition & 1 deletion examples/simple/simple.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ provider "aws" {

module "acs" {
// source = "../../"
source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.0.0"
source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.1.0"
}

output "vpc_id" {
Expand Down
2 changes: 1 addition & 1 deletion main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.13.0"
required_version = ">= 0.12.17"
required_providers {
aws = "~> 3.0"
}
Expand Down

0 comments on commit 9657b2e

Please sign in to comment.